diff options
| author | Martin Liska <mliska@suse.cz> | 2017-10-19 13:08:28 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2017-10-19 11:08:28 +0000 |
| commit | 93659712d9807d7ef01d472dc58119f4ac15cbad (patch) | |
| tree | a22f01bee9e0b005b1be4b1055e7d10e916df564 | |
| parent | d8198d1cd0f0849d5ba070d70b672ed869eead4a (diff) | |
| download | gcc-93659712d9807d7ef01d472dc58119f4ac15cbad.zip gcc-93659712d9807d7ef01d472dc58119f4ac15cbad.tar.gz gcc-93659712d9807d7ef01d472dc58119f4ac15cbad.tar.bz2 | |
Revert r238089 (PR driver/81829).
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: r253886
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/file-find.c | 35 | ||||
| -rw-r--r-- | gcc/file-find.h | 1 | ||||
| -rw-r--r-- | gcc/gcc-ar.c | 8 |
4 files changed, 7 insertions, 44 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 189fe05..f2a46b9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +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-10-19 Segher Boessenkool <segher@kernel.crashing.org> * config/rs6000/rs6000.md (*call_indirect_aix<mode>, diff --git a/gcc/file-find.c b/gcc/file-find.c index b072a49..b5a1fe8 100644 --- a/gcc/file-find.c +++ b/gcc/file-find.c @@ -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; - } -} diff --git a/gcc/file-find.h b/gcc/file-find.h index 8f49a3a..407feba 100644 --- a/gcc/file-find.h +++ b/gcc/file-find.h @@ -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 *); diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c index 78d2fc1..d5d80e0 100644 --- a/gcc/gcc-ar.c +++ b/gcc/gcc-ar.c @@ -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) { |