aboutsummaryrefslogtreecommitdiff
path: root/ld/emultempl/elf32.em
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2008-08-08 08:06:16 +0000
committerAlan Modra <amodra@gmail.com>2008-08-08 08:06:16 +0000
commita26cc9674694867c19e7db7b632b7cda181b3b62 (patch)
treea5a22adb6eb4d53231c679f3491142736d0b22a8 /ld/emultempl/elf32.em
parent4dd07732f266b95c1ddec864b415ff2f41e52212 (diff)
downloadgdb-a26cc9674694867c19e7db7b632b7cda181b3b62.zip
gdb-a26cc9674694867c19e7db7b632b7cda181b3b62.tar.gz
gdb-a26cc9674694867c19e7db7b632b7cda181b3b62.tar.bz2
* ldfile.c (ldfile_open_file_search): Use concat.
(try_open): Don't use a fixed size pathname buffer. (ldfile_find_command_file): Likewise. * emultempl/elf32.em (gld${EMULATION_NAME}_open_dynamic_archive): If using EXTRA_SHLIB_EXTENSION, don't open twice.
Diffstat (limited to 'ld/emultempl/elf32.em')
-rw-r--r--ld/emultempl/elf32.em8
1 files changed, 6 insertions, 2 deletions
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index da1bf49..955fc9f 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1516,8 +1516,9 @@ gld${EMULATION_NAME}_open_dynamic_archive
/* Try the .so extension first. If that fails build a new filename
using EXTRA_SHLIB_EXTENSION. */
if (! ldfile_try_open_bfd (string, entry))
- sprintf (string, "%s/lib%s%s%s", search->name,
- filename, arch, EXTRA_SHLIB_EXTENSION);
+ {
+ sprintf (string, "%s/lib%s%s%s", search->name,
+ filename, arch, EXTRA_SHLIB_EXTENSION);
#endif
if (! ldfile_try_open_bfd (string, entry))
@@ -1525,6 +1526,9 @@ gld${EMULATION_NAME}_open_dynamic_archive
free (string);
return FALSE;
}
+#ifdef EXTRA_SHLIB_EXTENSION
+ }
+#endif
entry->filename = string;