From 6dc6e8343321b890635f465361bdb7b5cafa65a2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 11 Apr 2009 14:06:56 +0000 Subject: [PATCH] 2009-04-11 H.J. Lu PR ld/10047 * ldfile.c (ldfile_find_command_file): First try raw name. --- ld/ChangeLog | 5 +++++ ld/ldfile.c | 19 ++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index d6c0bbd9331..6e593190fd6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2009-04-11 H.J. Lu + + PR ld/10047 + * ldfile.c (ldfile_find_command_file): First try raw name. + 2009-04-09 Nick Clifton PR 9824 diff --git a/ld/ldfile.c b/ld/ldfile.c index 422416a8b44..2aff7139643 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -542,10 +542,10 @@ find_scripts_dir (void) return NULL; } -/* 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. */ +/* 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,13 +556,10 @@ ldfile_find_command_file (const char *name, const char *extend, char *buffer; static search_dirs_type *script_search; - if (!default_only) - { - /* First try raw name. */ - result = try_open (name, ""); - if (result != NULL) - return result; - } + /* First try raw name for uninstalled linker. */ + result = try_open (name, ""); + if (result != NULL) + return result; if (!script_search) { -- 2.30.2