Changeset 295

Timestamp:

Jun 4, 2003, 11:19:19 PM (22 years ago)

Author:

bird

Message:

#465: WEAK stuff in debuginfo. Some bogus things for N_WEAKA which must be rechecked.

File:

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

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

@@ -562 +562 @@
                 t = sym_ptr[j].n_type & ~N_EXT;
                 if (t == N_TEXT || t == N_DATA || t == N_BSS
+                    /* kso #465 2003-06-04: Find weak symbols too. */
+                    || t == N_WEAKT || t == N_WEAKD || t == N_WEAKB
+                    || t == N_WEAKA /* hmm.. */
                     || (t == 0 && sym_ptr[j].n_value != 0))
                   return sym_ptr+j;
@@ -1581 +1584 @@
             switch (r->r_symbolnum & ~N_EXT)
               {
+              /* kso #465 2003-06-04: WEAK hack - bogus */
+              case N_WEAKT:
               case N_TEXT:
                 break;
+              /* kso #465 2003-06-04: WEAK hack - bogus */
+              case N_WEAKD:
               case N_DATA:
                 *(dword *)(src + r->r_address) -= start_data;
                 break;
+              /* kso #465 2003-06-04: WEAK hack - bogus */
+              case N_WEAKB:
               case N_BSS:
                 *(dword *)(src + r->r_address) -= start_bss;
                 break;
+              /* kso #465 2003-06-04: WEAK hack - bogus */
+              case N_WEAKA:
+                break;
               default:
-                error ("write_seg: Invalid relocation type");
+                error ("write_seg: Invalid relocation type (0x%.2x)", r->r_symbolnum);
               }
           }
@@ -2610 +2622 @@
 static void write_idmdll ()
 {
+  /* kso #465 2003-06-04: This test doesn't work any longer, sorry.
+   *                      Pretend everything is C++ */
+  #if 1
+  if (idmdll_name != NULL)
+  #else
   if (idmdll_name != NULL && find_symbol ("__gnu_compiled_cplusplus") != NULL)
+  #endif
     {
       init_rec (COMENT);