Changeset 2002 for trunk/src/binutils

Timestamp:

Jun 6, 2005, 4:42:09 AM (20 years ago)

Author:

bird

Message:

N_EXP - EMX extension for export declarations.

Location:

trunk/src/binutils

Files:

• bfd/aoutx.h (modified) (5 diffs, 1 prop)
• bfd/bfd-in2.h (modified) (1 diff, 1 prop)
• bfd/hosts/i386emx.h (modified) (1 diff, 1 prop)
• bfd/i386aoutemx.c (modified) (1 diff, 1 prop)
• bfd/syms.c (modified) (3 diffs, 1 prop)
• include/aout/aout64.h (modified) (1 diff, 1 prop)
• include/aout/aoutemx.h (modified) (1 diff, 1 prop)

trunk/src/binutils/bfd/aoutx.h

@@ -1672 +1672 @@
       break;
     case N_IMP2: case N_IMP1: BFD_ASSERT (!"very bad"); break;
-#endif /* EMX */
+#endif /* EMX: N_IMP[12] */
+
+#if defined(N_EXP)
+      case N_EXP:
+      case N_EXP | N_EXT:
+        cache_ptr->symbol.section = bfd_abs_section_ptr;
+        cache_ptr->symbol.flags = BSF_EMX_EXPORT;
+        break;
+#endif /* EMX: N_EXP */
     }
 
@@ -1715 +1723 @@
     }
 
+  if (bfd_is_abs_section (sec))
+    {
 #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;
@@ -1723 +1731 @@
         sym_pointer->e_type[0] |= N_IMP2;
       else
+#endif
+#if defined(N_EXP)
+      if (cache_ptr->flags & BSF_EMX_EXPORT)
+        sym_pointer->e_type[0] |= N_EXP;
+      else
+#endif /* EMX: N_EXP */
         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;
@@ -3625 +3635 @@
           break;
         case N_IMP2: case N_IMP1: BFD_ASSERT (!"very bad"); break;
-#endif /* EMX */
+#endif /* EMX: N_IMP[12] */
+#if defined(N_EXP)
+        case N_EXP | N_EXT:
+        case N_EXP:
+          section = bfd_abs_section_ptr;
+          flags = BSF_EMX_EXPORT;
+          break;
+#endif /* EMX: N_EXP */
         }
 
@@ -4391 +4408 @@
             symsec = bfd_abs_section_ptr;
 #endif
+#if defined(N_EXP)
+          else if (type == (N_EXP | N_EXT))
+            symsec = bfd_abs_section_ptr;
+#endif /* EMX: N_EXP */
           else if (IS_STAB(type))
             {

trunk/src/binutils/bfd/bfd-in2.h

@@ -3600 +3600 @@
 #define BSF_THREAD_LOCAL  0x40000
 
+  /* Symbol is an emx export definition.  */
+#define BSF_EMX_EXPORT   0x10000000
+
   /* Symbol is an emx import reference.  */
 #define BSF_EMX_IMPORT1   0x20000000

trunk/src/binutils/bfd/hosts/i386emx.h

@@ -61 +61 @@
  /* bird: should this be BFD wide or only for the emx target? */
 #define IS_STAB(flags) (((flags) & N_STAB) \
-        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT))
+        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT) \
+        && ((flags) & ~N_EXT) != N_EXP)
 
 #endif /* __I386EMX__H__ */

trunk/src/binutils/bfd/i386aoutemx.c

@@ -72 +72 @@
 
 #define IS_STAB(flags) (((flags) & N_STAB) \
-        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT))
+        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT) \
+        && ((flags) & ~N_EXT) != N_EXP)
 
 /* end of old hosts/i386emx.h */

trunk/src/binutils/bfd/syms.c

@@ -289 +289 @@
 .#define BSF_THREAD_LOCAL  0x40000
 .
+.  {* Symbol is an emx export definition.  *}
+.#define BSF_EMX_EXPORT    0x10000000
+.
 .  {* Symbol is an emx import reference.  *}
 .#define BSF_EMX_IMPORT1   0x20000000
@@ -477 +480 @@
            (type & BSF_EMX_IMPORT1) ? 'e' :
            (type & BSF_EMX_IMPORT2) ? 'E' :
+           (type & BSF_EMX_EXPORT) ? 'X' :
 #endif /* EMX */
            (type & BSF_WEAK) ? 'w' : ' ',
@@ -683 +687 @@
   if (symbol->flags & BSF_EMX_IMPORT2)
     return 'E';
+  if (symbol->flags & BSF_EMX_EXPORT)
+    return 'X';
 #endif /* EMX */
   if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))

trunk/src/binutils/include/aout/aout64.h

@@ -337 +337 @@
 #define N_IMP1 0x68             /* Import reference (emx specific) */
 #define N_IMP2 0x6a             /* Import definition (emx specific) */
+#define N_EXP  0x6c             /* Export definition (emx specific) */
 
 /* Relocations

trunk/src/binutils/include/aout/aoutemx.h

@@ -24 +24 @@
 #define N_IMP1 0x68             /* Import reference (emx specific) */
 #define N_IMP2 0x6a             /* Import definition (emx specific) */
+#define N_EXP  0x6c             /* Export definition (emx specific) */