From: Jeff Law <law@redhat.com>
Date: Tue, 14 Sep 1999 02:42:51 +0000 (+0000)
Subject:         * emultempl/elf32.em (gld${EMULATION_NAME}_open_dynamic_archive):
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=070f1aed4e5e70f15bc5a8a21d4e1cf7e1f87eac;p=binutils-gdb.git

    * emultempl/elf32.em (gld${EMULATION_NAME}_open_dynamic_archive):
        Search for file with .sl extension if no file with a .so extension
        is found.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e9a44744358..71d5755e802 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 0c0ebb7152e..e590c71506e 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;