Changeset 1115

Timestamp:

Jan 30, 2004, 3:53:10 AM (22 years ago)

Author:

bird

Message:

Added option -Zdll-search to enable .dll as possible shared libs.

Location:

trunk/src/emx/src

Files:

• emxomf/emxomfld.c (modified) (8 diffs, 1 prop)
• ld/ld.c (modified) (5 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c

@@ -54 +54 @@
 /* Whether or not linker tracing is enabled. */
 static int opt_t;
+
+/* Whether or not to include .dll in the shared library searching. */
+static int opt_dll_search;
 
 /* The output file name, specified by the -o option.  */
@@ -844 +847 @@
  *      1. _dll.lib
  *      2. .lib
- *      3. .dll
+ *      3. .dll (optional)
  *      4. _s.lib
  *
@@ -868 +871 @@
 {
     /* Suffix list for shared linking. */
-    static const char *apszSharedSuff[]     = { "_dll.lib", "_dll.a", ".lib",  ".a", ".dll", "_s.lib", "_s.a", NULL };
+    static const char *apszSharedSuff[]     = { "_dll.lib", "_dll.a", ".lib",  ".a", "_s.lib", "_s.a", NULL };
+    /* Suffix list for shared linking with .dll. */
+    static const char *apszSharedDllSuff[]  = { "_dll.lib", "_dll.a", ".lib",  ".a", ".dll", "_s.lib", "_s.a", NULL };
     /* Suffix list for static linking. */
     static const char *apszStaticSuff[]     = { "_s.lib", "_s.a", ".lib",  ".a", NULL };
@@ -905 +910 @@
 
     if (!fExt)
-        papszSuffs = fShared ? &apszSharedSuff[0] : &apszStaticSuff[0];
+    {
+        if (fShared)
+            papszSuffs = opt_dll_search ? &apszSharedDllSuff[0] : &apszSharedSuff[0];
+        else
+            papszSuffs = &apszStaticSuff[0];
+    }
     else
         papszSuffs = apszExtensionSuff;
@@ -1274 +1284 @@
   fputs ("Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-igtsS]\n"
          "                [-Zexe] [-Zdll] [-Zstack <size>] [-Zmap[=<map_file>]]\n"
-         "                [-Z[no-]autoconv] [-O <option>] [-static] [-non_shared]\n"
-         "                [-Bstatic] [-dn] [call_shared] [-Bshared] [-dy] <file>...\n"
+         "                [-Z[no-]autoconv] [-Zdll-search] [-O <option>] [-static]\n"
+         "                [-non_shared] [-Bstatic] [-dn] [call_shared] [-Bshared]\n"
+         "                [-dy] <file>...\n"
          "\n", stderr);
   fputs ("Options:\n"
@@ -1289 +1300 @@
          "    The search order is then changed to: lib<name>_dll.lib, <name>_dll.lib,\n"
          "    lib<name>.lib, <name>.lib, <name>.dll, lib<name>_s.lib, <name>_s.lib.\n"
+         " -ZDll-search:\n"
+         "    Enables dlls as valid libraries from shared linking. (default disabled)\n"
          "\n", stderr);
   fputs ("Environment variables:\n"
@@ -1329 +1342 @@
 #define OPT_ZNO_AUTOCONV    0x1007
   {"Zno-autoconv",0, 0, OPT_ZNO_AUTOCONV},
+#define OPT_ZDLL_SEARCH     0x1008
+  {"Zdll-search",0, 0, OPT_ZDLL_SEARCH},
 /*  {"e", 1, 0, 'e'}, entry point */
   {"i", 0, 0, 'i'},
@@ -1518 +1533 @@
           break;
 
+        case OPT_ZDLL_SEARCH:
+          opt_dll_search = 1;
+          break;
+
         case OPT_LIBS_STATIC:
           opt_libs_static = 1;

trunk/src/emx/src/ld/ld.c

@@ -861 +861 @@
 int force_executable;
 
+/* Whether or not to include .dll in the shared library searching. */
+int opt_dll_search;
+
 /* Keep a list of any symbols referenced from the command line (so
    that error messages for these guys can be generated). This list is
@@ -1095 +1098 @@
   {"call_shared", 0, 0, OPT_LIBS_SHARED},
   {"dy", 0, 0, OPT_LIBS_SHARED},
+#define OPT_ZDLL_SEARCH     0x1008
+  {"Zdll-search",0, 0, OPT_ZDLL_SEARCH},
   {0, 0, 0, 0}
 };
@@ -1311 +1316 @@
           discard_locals = DISCARD_L;
           break;
+
+        case OPT_ZDLL_SEARCH:
+          opt_dll_search = 1;
+          break;
 
         case OPT_LIBS_STATIC:
@@ -1590 +1599 @@
     {
       /* !we're searching for libraries here! */
-      static const char *dynamic_suffs[] = { "_dll.a", ".a", ".dll", "_s.a", NULL };
-      static const char *static_suffs[]  = { "_s.a", ".a", NULL };
-      const char **suffs = entry->dynamic ? dynamic_suffs : static_suffs;
+      static const char *dynamic_dll_suffs[] = { "_dll.a", ".a", ".dll", "_s.a", NULL };
+      static const char *dynamic_suffs[]     = { "_dll.a", ".a", "_s.a", NULL };
+      static const char *static_suffs[]      = { "_s.a", ".a", NULL };
+      const char **suffs = entry->dynamic ? opt_dll_search ? dynamic_dll_suffs : dynamic_suffs  : static_suffs;
       int lenname = strlen (entry->filename);
       int i;
@@ -5228 +5238 @@
        [-nostdlib] [-o file] [-r] [-s] [-t] [-u symbol] [-x] [-y symbol]\n\
        [-z] [-A file] [-Bstatic] [-D size] [-L libdir] [-M] [-N]\n\
-       [-S] [-T[{text,data}] addr] [-V prefix] [-X] [file...]\n",
-           progname);
+       [-S] [-T[{text,data}] addr] [-V prefix] [-X] [-Zdll-search]\n\
+       [file...]\n", progname);
   exit (1);
 }