OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backport r253886 

2017-11-21  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-10-19  Martin Liska  <mliska@suse.cz>

	PR driver/81829
	* file-find.c (remove_prefix): Remove.
	* file-find.h (remove_prefix): Likewise.
	* gcc-ar.c: Remove smartness of lookup.

From-SVN: r255009
This commit is contained in:
Martin Liska 2017-11-21 17:00:55 +01:00 committed by Martin Liska
parent 3e08f9feda
commit 39ac3ee8a4
4 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2017-11-21 Martin Liska <mliska@suse.cz>
Backport from mainline
2017-10-19 Martin Liska <mliska@suse.cz>
PR driver/81829
* file-find.c (remove_prefix): Remove.
* file-find.h (remove_prefix): Likewise.
* gcc-ar.c: Remove smartness of lookup.
2017-11-21 Martin Liska <mliska@suse.cz>
Backport from mainline

35
gcc/file-find.c
View File

@ -208,38 +208,3 @@ prefix_from_string (const char *p, struct path_prefix *pprefix)
}
free (nstore);
}
void
remove_prefix (const char *prefix, struct path_prefix *pprefix)
{
struct prefix_list *remove, **prev, **remove_prev = NULL;
int max_len = 0;
if (pprefix->plist)
{
prev = &pprefix->plist;
for (struct prefix_list *pl = pprefix->plist; pl->next; pl = pl->next)
{
if (strcmp (prefix, pl->prefix) == 0)
{
remove = pl;
remove_prev = prev;
continue;
}
int l = strlen (pl->prefix);
if (l > max_len)
max_len = l;
prev = &pl;
}
if (remove_prev)
{
*remove_prev = remove->next;
free (remove);
}
pprefix->max_len = max_len;
}
}

1
gcc/file-find.h
View File

@ -41,7 +41,6 @@ extern void find_file_set_debug (bool);
extern char *find_a_file (struct path_prefix *, const char *, int);
extern void add_prefix (struct path_prefix *, const char *);
extern void add_prefix_begin (struct path_prefix *, const char *);
extern void remove_prefix (const char *prefix, struct path_prefix *);
extern void prefix_from_env (const char *, struct path_prefix *);
extern void prefix_from_string (const char *, struct path_prefix *);

8
gcc/gcc-ar.c
View File

@ -194,14 +194,6 @@ main (int ac, char **av)
#ifdef CROSS_DIRECTORY_STRUCTURE
real_exe_name = concat (target_machine, "-", PERSONALITY, NULL);
#endif
/* Do not search original location in the same folder. */
char *exe_folder = lrealpath (av[0]);
exe_folder[strlen (exe_folder) - strlen (lbasename (exe_folder))] = '\0';
char *location = concat (exe_folder, PERSONALITY, NULL);
if (access (location, X_OK) == 0)
remove_prefix (exe_folder, &path);
exe_name = find_a_file (&path, real_exe_name, X_OK);
if (!exe_name)
{