Changeset 1257

Timestamp:

Feb 16, 2004, 5:16:29 AM (21 years ago)

Author:

bird

Message:

Fixed a few N_IMP1/2 problems. Can now link simple program.

File:

• trunk/src/binutils/bfd/aoutx.h (modified) (10 diffs, 1 prop)

trunk/src/binutils/bfd/aoutx.h

@@ -129 +129 @@
 #include "aout/stab_gnu.h"
 #include "aout/ar.h"
+
+#if defined(N_IMP1) && defined(N_IMP2)
+#define VALUE_N_IMP1 (0xffffffffU)
+#endif
 
 static bfd_boolean aout_get_external_symbols
@@ -1657 +1661 @@
       break;
 
-#ifdef EMX
+#if defined(N_IMP1) && defined(N_IMP2)
     case N_IMP1 | N_EXT:
       cache_ptr->symbol.section = bfd_abs_section_ptr;
@@ -1667 +1671 @@
       cache_ptr->symbol.flags = BSF_EMX_IMPORT2;
       break;
+    case N_IMP2: case N_IMP1: BFD_ASSERT (!"very bad"); break;
 #endif /* EMX */
     }
@@ -1710 +1715 @@
     }
 
+#if defined (N_IMP1) && defined (N_IMP2)
+  if (bfd_is_abs_section (sec))
+    {
+      if (cache_ptr->flags & BSF_EMX_IMPORT1)
+        sym_pointer->e_type[0] |= N_IMP1;
+      else if (cache_ptr->flags & BSF_EMX_IMPORT2)
+        sym_pointer->e_type[0] |= N_IMP2;
+      else
+        sym_pointer->e_type[0] |= N_ABS;
+    }
+#else
   if (bfd_is_abs_section (sec))
     sym_pointer->e_type[0] |= N_ABS;
+#endif
   else if (sec == obj_textsec (abfd))
     sym_pointer->e_type[0] |= N_TEXT;
@@ -3277 +3294 @@
           || type == (N_ABS | N_EXT)
           || type == (N_INDR | N_EXT)
-#if defined (EMX)
+#if defined(N_IMP1) && defined(N_IMP2)
           || type == (N_IMP1 | N_EXT)
 #endif
@@ -3595 +3612 @@
           flags = BSF_WEAK;
           break;
-#ifdef EMX
+#if defined(N_IMP1) && defined(N_IMP2)
         case N_IMP1 | N_EXT:
           section = bfd_abs_section_ptr;
           flags = BSF_EMX_IMPORT1;
-          value = -1; /* -1 in *ABS* means external imported symbol */
+          /* VALUE_N_IMP1 in *ABS* means external imported symbol. This is
+             a bit unreliable, but it's the best we can do in some cases. */
+          value = VALUE_N_IMP1;
           break;
         case N_IMP2 | N_EXT:
@@ -3605 +3624 @@
           flags = BSF_EMX_IMPORT2;
           break;
+        case N_IMP2: case N_IMP1: BFD_ASSERT (!"very bad"); break;
 #endif /* EMX */
         }
@@ -4366 +4386 @@
               symsec = NULL;
             }
-#ifdef EMX
+#if defined(N_IMP1) && defined(N_IMP2)
           else if ((type == (N_IMP1 | N_EXT))
-                   || (type == (N_IMP2 | N_EXT)))
+                || (type == (N_IMP2 | N_EXT)))
             symsec = bfd_abs_section_ptr;
 #endif
@@ -4450 +4470 @@
                              ? N_BSS
                              : N_WEAKB);
+#if defined(N_IMP1) && defined(N_IMP2)
+                  else if (hresolve->root.u.def.value == VALUE_N_IMP1)
+                    type |= N_IMP1;
+#endif
                   else
                     type |= (hresolve->root.type == bfd_link_hash_defined
@@ -4733 +4757 @@
         else if (sec == obj_bsssec (output_bfd))
           type = h->root.type == bfd_link_hash_defined ? N_BSS : N_WEAKB;
+#if defined(N_IMP1) && defined(N_IMP2)
+        else if (h->root.u.def.value == VALUE_N_IMP1)
+          type = N_IMP1;
+#endif
         else
           type = h->root.type == bfd_link_hash_defined ? N_ABS : N_WEAKA;