Changeset 86 for trunk/src/binutils/bfd

Timestamp:

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

Author:

bird

Message:

Applied the original 2.11.2 diff.

Location:

trunk/src/binutils/bfd

Files:

• acinclude.m4 (modified) (1 diff, 1 prop)
• aoutx.h (modified) (11 diffs, 1 prop)
• archive.c (modified) (1 diff, 1 prop)
• bfd-in2.h (modified) (1 diff, 1 prop)
• config.bfd (modified) (1 diff, 1 prop)
• configure.in (modified) (2 diffs, 1 prop)
• host-aout.c (modified) (1 diff, 1 prop)
• hosts/i386emx.h (added)
• i386aoutemx.c (added)
• libaout.h (modified) (1 diff, 1 prop)
• syms.c (modified) (3 diffs, 1 prop)
• sysdep.h (modified) (1 diff, 1 prop)
• targets.c (modified) (1 diff, 1 prop)
• trad-core.c (modified) (11 diffs, 1 prop)

trunk/src/binutils/bfd/acinclude.m4

@@ -4 +4 @@
 case "${host}" in
 changequote(,)dnl
-*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows* | *-*-os2*)
 changequote([,])dnl
   AC_DEFINE(USE_BINARY_FOPEN, 1, [Use b modifier when opening binary files?]) ;;

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))

trunk/src/binutils/bfd/archive.c

@@ -1914 +1914 @@
                        flags & BSF_WEAK ||
                        flags & BSF_INDIRECT ||
+#ifdef EMX
+                       flags & BSF_EMX_IMPORT1 ||
+#endif /* EMX */
                        bfd_is_com_section (sec))
                       && ! bfd_is_und_section (sec))

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

@@ -2803 +2803 @@
 #define BSF_DEBUGGING_RELOC 0x20000
 
+         /* Symbol is an emx import reference.  */
+#define BSF_EMX_IMPORT1   0x20000000
+
+         /* Symbol is an emx import definition.  */
+#define BSF_EMX_IMPORT2   0x40000000
+
   flagword flags;
 

trunk/src/binutils/bfd/config.bfd

@@ -915 +915 @@
     targ_selvecs=ieee_vec
     ;;
+
+  i[3456]86-*-os2*)
+    targ_defvec=i386aout_emx_vec
+    targ_selvecs=i386aout_emx_vec
+    targ_underscore=yes
+    ;;
+
 # END OF targmatch.h
   *)

trunk/src/binutils/bfd/configure.in

@@ -219 +219 @@
   i[3456]86-*-isc*)     COREFILE=trad-core.lo ;;
   i[3456]86-*-aix*)     COREFILE=aix386-core.lo ;;
-changequote([,])dnl
+  i[3456]86-*-os2*)
+changequote([,])dnl
+        COREFILE=trad-core.lo
+        AC_DEFINE(TRAD_HEADER,"hosts/i386emx.h")
+        ;;
   i860-*-mach3* | i860-*-osf1*)
         COREFILE=trad-core.lo
@@ -589 +593 @@
     i386netbsd_vec)             tb="$tb i386netbsd.lo aout32.lo" ;;
     i386os9k_vec)               tb="$tb i386os9k.lo aout32.lo" ;;
+    i386aout_emx_vec)           tb="$tb i386aoutemx.lo aout32.lo " ;;
     i860coff_vec)               tb="$tb coff-i860.lo cofflink.lo" ;;
     icoff_big_vec)              tb="$tb coff-i960.lo cofflink.lo" ;;

trunk/src/binutils/bfd/host-aout.c

@@ -36 +36 @@
 
    in the ./hosts/h-systemname.h file.  */
-
-#ifdef TRAD_HEADER
-#include TRAD_HEADER
-#endif
 
 #ifdef                  HOST_PAGE_SIZE

trunk/src/binutils/bfd/libaout.h

@@ -186 +186 @@
 {
     long a_info;                /* Magic number and flags, packed */
+#if defined (__EMX__)
+    long emx_add;
+#endif
     bfd_vma a_text;             /* length of text, in bytes  */
     bfd_vma a_data;             /* length of data, in bytes  */

trunk/src/binutils/bfd/syms.c

@@ -289 +289 @@
 .#define BSF_DEBUGGING_RELOC 0x20000
 .
+.       {* Symbol is an emx import reference.  *}
+.#define BSF_EMX_IMPORT1   0x20000000
+.
+.       {* Symbol is an emx import definition.  *}
+.#define BSF_EMX_IMPORT2   0x40000000
+.
 .  flagword flags;
 .
@@ -459 +465 @@
             ? (type & BSF_GLOBAL) ? '!' : 'l'
             : (type & BSF_GLOBAL) ? 'g' : ' '),
+#ifdef EMX
+           (type & BSF_EMX_IMPORT1) ? 'e' :
+           (type & BSF_EMX_IMPORT2) ? 'E' :
+#endif /* EMX */
            (type & BSF_WEAK) ? 'w' : ' ',
            (type & BSF_CONSTRUCTOR) ? 'C' : ' ',
@@ -602 +612 @@
         return 'W';
     }
+#ifdef EMX
+  if (symbol->flags & BSF_EMX_IMPORT1)
+    return 'e';
+  if (symbol->flags & BSF_EMX_IMPORT2)
+    return 'E';
+#endif /* EMX */
   if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
     return '?';

trunk/src/binutils/bfd/sysdep.h

@@ -26 +26 @@
 
 #include "config.h"
+
+#ifdef TRAD_HEADER
+#include TRAD_HEADER
+#endif
 
 #ifdef HAVE_STDDEF_H

