aboutsummaryrefslogtreecommitdiff
path: root/ld/ldfile.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2014-03-14 11:25:59 +1030
committerAlan Modra <amodra@gmail.com>2014-03-14 12:54:24 +1030
commitd4ae5fb0b5d1ae4270b3343509e8bd2d529aa291 (patch)
treec9c91d0fd583689b7f204415b871632089d7ba1a /ld/ldfile.c
parentd6b6434614d9752d705d4f3199c3d59330938c66 (diff)
downloadgdb-d4ae5fb0b5d1ae4270b3343509e8bd2d529aa291.zip
gdb-d4ae5fb0b5d1ae4270b3343509e8bd2d529aa291.tar.gz
gdb-d4ae5fb0b5d1ae4270b3343509e8bd2d529aa291.tar.bz2
Remove search path from -l:namespec DT_NEEDED
For libraries without a soname, -l:libfoo.so set DT_NEEDED to the search dir plus filename, while gold and -lfoo just use the filename. This patch fixes the inconsistency. * ldlang.h (full_name_provided): New input flag. * ldlang.c (new_afile): Don't use lang_input_file_is_search_file_enum for -l:namespec. Instead use lang_input_file_is_l_enum with full_name_provided flag. * ldlfile.c (ldfile_open_file_search): Don't complete lib name if full_name_provided flag is set. * emultempl/elf32.em (gld${EMULATION_NAME}_open_dynamic_archive): Handle full_name_provided libraries. Tidy EXTRA_SHLIB_EXTENSION support. Set DT_NEEDED for -l:namespec as namespec. * emultempl/aix.em (ppc_after_open_output): Handle full_name_provided. * emultempl/linux.em (gld${EMULATION_NAME}_open_dynamic_archive): Don't handle full_name_provided libraries. * emultempl/pe.em (gld${EMULATION_NAME}_open_dynamic_archive): Ditto. * emultempl/pep.em (gld${EMULATION_NAME}_open_dynamic_archive): Ditto. * emultempl/vms.em (gld${EMULATION_NAME}_open_dynamic_archive): Ditto.
Diffstat (limited to 'ld/ldfile.c')
-rw-r--r--ld/ldfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c
index 61660ab..782ed7f 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -367,7 +367,7 @@ ldfile_open_file_search (const char *arch,
return TRUE;
}
- if (entry->flags.maybe_archive)
+ if (entry->flags.maybe_archive && !entry->flags.full_name_provided)
string = concat (search->name, slash, lib, entry->filename,
arch, suffix, (const char *) NULL);
else