Changeset 523

Timestamp:

Aug 4, 2003, 7:16:27 PM (22 years ago)

Author:

bird

Message:

#582: tracing, linker types.

File:

• trunk/src/emx/src/emxomf/emxomfld.c (modified) (38 diffs, 1 prop)

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

@@ -1 @@
-/* emxomfld.c --  Provide an ld-like interface to LINK386
+/* emxomfld.c --  Provide an ld-like interface to the IBM and M$ linkers
    Copyright (c) 1992-1998 Eberhard Mattes
 
@@ -49 +49 @@
 
 
+/* Whether or not linker tracing is enabled. */
+static int opt_t;
+
 /* The output file name, specified by the -o option.  */
 static const char *output_fname = NULL;
@@ -88 +91 @@
 static name_list **add_lib_fnames = &lib_fnames;
 
-/* List of LINK386 options.  LINK386 options can be specified with the
+/* List of linker options.  Linker options can be specified with the
    -O option.  add_options is used to add another entry at the end of
    the list. */
@@ -94 +97 @@
 static name_list **add_options = &options;
 
-/* The command line passed to LINK386. */
+/* The command line passed to the linker. */
 static char command_line[260];
 
@@ -129 +132 @@
 static long stack_size = 0;
 
-/* The name of the linker to use.  By default, LINK386 is used.  This
-   can be overriden with the EMXOMFLD_LINKER environment variable. */
-static const char *linker_name = "link386";
+/* 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";
+
+/* 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";
 
 /* Prototypes. */
@@ -166 +174 @@
 
   fprintf (stderr,
-           "Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-sS]\n"
+           "Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-igtsS]\n"
            "                [-Zexe] [-Zdll] [-Zstack <size>] [-Zmap[=<map_file>]]\n"
-           "                [-O <option>] <file>...\n");
+           "                [-O <option>] <file>...\n"
+           "\n"
+           "Environment variables:\n"
+           "  EMXOMFLD_TYPE:\n"
+           "    The type of linker we're using. Values: VAC365, VAC308, LINK386.\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"
+           "  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");
   exit (1);
 }
@@ -239 +258 @@
 
 
-/* Replace forward slashes `/' in NAME with backslashes `\'.  LINK386
-   needs backslashes in path names. */
+/* Replace forward slashes `/' in NAME with backslashes `\'.  The linkers
+   requires backslashes in path names. */
 
 static void conv_path (char *name)
@@ -312 +331 @@
           /* If SRC is a single comma or a single semicolon, copy it
              to the output, ignoring the maximum line length.  This is
-             to meet the LINK386 command syntax. The maximum line
+             to meet the IBM/M$ linker command syntax. The maximum line
              length allows for enough commas and semicolons added this
              way. */
@@ -413 +432 @@
 
 
-/* Build the environment for LINK386: define the LIB environment
-   variable. */
+/* Build the environment for the IBM/M$ Linkers: define the LIB 
+   environment variable. */
 
 static void make_env (void)
@@ -453 +472 @@
 
   putenv (tmp);
+
+  if (opt_t)
+    fprintf(stderr, "*** LIB=%s\n", tmp);
 }
 
@@ -605 +627 @@
 
   /* look for ilinker options. */
