Changeset 573

Timestamp:

Aug 11, 2003, 12:02:25 AM (22 years ago)

Author:

bird

Message:

#482: Use INNIDM for linker demangling DLL. Corrected getopt(). Corrected opt_w/GCC_WEAKSYMS test order.

File:

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

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

@@ -390 +390 @@
 /* The name of the identifier manipulation DLL.  If this variable is
    NULL, no IDMDLL record is written. */
-static char *idmdll_name = "GPP3DEM";
+static char *idmdll_name = "INNIDM";
 
 /* If this variable is TRUE (-b option), we always use the 32-bit
@@ -625 +625 @@
   FILE *wf;
 
-  if (opt_w)
-    return;
 
   /* Find and open the weak symbol list file
@@ -632 +630 @@
   weak_list_filename = getenv ("GCC_WEAKSYMS");
   if (!weak_list_filename)
-      return ;
+    return ;
+  if (opt_w)
+    return;
   wf = fopen (weak_list_filename, "r");
   if (!wf)
@@ -1343 +1343 @@
 
                 if (    out_lib != NULL
-                    &&  (   (   (sym_ptr[i].n_type & N_EXT) 
+                    &&  (   (   (sym_ptr[i].n_type & N_EXT)
                              && sym_ptr[i].n_type != N_WEAKB
                              && sym_ptr[i].n_type != N_WEAKU)
-                         ||  sym_ptr[i].n_type == N_WEAKT 
+                         ||  sym_ptr[i].n_type == N_WEAKT
                          ||  sym_ptr[i].n_type == N_WEAKD ) )
                   {
@@ -2804 +2804 @@
       init_rec (COMENT);
       put_8 (0x00);
-      put_8 (0xaf);
+      put_8 (CLASS_IDMDLL);
       put_str (idmdll_name);
       put_str ("");             /* Initialization parameter */
@@ -3493 +3493 @@
   puts ("  -t                 Add timestamping to the weak symbol mangling");
   puts ("  -w                 Suppress reading/writing of the weaksyms.omf file");
+  puts ("                     (Only used if GCC_WEAKSYMS is set.)");
   puts ("  -z                 Remove underscores from all symbol names");
   exit (1);
@@ -3900 +3901 @@
   /* Parse the command line options. */
 
-  while ((c = getopt (argc, argv, "bdD:gh:i:I:m:l::o:p:qO:r:R:suxwz")) != EOF)
+  while ((c = getopt (argc, argv, "bdD:gh:i:I:m:l::o:p:qO:r:R:tsuxwz")) != EOF)
     switch (c)
       {