Changeset 1153

Timestamp:

Feb 3, 2004, 8:55:36 PM (22 years ago)

Author:

bird

Message:

#483: binutils now generates correct fixups.

File:

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

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

@@ -1150 +1150 @@
         add_extdef (&started, str_ptr + sym_ptr[i].n_un.n_strx, sym_more[i].hll_type);
       }
-#if 0 /* this isn't actually required if only the assembler could do what it's supposed to... */
+#if 1 /* this isn't actually required if only the assembler could do what it's supposed to... */
     else if (sym_ptr[i].n_type >= N_WEAKA && sym_ptr[i].n_type <= N_WEAKB)
       { /* Not convinced about this yet, I mean there should really be
@@ -1755 +1755 @@
                 break;
               case N_TEXT|N_EXT:
+              case N_WEAKT:
                 *(dword *)(src + r->r_address) = 0;
                 break;
               case N_DATA:
               case N_DATA|N_EXT:
+              case N_WEAKD:
                 *(dword *)(src + r->r_address) -= start_data;
                 break;
               case N_BSS:
               case N_BSS|N_EXT:
+              case N_WEAKB:
                 *(dword *)(src + r->r_address) -= start_bss;
                 break;