Changeset 62

Timestamp:

Apr 29, 2003, 7:13:20 PM (22 years ago)

Author:

bird

Message:

• Added the `-w' flag to allow exporting weak symbols.
• Won't barf anymore on empty (but legal) a.out files.

File:

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

trunk/src/emx/src/emxexp/emxexp.c

@@ -42 +42 @@
 static int noname_flag = FALSE;
 static int bss_flag = FALSE;
+static int weak_flag = FALSE;
 
 static FILE *out_file;
@@ -106 +107 @@
          "  -o          Output ordinal numbers, starting at 1\n"
          "  -o<ordinal> Output ordinal numbers, starting at <ordinal>\n"
-         "  -u          Also export uninitialized variables\n",
+         "  -u          Also export uninitialized variables\n"
+         "  -w          Allow export of weak symbols\n",
          stderr);
   exit (1);
@@ -185 +187 @@
   sym = (inp_buf + sizeof (struct a_out_header) + a_out_h->text_size
          + a_out_h->data_size + a_out_h->trsize + a_out_h->drsize);
+  if (!a_out_h->sym_size)
+    return;
   str_ptr = sym + a_out_h->sym_size;
   if (str_ptr + 4 - inp_buf > size)
@@ -195 +199 @@
 
   for (i = 0; i < sym_count; ++i)
-    if (sym_ptr[i].type == (N_TEXT|N_EXT) || sym_ptr[i].type == (N_DATA|N_EXT))
+    if (sym_ptr[i].type == (N_TEXT|N_EXT) ||
+        sym_ptr[i].type == (N_DATA|N_EXT) ||
+        (weak_flag &&
+         (sym_ptr[i].type == N_WEAKT ||
+          sym_ptr[i].type == N_WEAKD)))
       {
         name = str_ptr + sym_ptr[i].string;
@@ -202 +210 @@
         export (name);
       }
-    else if (sym_ptr[i].type == N_EXT && sym_ptr[i].value != 0)
+    else if ((sym_ptr[i].type == N_EXT ||
+              (weak_flag && sym_ptr[i].type == N_WEAKB)) &&
+             sym_ptr[i].value != 0)
       {
         name = str_ptr + sym_ptr[i].string;
@@ -577 +587 @@
   _wildcard (&argc, &argv);
   opterr = 0;
-  optswchar = "-";
+//optswchar = "-";
   optind = 0;
-  while ((c = getopt (argc, argv, "no::u")) != EOF)
+  while ((c = getopt (argc, argv, "no::uw")) != EOF)
     {
       switch (c)
@@ -601 +611 @@
           bss_flag = TRUE;
           break;
+        case 'w':
+          weak_flag = TRUE;
+          break;
         default:
           error ("Invalid option");