aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog4
-rw-r--r--ld/emultempl/elf32.em14
2 files changed, 15 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index e9a4474..71d5755 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -5,6 +5,10 @@
Mon Sep 13 00:17:18 1999 Jeffrey A Law (law@cygnus.com)
+ * emultempl/elf32.em (gld${EMULATION_NAME}_open_dynamic_archive):
+ Search for file with .sl extension if no file with a .so extension
+ is found.
+
* emulparms/elf64hppa.sh (OTHER_READWRITE_SECTIONS): Put .plt
at the start of the .dlt output section.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 0c0ebb7..e590c71 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -78,7 +78,8 @@ gld${EMULATION_NAME}_before_parse()
}
/* Try to open a dynamic archive. This is where we know that ELF
- dynamic libraries have an extension of .so. */
+ dynamic libraries have an extension of .so (or .sl on oddball systems
+ like hpux). */
static boolean
gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
@@ -103,8 +104,15 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
if (! ldfile_try_open_bfd (string, entry))
{
- free (string);
- return false;
+ /* It failed using .so, try again with .sl for oddball systems
+ that use a different naming scheme (ie hpux). */
+ sprintf (string, "%s/lib%s%s.sl", search->name, filename, arch);
+
+ if (! ldfile_try_open_bfd (string, entry))
+ {
+ free (string);
+ return false;
+ }
}
entry->filename = string;