Changeset 86 for trunk/src/binutils/bfd/aoutx.h

Timestamp:

May 3, 2003, 11:45:43 PM (22 years ago)

Author:

bird

Message:

Applied the original 2.11.2 diff.

File:

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

trunk/src/binutils/bfd/aoutx.h

@@ -270 +270 @@
 
 #define TABLE_SIZE(TABLE)       (sizeof (TABLE)/sizeof (TABLE[0]))
+
+#ifndef IS_STAB
+#  define IS_STAB(flags) ((flags) & N_STAB)
+#endif
 
 reloc_howto_type *
@@ -1376 +1380 @@
   flagword visible;
 
-  if ((cache_ptr->type & N_STAB) != 0
+  if (IS_STAB(cache_ptr->type)
       || cache_ptr->type == N_FN)
     {
@@ -1615 +1619 @@
       cache_ptr->symbol.flags = BSF_WEAK;
       break;
+
+#ifdef EMX
+    case N_IMP1 | N_EXT:
+      cache_ptr->symbol.section = bfd_abs_section_ptr;
+      cache_ptr->symbol.flags = BSF_EMX_IMPORT1;
+      break;
+
+    case N_IMP2 | N_EXT:
+      cache_ptr->symbol.section = bfd_abs_section_ptr;
+      cache_ptr->symbol.flags = BSF_EMX_IMPORT2;
+      break;
+#endif /* EMX */
     }
 
@@ -3149 +3165 @@
          below.  */
       if (((type & N_EXT) == 0
-           || (type & N_STAB) != 0
+           || IS_STAB(type)
            || type == N_FN)
           && type != N_WEAKA
@@ -3180 +3196 @@
           || type == (N_BSS | N_EXT)
           || type == (N_ABS | N_EXT)
-          || type == (N_INDR | N_EXT))
+          || type == (N_INDR | N_EXT)
+#if defined (EMX)
+          || type == (N_IMP1 | N_EXT)
+#endif
+         )
         {
           /* This object file defines this symbol.  We must link it
@@ -3353 +3373 @@
 
       /* Ignore debugging symbols.  */
-      if ((type & N_STAB) != 0)
+      if (IS_STAB(type))
         continue;
 
@@ -3473 +3493 @@
           flags = BSF_WEAK;
           break;
+#ifdef EMX
+        case N_IMP1 | N_EXT:
+          section = bfd_abs_section_ptr;
+          flags = BSF_EMX_IMPORT1;
+          value = -1; /* -1 in *ABS* means external imported symbol */
+          break;
+        case N_IMP2 | N_EXT:
+          section = bfd_abs_section_ptr;
+          flags = BSF_EMX_IMPORT2;
+          break;
+#endif /* EMX */
         }
 
@@ -4189 +4220 @@
               break;
             case strip_debugger:
-              if ((type & N_STAB) != 0)
+              if (IS_STAB(type))
                 skip = true;
               break;
@@ -4237 +4268 @@
               symsec = NULL;
             }
-          else if ((type & N_STAB) != 0)
+          else if ((type == (N_IMP1 | N_EXT))
+                || (type == (N_IMP2 | N_EXT)))
+            symsec = bfd_abs_section_ptr;
+          else if (IS_STAB(type))
             {
               val = GET_WORD (input_bfd, sym->e_value);
@@ -4354 +4388 @@
                   break;
                 case discard_l:
-                  if ((type & N_STAB) == 0
+                  if (!IS_STAB(type)
                       && bfd_is_local_label_name (input_bfd, name))
                     skip = true;
@@ -4864 +4898 @@
               h = sym_hashes[r_index];
               if (h != (struct aout_link_hash_entry *) NULL
+#ifdef EMX
+              /* Don't touch imported symbols */
+                  && (!bfd_is_abs_section (h->root.u.def.section)
+                      || (h->root.u.def.value != -1))
+#endif
                   && (h->root.type == bfd_link_hash_defined
                       || h->root.type == bfd_link_hash_defweak))