Changeset 2693 for trunk/emx/src/emxomf/emxomfld.c

Timestamp:

Apr 11, 2006, 4:49:20 AM (19 years ago)

Author:

bird

Message:

#89: wlink is now default. Fixed exp=int$w$ problem with wlink.

File:

• trunk/emx/src/emxomf/emxomfld.c (modified) (6 diffs)

trunk/emx/src/emxomf/emxomfld.c

@@ -152 +152 @@
 /* The name of the linker to use.  By default, ilink is used.  This
    can be overridden with the EMXOMFLD_LINKER environment variable. */
-static const char *linker_name = "ilink.exe";
+static const char *linker_name = "wlink.exe";
 
 /* The type of linker to use. By default we assume it's VAC365 or later
    version of ilink. This can be overridden with the EMXOMFLD_TYPE env.
-   var. using any of the value VAC365, VAC308 and LINK386. */
-static const char *linker_type = "VAC365";
+   var. using any of the values WLINK, VAC365, VAC308 and LINK386. */
+static const char *linker_type = "WLINK";
 
 /* Non-zero if emxomfld should automatically convert a.out objects and
@@ -1286 +1286 @@
         /** @todo _MDEP_NONAME */
         fprintf (response_file, "\n");
+
+        /* reference the internal name. */
+        if (stmt->export.internalname[0])
+          fprintf (response_file, "REFERENCE '%s'\n", stmt->export.internalname);
         break;
 
@@ -1499 +1503 @@
   fputs ("Environment variables:\n"
          "  EMXOMFLD_TYPE:\n"
-         "    The type of linker we're using. Values: VAC365, VAC308, LINK386, WLINK.\n"
+         "    The type of linker we're using. Values: WLINK, VAC365, VAC308, LINK386.\n"
+         "        WLINK    wlink.exe from Open Watcom v1.5 or later.\n"
          "        VAC365   ilink.exe from IBM C and C++ Compilers for OS/2 v3.6 or later.\n"
          "        VAC308   ilink.exe from Visual Age for C++ v3.08.\n"
-         "        LINK386  link386 form OS/2 install or DDK.\n"
-         "        WLINK    wlink.exe from Open Watcom v1.4 or later. (experimental)\n", stderr);
+         "        LINK386  link386 form OS/2 install or DDK.\n", stderr);
   fputs ("  EMXOMFLD_LINKER:\n"
          "    Name of the linker to use and optionally extra parameters. Spaces in the\n"
          "    linker name or path is not supported. Quotes are not supported either.\n"
-         "The default values for these two variables are VAC365 and ilink.exe.\n", stderr);
+         "The default values for these two variables are WLINK and wlink.exe.\n", stderr);
   exit (1);
 }
@@ -1799 +1803 @@
   t = getenv ("EMXOMFLD_TYPE");
   if (    t
+      &&  stricmp(t, "WLINK")
       &&  stricmp(t, "VAC365")
       &&  stricmp(t, "VAC308")
       &&  stricmp(t, "LINK386")
-      &&  stricmp(t, "WLINK")
       )
     fprintf (stderr, "emxomfld: warning: '%s' is an invalid value for EMXOMFLD_TYPE.\n", t);
@@ -1858 +1862 @@
     {
       /*
-         For VAC365 and VAC308 the default options is:
+         For VAC365 and VAC308 the default options are:
 
          /NOFR[EEFORMAT]    Use /NOFREEFORMAT to allow a LINK386-compatible
@@ -1874 +1878 @@
                             executables instead of the default on for the linker.
 
-         For LINK386 the default options is:
+         For LINK386 the default options are:
 
          /BATCH             Run in batch mode (disable prompting, don't