diff options
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/ldfile.c | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 6e59319..58144b6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2009-04-13 H.J. Lu <hongjiu.lu@intel.com> + + * ldfile.c (ldfile_find_command_file): Revert the last change. + 2009-04-11 H.J. Lu <hongjiu.lu@intel.com> PR ld/10047 diff --git a/ld/ldfile.c b/ld/ldfile.c index 2aff713..422416a 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -542,10 +542,10 @@ find_scripts_dir (void) return NULL; } -/* Try to open NAME; if that fails, look for it in directories specified - with -L, then in the default script directory, without and with EXTEND - appended. If DEFAULT_ONLY is true, the search is restricted to the - default script location. */ +/* If DEFAULT_ONLY is false, try to open NAME; if that fails, look for + it in directories specified with -L, then in the default script + directory, without and with EXTEND appended. If DEFAULT_ONLY is + true, the search is restricted to the default script location. */ static FILE * ldfile_find_command_file (const char *name, const char *extend, @@ -556,10 +556,13 @@ ldfile_find_command_file (const char *name, const char *extend, char *buffer; static search_dirs_type *script_search; - /* First try raw name for uninstalled linker. */ - result = try_open (name, ""); - if (result != NULL) - return result; + if (!default_only) + { + /* First try raw name. */ + result = try_open (name, ""); + if (result != NULL) + return result; + } if (!script_search) { |