+  if (opt_t)
+      fFlags |= WLDC_VERBOSE;
   for (pOpt = options; pOpt; pOpt = pOpt->next)
     if (    !strnicmp(pOpt->name, "/NOE", 4)
@@ -631 +655 @@
 
   /* create the linker and to the linking. */
+  if (opt_t)
+    fprintf(stderr, "*** Invoking weak prelinker with flags %x.\n", fFlags);
   pwld = wldCreate (fFlags);
   if (pwld)
@@ -665 +691 @@
       /* complete pass 1 */
       if (!rc)
-      {
+        {
           rc = wldPass1 (pwld);
           /* ignore unresolved externals for now. */
           if (rc == 42)
+            {
               rc = 0;
-      }
+              fprintf(stderr, "Ignoring unresolved externals reported from weak prelinker.");
+            }
+        }
 
       /* generate weak aliases. */
@@ -680 +709 @@
       /* cleanup the linker */
       wldDestroy (pwld);
+      
+      /* last words */
+      if (rc)
+        fprintf (stderr, "emxomfld: weak prelinker failed. (rc=%d)\n", rc);
     }
   else
     {
       rc = 8;
-      fprintf (stderr, "emxomfld: failed to create weak linker.\n");
-    }
-
+      fprintf (stderr, "emxomfld: failed to create weak prelinker.\n");
+    }
+
+  /* die on error. */
   if (rc)
     exit(rc);
+
+  /* verbose */
+  if (opt_t)
+    fprintf(stderr, "*** Weak prelinker done\n");
 }
 
