Changeset 1253

Timestamp:

Feb 16, 2004, 4:42:39 AM (21 years ago)

Author:

bird

Message:

Fixed some library searching for OS/2.

File:

• trunk/src/binutils/ld/ldfile.c (modified) (4 diffs, 1 prop)

trunk/src/binutils/ld/ldfile.c

@@ -89 +89 @@
   if (! realname)
     return FALSE;
-  
+
   len = strlen (realname);
 
@@ -354 +354 @@
                                  + strlen (arch)
                                  + strlen (suffix)
+#if defined (__EMX__) /* Target feature really, but no target define to test on. */
+                                 + 16);
+#else
                                  + 1);
-
+#endif
+
+#if defined (__EMX__) /* Target feature really, but no target define to test on. */
+      /* On OS/2 we have a complex naming scheme for libraries. They may have a
+         prefix, we prefere the ones with. They may also have special suffixes
+         depending on the library type. _s.a mean static, _dll.a mean dynaminc,
+         plain .a might mean both and should be searched last.
+
+         TODO: make a ldemul_open_static_archive(). */
+
+      if (entry->is_archive)
+        sprintf (string, "%s%s%s%s%s%s%s", search->name, slash,
+                 lib, entry->filename, arch,
+                 (entry->dynamic && ! link_info.relocateable ? "" : "_s"),
+                 suffix);
+      else
+        sprintf (string, "%s%s%s", search->name, slash, entry->filename);
+
+      if (ldfile_try_open_bfd (string, entry))
+        {
+          entry->filename = string;
+          entry->sysrooted = search->sysrooted;
+          return TRUE;
+        }
+
+      if (entry->is_archive)
+        {
+          /* without lib prefix. */
+          sprintf (string, "%s%s%s%s%s%s", search->name, slash,
+                   entry->filename, arch,
+                   (entry->dynamic && ! link_info.relocateable ? "" : "_s"),
+                   suffix);
+          if (ldfile_try_open_bfd (string, entry))
+            {
+              entry->filename = string;
+              entry->sysrooted = search->sysrooted;
+              return TRUE;
+            }
+
+          /* inverse the "_s". */
+          sprintf (string, "%s%s%s%s%s%s%s", search->name, slash,
+                   lib, entry->filename, arch,
+                   (entry->dynamic && ! link_info.relocateable ? "_s" : ""),
+                   suffix);
+          if (ldfile_try_open_bfd (string, entry))
+            {
+              entry->filename = string;
+              entry->sysrooted = search->sysrooted;
+              return TRUE;
+            }
+
+          /* without lib prefix and inverse "_s". */
+          sprintf (string, "%s%s%s%s%s%s", search->name, slash,
+                   entry->filename, arch,
+                   (entry->dynamic && ! link_info.relocateable ? "_s" : ""),
+                   suffix);
+          if (ldfile_try_open_bfd (string, entry))
+            {
+              entry->filename = string;
+              entry->sysrooted = search->sysrooted;
+              return TRUE;
+            }
+        }
+#else /* __EMX__ ^ */
       if (entry->is_archive)
         sprintf (string, "%s%s%s%s%s%s", search->name, slash,
@@ -368 +434 @@
           return TRUE;
         }
+#endif /* __EMX__ */
+
 
       free (string);
@@ -404 +472 @@
            arch = arch->next)
         {
-#if defined (__EMX__) /* Target feature really, but no target define to test on. */
-          found = ldfile_open_file_search (arch->name, entry, "", ".a");
-          if (found)
-            break;
-#endif /* __EMX__ */
           found = ldfile_open_file_search (arch->name, entry, "lib", ".a");
           if (found)