Changeset 2995 for branches/libc-0.6/src

Timestamp:

Apr 6, 2007, 9:17:46 PM (19 years ago)

Author:

bird

Message:

Applied the -Zsym patch from Yuri.

File:

• branches/libc-0.6/src/emx/src/emxomf/emxomfld.c (modified) (9 diffs)

branches/libc-0.6/src/emx/src/emxomf/emxomfld.c

@@ -64 +64 @@
 static const char *map_fname = NULL;
 static int map_flag = FALSE;
+
+
+
 
 /* The module definition file name (input), set if a file matching
@@ -1395 +1398 @@
 
   if (opt_t)
-      show_spawn(pszwhat);
+    show_spawn(pszwhat);
 
   /* construct spawnvp() argument array */
@@ -1487 +1490 @@
          "\n", stderr);
   fputs ("Usage: emxomfld -o <file> [-l <lib>] [-L <libdir>] [-T <base>] [-igtsS]\n"
-         "                [-Zexe] [-Zdll] [-Zstack <size>] [-Zmap[=<map_file>]]\n"
+         "                [-Zexe] [-Zdll] [-Zstack <size>] [-Zmap[=<map_file>]]\n"
          "                [-Z[no-]autoconv] [-Zdll-search] [-O <option>] [-static]\n"
          "                [-non_shared] [-Bstatic] [-dn] [call_shared] [-Bshared]\n"
@@ -1505 +1508 @@
          "    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"
+         "    Enables dlls as valid libraries from shared linking. (default disabled)\n", 
+         stderr);
+  fputs (" -Zsym:"
+         "    Invoke mapsym.cmd on the mapfile to produce a .sym file. Requires -Zmap.\n" 
          "\n", stderr);
   fputs ("Environment variables:\n"
@@ -1549 +1555 @@
 #define OPT_ZDLL_SEARCH     0x1008
   {"Zdll-search",0, 0, OPT_ZDLL_SEARCH},
+
+
 /*  {"e", 1, 0, 'e'}, entry point */
   {"i", 0, 0, 'i'},
@@ -1743 +1751 @@
           break;
 
+
+
+
+
         case OPT_LIBS_STATIC:
           opt_libs_static = 1;
@@ -1773 +1785 @@
     {
       fprintf (stderr, "emxomfld: no input files\n");
+
+
+
+
+
+
+
+
       return 1;
     }
@@ -2196 +2216 @@
       t = xstrdup (output_fname);
       _remext (t);
-      _execname(&execname[0], sizeof(execname));
-      strcpy(_getname(&execname[0]), "ldstub.bin");
+      _execname(&execname[0], sizeof(execname));
+      strcpy(_getname(&execname[0]), "ldstub.bin");
 
       /* Copy stub into file */
       if (opt_t)
-          fprintf(stderr, "*** copy %s to %s (-Zexe)", execname, t);
-      DosCopy(&execname[0], t, 4);
+        (stderr, "*** copy %s to %s (-Zexe)", execname, t);
+      DosCopy(&execname[0], t, 4);
 
       /* Now touch it */
-      if (utime(t, NULL))
+      if (utime(t, NULL))
         {
           perror ("emxomfld");
@@ -2213 +2233 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   /* Return the return code of Linker or RC. */
 
   return rc;
 }
+