trunk/src/binutils/bfd/targets.c

@@ -586 +586 @@
 extern const bfd_target i386bsd_vec;
 extern const bfd_target i386coff_vec;
+extern const bfd_target i386aout_emx_vec;
 extern const bfd_target i386dynix_vec;
 extern const bfd_target i386freebsd_vec;

trunk/src/binutils/bfd/trad-core.c

@@ -44 +44 @@
 #include <sys/user.h>           /* After a.out.h  */
 
-#ifdef TRAD_HEADER
-#include TRAD_HEADER
-#endif
-
   struct trad_core_struct
     {
       asection *data_section;
+#ifdef __EMX__
+      asection *heap_section;
+#endif /* __EMX__ */
       asection *stack_section;
       asection *reg_section;
@@ -58 +57 @@
 #define core_upage(bfd) (&((bfd)->tdata.trad_core_data->u))
 #define core_datasec(bfd) ((bfd)->tdata.trad_core_data->data_section)
+#ifdef __EMX__
+#define core_heapsec(bfd) ((bfd)->tdata.trad_core_data->heap_section)
+#endif /* __EMX__ */
 #define core_stacksec(bfd) ((bfd)->tdata.trad_core_data->stack_section)
 #define core_regsec(bfd) ((bfd)->tdata.trad_core_data->reg_section)
@@ -97 +99 @@
 
   /* Sanity check perhaps??? */
+#ifdef __EMX__
+  if (u.u_magic != UMAGIC)
+    return 0;
+#else /* !__EMX__ */
   if (u.u_dsize > 0x1000000)    /* Remember, it's in pages...  */
     {
@@ -145 +151 @@
 #endif
   }
+#endif /* !__EMX__ */
 
   /* OK, we believe you.  You're a core file (sure, sure).  */
@@ -171 +178 @@
   if (core_regsec (abfd) == NULL)
     return NULL;
+#ifdef EMX
+  core_heapsec (abfd) = (asection *) bfd_zmalloc (sizeof (asection));
+  if (core_heapsec (abfd) == NULL)
+    return NULL;
+#endif /* EMX */
 
   core_stacksec (abfd)->name = ".stack";
   core_datasec (abfd)->name = ".data";
+#ifdef EMX
+  core_heapsec (abfd)->name = ".heap";
+#endif /* EMX */
   core_regsec (abfd)->name = ".reg";
 
@@ -179 +194 @@
   core_datasec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
   core_regsec (abfd)->flags = SEC_HAS_CONTENTS;
-
+#ifdef EMX
+  core_heapsec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+#endif /* EMX */
+
+#ifdef EMX
+  core_datasec (abfd)->_raw_size =  u.u_data_end - u.u_data_base;
+  core_heapsec (abfd)->_raw_size = u.u_heap_brk - u.u_heap_base;
+  core_stacksec (abfd)->_raw_size = u.u_stack_end - u.u_stack_low;
+  core_regsec (abfd)->_raw_size = sizeof (struct user);
+#else /* not EMX */
   core_datasec (abfd)->_raw_size =  NBPG * u.u_dsize
 #ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
@@ -187 +211 @@
   core_stacksec (abfd)->_raw_size = NBPG * u.u_ssize;
   core_regsec (abfd)->_raw_size = NBPG * UPAGES; /* Larger than sizeof struct u */
+#endif /* not EMX */
 
   /* What a hack... we'd like to steal it from the exec file,
      since the upage does not seem to provide it.  FIXME.  */
+#ifdef EMX
+  core_datasec (abfd)->vma = u.u_data_base;
+  core_heapsec (abfd)->vma = u.u_heap_base;
+  core_stacksec (abfd)->vma = u.u_stack_low;
+#else /* not EMX */
 #ifdef HOST_DATA_START_ADDR
   core_datasec (abfd)->vma = HOST_DATA_START_ADDR;
@@ -201 +231 @@
   core_stacksec (abfd)->vma = HOST_STACK_END_ADDR - (NBPG * u.u_ssize);
 #endif
+#endif /* not EMX */
 
   /* This is tricky.  As the "register section", we give them the entire
@@ -218 +249 @@
   core_regsec (abfd)->vma = - (bfd_vma) u.u_ar0;
 
+#ifdef EMX
+  core_datasec (abfd)->filepos = u.u_data_off;
+  core_heapsec (abfd)->filepos = u.u_heap_off;
+  core_stacksec (abfd)->filepos = u.u_stack_off;
+#else /* not EMX */
   core_datasec (abfd)->filepos = NBPG * UPAGES;
   core_stacksec (abfd)->filepos = (NBPG * UPAGES) + NBPG * u.u_dsize
@@ -224 +260 @@
 #endif
       ;
+#endif /* not EMX */
+
   core_regsec (abfd)->filepos = 0; /* Register segment is the upage */
 
@@ -229 +267 @@
   core_stacksec (abfd)->alignment_power = 2;
   core_datasec (abfd)->alignment_power = 2;
+#ifdef EMX
+  core_heapsec (abfd)->alignment_power = 2;
+#endif /* EMX */
   core_regsec (abfd)->alignment_power = 2;
 
   abfd->sections = core_stacksec (abfd);
   core_stacksec (abfd)->next = core_datasec (abfd);
+#ifdef EMX
+  core_datasec (abfd)->next = core_heapsec (abfd);
+  core_heapsec (abfd)->next = core_regsec (abfd);
+  abfd->section_count = 4;
+#else /* not EMX */
   core_datasec (abfd)->next = core_regsec (abfd);
   abfd->section_count = 3;
+#endif /* not EMX */
 
   return abfd->xvec;