@@ -697 +735 @@
 static void arg_init (int rsp)
 {
-  command_line[0] = 0;
+  response_fname[0] = '\0';
+  command_line[0] = '\0';
   line_len = 0;
   response_flag = rsp;
@@ -721 +760 @@
 
 
+/* -t output. We dump the commandline and responsefile. */
+static void  show_spawn(const char *pszwhat)
+{
+  if (!opt_t)
+    return;
+  fprintf(stderr, "*** Invoking %s\n %s\n", pszwhat, command_line);
+  if (response_fname[0])
+    { /* display the responsfile content. */
+      char sz[4096];
+      FILE *phfile = fopen(response_fname, "r");
+      fprintf(stderr, "--- Response file %s:\n", response_fname);
+      sz[0] = '\0';
+      while (fgets(sz, sizeof(sz), phfile))
+          fprintf(stderr, "%s", sz);
+      fclose(phfile);
+      if (sz[strlen(sz) - 1] != '\n')
+          fprintf(stderr, "\n");
+      fprintf(stderr, "--- End of Response File\n");
+    }
+}
+
+
+/* Execute commandline and returns the result. 
+   pszwhat is used for opt_t trace information. */
+
+static int emxomfld_spawn(char *pszcmd, const char *pszwhat)
+{
+  int       argi;
+  char **   argv;
+  char *    psz;
+  int       rc;
+
+  if (opt_t)
+      show_spawn(pszwhat);
+
+  /* construct spawnvp() argument array */
+  argi = 0;
+  argv = NULL;
+  psz = pszcmd;
+  while (psz && *psz)
+    {
+      char *psz2 = psz;
+
+      /* skip blanks. */
+      while (*psz2 == '\t' || *psz2 == ' ')
+          psz2++;
+
+      /* find end of argument taking in account in arg quoting. */
+      while (*psz2 && *psz2 != '\t' && *psz2 != ' ')
+        {
+          if (*psz2 == '"' || *psz2 == '\'')
+            {
+              char chQuote = *psz2++;
+              while (*psz2 && *psz2 != chQuote)
+                psz2++;
+            }
+          else
+            psz2++;
+        }
+      /* terminate and set psz2 to point to next */
+      if (*psz2)
+        *psz2++ = '\0';
+      
+      /* add argument to argument vector. */
+      if (!(argi % 32))
+        argv = xrealloc(argv, argi + 32);
+      argv[argi++] = xstrdup(psz);
+
+      /* next */
+      psz = psz2;                           
+    }
+
+  /* Spawn process. */
+  rc = spawnvp(P_WAIT, argv[0], argv);
+  if (opt_t)
+    fprintf(stderr, "*** Return from %s is %d\n", pszwhat, rc);
+
+  return rc;
+}
+
+
 /* Cleanup by closing (if open) and deleting (if pressent) the
    response file.  This function is used with atexit(). */
@@ -744 +864 @@
 
 
-/* Main function of emxomf.  Parse the command line and call LINK386
-   (and optionally RC). */
+/* Main function of emxomf.  Parse the command line and call the IBM/M$ 
+   linker (and optionally RC). */
 
 int main (int argc, char *argv[])
 {
   int c, rc, files;
-  int opt_i;
   const char *ext;
   char tmp[512], *t;
-  static char emxshell [200];
+  char execname[512];
 
   /* Get options from response files (@filename) and wildcard (*.o) on the command. */
+  
   _response (&argc, &argv);
   _wildcard (&argc, &argv);
 
-  /* Drop EMXSHELL since it can point to a Unix shell which is bad for us */
-  sprintf (emxshell, "EMXSHELL=%s", getenv ("OS2_SHELL"));
-  putenv (emxshell);
-
   /* Close and delete the response file on exit. */
 
@@ -769 +885 @@
   /* Prepare parsing of the command line. */
 
-  opt_i = FALSE; files = 0;
+  files = 0;
   opterr = FALSE; optmode = GETOPT_KEEP;
   if (argc < 2)
@@ -776 +892 @@
   /* Parse the command line options and other arguments. */
 
-  while ((c = getopt (argc, argv, "o:O:il:vL:T:sSxXZ:")) != EOF)
+  while ((c = getopt (argc, argv, "o:O:itl:vL:T:sSxXZ:")) != EOF)
     switch (c)
       {
-      case 'i':                 /* Use /INFORMATION option of LINK386 */
-        opt_i = TRUE;
+      case 't':
+      case 'i':                 /* Trace the linking process, sending /INFO to the IBM/M$ linker. */
+        opt_t = TRUE;
         break;
 
@@ -811 +928 @@
         break;
 
-      case 'O':                 /* Specify LINK386 option */
+      case 'O':                 /* Specify Linker option */
         add_name_list (&add_options, optarg);
         break;
@@ -846 +963 @@
         else
           {
-            fprintf (stderr, "emxomfld: invalid option\n");
+            fprintf (stderr, "emxomfld: invalid option (%s)\n", optarg);
             usage ();
           }
@@ -861 +978 @@
           {
             /* GCC's temporary files don't have an extension.  Add a
-               dot to the end of the name to prevent LINK386 from
+               dot to the end of the name to prevent the linker from
                adding `.obj'. */
 
@@ -911 +1028 @@
 
       default:
-        fprintf (stderr, "emxomfld: invalid option\n");
+        fprintf (stderr, "emxomfld: invalid option (%s)\n", argv[optind - 1]);
         usage ();
       }
@@ -937 +1054 @@
     remove (output_fname);
 
-  /* If neither -Zmap nor -Zmap=file is used, pass "nul" to LINK386 in
+  /* If neither -Zmap nor -Zmap=file is used, pass "nul" to the linker in
      the map file field.  If -Zmap is used, construct the name of the
      .map file.  If -Zmap=file is used, use `file' as the name of the
@@ -973 +1090 @@
           free(pcur->name);
           pcur->name = xstrdup(szname);
-        }
-
-    }
-
-
-  /* Start building the LINK386 command line.  We can use a response
+          fclose(phfile);
+        }
+
+    }
+
+  /* EMXOMFLD_TYPE contains VAC365, VAC308 or LINK386 if set. If non of these 
+     we assume VAC365.
+     EMXOMFLD_LINKER contains the linker name and perhaps extra arguments. If 
+     not set we'll use the default linker, ilink.  */
+
+  t = getenv ("EMXOMFLD_TYPE");
+  if (    t
+      &&  stricmp(t, "VAC365")
+      &&  stricmp(t, "VAC308")
+      &&  stricmp(t, "LINK386")
+      )
+    fprintf (stderr, "emxomfld: warning: '%s' is an invalid value for EMXOMFLD_TYPE.\n", t);
+  else if (t)
+    linker_type = t;
+
+  t = getenv ("EMXOMFLD_LINKER");
+  if (t)
+    linker_name = t;
+  if (opt_t)
+    fprintf(stderr, "*** Linker     : %s\n"
+                    "*** Linker type: %s\n", linker_name, linker_type);
+
+
+
+  /* Start building the linker command line.  We can use a response
      file if the command line gets too long. */
 
   arg_init (TRUE);
 
-  /* Default options are:
-
+  /* 
+     For VAC365 and VAC308 the default options is:
+
+     /NOFR[EEFORMAT]    Use /NOFREEFORMAT to allow a LINK386-compatible
+                        command line syntax, in which different types of file
+                        are grouped and separated by commas.
+
+     /DBGPACK           If !strip_symbols then we'll add this option, which 
+                        will cause type tables to be merged into one global
+                        table and so eliminating a lot of duplicate info.
+                        
+     For VAC365 additional default option is:
+     
+     /STUB:<emxomfld-path>\os2stub.bin
+                        Causes this MZ stub to be used when linking the 
+                        executables instead of the default on for the linker.
+  
+     For LINK386 the default options is:
+     
      /BATCH             Run in batch mode (disable prompting, don't
                         echo response file)
+    
+     The default options for all linkers are:
 
      /NOLOGO            Don't display sign-on banner
@@ -1000 +1160 @@
                         'CODE').  Not grouping neighboring code
                         segments would break sets
-
-     For ILINK the following option is passed:
-
-     /NOFR[EEFORMAT]    Use /NOFREEFORMAT to allow a LINK386-compatible
-                        command line syntax, in which different types of file
-                        are grouped and separated by commas.
+                        
+     For non DLLs targets:
+     
+     /BASE:0x10000      Base the executable an so removing extra fixups.
+
   */
 
-  t = getenv ("EMXOMFLD_LINKER");
-  if (t != NULL)
-    linker_name = t;
+  /* issue commandline */
   put_arg (linker_name, TRUE, FALSE);
 
-  /* If the linker is ILINK, don't use the /BAT{CH} option */
-  t = _getname (linker_name);           /* TODO: this assumes that the env var is a filename only.
-                                         * It should be possible to add options as well. Therefore the 2nd check. */
-  if (strnicmp (t, "ILINK", 5) && strnicmp(linker_name, "ILINK", 5))
-    put_arg ("/bat", FALSE, FALSE);
-  else
-    put_arg ("/nofree", FALSE, FALSE);
+  /* the next part depends on the linker type. */
+  if (!stricmp (linker_type, "LINK386"))
+      put_arg ("/bat", FALSE, FALSE);  
+  else /* vac3xx: */
+    {
+      put_arg ("/nofree", FALSE, FALSE);  
+      if (!strip_symbols)
+        put_arg ("/db", FALSE, FALSE);  
+      if (map_flag)
+        put_arg ("/map", FALSE, FALSE);  
+
+      /* VAC365: check if we have os2stub.bin. */
+      if (!stricmp (linker_type, "VAC365"))
+        {
+          struct stat s;
+          _execname(&execname[0], sizeof(execname));
+          strcpy(_getname(&execname[0]), "os2stub.bin");
+
+          if (!stat (execname, &s))
+            {
+              sprintf (tmp, "/STUB:%s", &execname[0]);
+              put_arg (tmp, FALSE, FALSE);
+            }
+        }
+    }
   put_arg ("/nol", FALSE, FALSE);
   put_arg ("/noe", FALSE, FALSE);
@@ -1025 +1200 @@
   put_arg ("/packc", FALSE, FALSE);
 
-  /* Add the /INFORMATION option if the -i option was given.  This is
+  /* Add the /INFORMATION option if the -i or -t option was given.  This is
      for debugging. */
 
-  if (opt_i)
+  if (opt_t)
     put_arg ("/i", FALSE, FALSE);
 
   /* Add the /DEBUG option if the -s option was not given.  Without
-     this, LINK386 throws away debugging information. */
+     this, the linker throws away debugging information. */
 
   if (!strip_symbols)
@@ -1048 +1223 @@
       if (def_fname != NULL)
         {
+          int token;
           md = _md_open (def_fname);
           if (md == NULL)
@@ -1054 +1230 @@
               exit (2);
             }
-          if (_md_next_token (md) == _MD_LIBRARY)
+          token = _md_next_token (md);
+          if (token == _MD_LIBRARY || token == _MD_PHYSICAL || token == _MD_VIRTUAL)
             dll_flag = TRUE;
           _md_close (md);
@@ -1061 +1238 @@
   if (base == NULL && !dll_flag)
     base = "0x10000";
-  if (base != NULL && strcmp (base, "no") != 0)
+  if (base != NULL && stricmp (base, "no") != 0)
     {
       sprintf (tmp, "/bas:%s", base);
@@ -1069 +1246 @@
   /* Add the /STACK:n option if the -Zstack option was given. */
 
-  if (stack_size != 0)
+  if (stack_size != 0 && !dll_flag)
     {
       sprintf (tmp, "/st:0x%lx", stack_size * 1024);
@@ -1075 +1252 @@
     }
 
-  /* Add the LINK386 options specified with -O. */
+  /* Add the linker options specified with -O. */
 
   put_args (options, FALSE);
@@ -1105 +1282 @@
   arg_end ();
 
-  /* Call LINK386 via CMD.EXE (what a waste -- but I'm lazy) and abort
-     on failure. */
-
-  rc = system (command_line);
-  /* ILINK returns 4 on warnings: consider this as success */
-  if (rc == 4) rc = 0;
-
+  /* Call Linker and abort on failure. */
+
+  rc = emxomfld_spawn (command_line, "Linker");
+  if (rc == 4 && !strnicmp(linker_type, "VAC3", 4)) /* Ignore iLink warnings. */
+      rc = 0;                           
   if (rc < 0)
     {
@@ -1118 +1293 @@
     }
 
-  /* Run RC if LINK386 completed successfully and a binary resource
+  /* Run RC if Linker completed successfully and a binary resource
      file was given on the command line. */
 
@@ -1124 +1299 @@
     {
       arg_init (TRUE);
-      put_arg ("rc", TRUE, FALSE);
+      put_arg ("rc.exe", TRUE, FALSE);
       put_arg ("-n", FALSE, FALSE);
       put_arg (res_fname, TRUE, TRUE);
       put_arg (output_fname, TRUE, TRUE);
       arg_end ();
-      rc = system (command_line);
+      rc = emxomfld_spawn (command_line, "Resource Linker");
       if (rc < 0)
         {
@@ -1137 +1312 @@
     }
 
-  /* If both LINK386 and RC competed successfully and the -Zexe option
+  /* If both Linker and RC completed successfully and the -Zexe option
      was given, touch the output file (without .exe) to keep `make'
      happy. */
@@ -1143 +1318 @@
   if (rc == 0 && exe_flag)
     {
-      char execname[512];
-
+      /* find target and source filenames. */
       t = xstrdup (output_fname);
       _remext (t);
-
-      _execname((char *)&execname, sizeof(execname));
-      strcpy(_getname((char *)&execname), "ldstub.bin");
+      _execname(&execname[0], sizeof(execname));
+      strcpy(_getname(&execname[0]), "ldstub.bin");
+      
       /* Copy stub into file */
-      DosCopy((char *)&execname, t, 4);
+      if (opt_t)
+          fprintf(stderr, "*** copy %s to %s (-Zexe)", execname, t);
+      DosCopy(&execname[0], t, 4);
+
       /* Now touch it */
       if (utime(t, NULL))
@@ -1161 +1338 @@
     }
 
-  /* Return the return code of LINK386 (or RC). */
+  /* Return the return code of Linker or RC. */
 
   return rc;