Changeset 475

Timestamp:

Jul 29, 2003, 9:42:44 PM (22 years ago)

Author:

bird

Message:

temp commit.

File:

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

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

@@ -290 +290 @@
 static int weak_list_altered;
 
-/* The file name of the weak symbol list file */
+/* The file name of the weak symbol list file.
+   If NULL the new method is used, if not NULL the old method is used. */
 static char *weak_list_filename;
 
@@ -621 +622 @@
     return;
 
-  /* Find and open the weak symbol list file */
+  /* Find and open the weak symbol list file 
+     #483: If not present we'll use the new method. */
   weak_list_filename = getenv ("GCC_WEAKSYMS");
   if (!weak_list_filename)
-    weak_list_filename = "weaksyms.omf";
+    ;
   wf = fopen (weak_list_filename, "r");
   if (!wf)
@@ -751 +753 @@
 {
   struct lname *p;
+
+
 
   /* Walk through the list of known OMF-style names.  If there is a
@@ -1185 +1189 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* Write ALIAS records into the output file for all indirect
    references. */
@@ -1239 +1296 @@
   const char *name, *pub_name;
   dword address;
+
 
   started = FALSE;
@@ -1248 +1306 @@
           {
             name = str_ptr + sym_ptr[i].n_un.n_strx;
-            if ((sym_ptr[i].n_type & N_EXT)
-                || (type == N_TEXT && strncmp (name, "___POST$", 8) == 0))
+            if (   (sym_ptr[i].n_type & N_EXT)
+                || (type == N_TEXT && strncmp (name, "___POST$", 8) == 0)
+                || (sym_ptr[i].n_type >= N_WEAKU && sym_ptr[i].n_type <= N_WEAKB)
+                   )
               {
                 if ((sym_ptr[i].n_type & N_EXT) && out_lib != NULL)
@@ -1260 +1320 @@
                       error (lib_errmsg);
                   }
+
+
+
+
+
+
+
+
                 if (started && !fits (strlen (name) + 6))
                   {
@@ -1333 +1401 @@
   write_pubdef1 (N_TEXT, text_index, FALSE, 0);
   write_pubdef1 (N_TEXT, text_index, TRUE, 0);
+
+
+
+
+
   /* kso #456 2003-06-10: The debugger looks for 'main' not '_main'. */
   write_pubdef_main ();
   write_pubdef1 (N_DATA, udat_index, FALSE, text_size);
   write_pubdef1 (N_DATA, udat_index, TRUE, text_size);
+
+
+
+
+
   write_pubdef1 (N_BSS, bss_index, FALSE, text_size + data_size);
   write_pubdef1 (N_BSS, bss_index, TRUE, text_size + data_size);
+
+
+
+
+
 }
 
@@ -3218 +3301 @@
   write_libs ();
   write_debug_style ();
+
+
+
+
 
   /* Define all the OMF names (LNAMES record).  Of course, we must not