Changeset 729 for trunk/src/binutils/bfd

Timestamp:

Sep 25, 2003, 9:27:01 PM (22 years ago)

Author:

zap

Message:

.

Location:

trunk/src/binutils/bfd

Files:

• aoutx.h (modified) (1 diff, 1 prop)
• config.bfd (modified) (2 diffs, 1 prop)
• configure (modified) (1 diff, 1 prop)
• configure.in (modified) (2 diffs, 1 prop)
• host-aout.c (modified) (1 diff, 1 prop)
• hosts/i386emx.h (modified) (1 diff, 1 prop)
• i386aoutemx.c (modified) (4 diffs, 1 prop)
• libaout.h (modified) (1 diff, 1 prop)
• sysdep.h (modified) (1 diff, 1 prop)
• targets.c (modified) (1 diff, 1 prop)
• trad-core.c (modified) (3 diffs, 1 prop)

trunk/src/binutils/bfd/aoutx.h

@@ -4995 +4995 @@
               /* Don't touch imported symbols */
                   && (!bfd_is_abs_section (h->root.u.def.section)
-                      || (h->root.u.def.value != -1))
+                      || (h->root.u.def.value != (unsigned)-1))
 #endif
                   && (h->root.type == bfd_link_hash_defined

trunk/src/binutils/bfd/config.bfd

@@ -543 +543 @@
     targ_selfvecs=i386chaos_vec
     ;;
+  i[3456]86-*-os2*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="bfd_elf32_i386_vec i386aout_emx_vec"
+    targ_underscore=yes
+    ;;
 
   i860-*-mach3* | i860-*-osf1* | i860-*-coff*)
@@ -1249 +1254 @@
     ;;
 
-  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

@@ -6345 +6345 @@
     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" ;;
+    i386aout_emx_vec)           tb="$tb i386aoutemx.lo aout32.lo" ;;
     i386pe_vec)                 tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
     i386pei_vec)                tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;

trunk/src/binutils/bfd/configure.in

@@ -245 +245 @@
 changequote([,])dnl
         COREFILE=trad-core.lo
-        AC_DEFINE(TRAD_HEADER,"hosts/i386emx.h")
+        TRAD_HEADER='"hosts/i386emx.h"'
         ;;
   i860-*-mach3* | i860-*-osf1*)
@@ -709 +709 @@
     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" ;;
+    i386aout_emx_vec)           tb="$tb i386aoutemx.lo" ;;
     i386pe_vec)                 tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
     i386pei_vec)                tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;

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

@@ -38 +38 @@
    in the ./hosts/h-systemname.h file.  */
 
-#ifndef __EMX__ /* r=bird: Code was initially removed. Is this __EMX__ or EMX
-                 * and why don't we include it? anything to do with sysdep.h? */
 #ifdef TRAD_HEADER
 #include TRAD_HEADER
 #endif
-#endif /* !__EMX__ */
 
 #ifdef                  HOST_PAGE_SIZE

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

@@ -1 +1 @@
 /* Intel ix86 running OS/2 or DOS */
 
-#ifndef __I386EMX__H__
-#define __I386EMX__H__
-
-#define EMX
-
-#define DEFAULT_ARCH            bfd_arch_i386
-
-#define TARGET_PAGE_SIZE        0x1000
-#define TARGET_SEGMENT_SIZE     0x10000
-#define TEXT_START_ADDR         0x10000
-#define TARGET_STACK_END_ADDR   0x80000000
-
-#define ZMAGIC_DISK_BLOCK_SIZE  1024
-#define BYTES_IN_WORD           4
-#define NO_CORE_COMMAND
-
-#define MY(OP)                  CONCAT2(i386aout_emx_,OP)
-#define TARGETNAME              "a.out-emx"
-#define NO_WRITE_HEADER_KLUDGE  1
-
-/* a.out executables emx-specific header */
-struct exec
-{
-  unsigned long a_info;         /* Use macros N_MAGIC, etc for access */
-  unsigned a_text;              /* length of text, in bytes */
-  unsigned a_data;              /* length of data, in bytes */
-  unsigned a_bss;               /* length of uninitialized data area for file, in bytes */
-  unsigned a_syms;              /* length of symbol table data in file, in bytes */
-  unsigned a_entry;             /* start address */
-  unsigned a_trsize;            /* length of relocation info for text, in bytes */
-  unsigned a_drsize;            /* length of relocation info for data, in bytes */
-};
-
-#define N_HEADER_IN_TEXT(x) 0
-
-#define N_TXTOFF(x)     \
-    (N_MAGIC(x) != ZMAGIC ? EXEC_BYTES_SIZE : /* object file or NMAGIC */\
-     N_SHARED_LIB(x) ? 0 : \
-     N_HEADER_IN_TEXT(x) ?      \
-            EXEC_BYTES_SIZE :                   /* no padding */\
-            0x400 + (x).emx_add \
-    )
-
-#define N_DATOFF(x) (N_TXTOFF(x) + N_TXTSIZE(x))
-
-#define IS_STAB(flags) (((flags) & N_STAB) \
-        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT))
-
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
-#endif /* __I386EMX__H__ */
+#define HOST_PAGE_SIZE          0x1000
+#define HOST_SEGMENT_SIZE       0x10000
+#define HOST_TEXT_START_ADDR    0x10000
+#define HOST_STACK_END_ADDR     0x80000000

trunk/src/binutils/bfd/i386aoutemx.c

@@ -18 +18 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-#include "libaout.h"
+#define EMX
 
-static bfd_boolean MY(set_sizes) ();
+#define ARCH_SIZE               32
+#define DEFAULT_ARCH            bfd_arch_i386
+
+#define TEXT_START_ADDR         0x10000
+#define TARGET_PAGE_SIZE        0x1000
+#define TARGET_SEGMENT_SIZE     0x10000
+#define TARGET_STACK_END_ADDR   0x80000000
+
+#define ZMAGIC_DISK_BLOCK_SIZE  1024
+#define BYTES_IN_WORD           4
+#define NO_CORE_COMMAND
+
+#define MY(OP)                  CONCAT2(i386aout_emx_,OP)
+#define TARGETNAME              "a.out-emx"
+
+#define IS_STAB(flags) (((flags) & N_STAB) \
+        && (flags) != (N_IMP1|N_EXT) && (flags) != (N_IMP2|N_EXT))
+
+#include "aout/aoutemx.h"
+#include "aoutx.h"
+
+#define MY_object_p             MY(object_p)
 #define MY_backend_data &MY(backend_data)
 
-static const bfd_target *MY(object_p) ();
-#define MY_object_p             MY(object_p)
+static bfd_boolean MY(set_sizes) PARAMS ((bfd *));
+static const bfd_target *MY(object_p) PARAMS ((bfd *));
 
 static CONST struct aout_backend_data MY(backend_data) = {
@@ -47 +65 @@
 #include "aout-target.h"
 
+#ifndef __EMX__
+
+/* Cross-compilation support, borrowed from EMX C runtime library */
+int _fseek_hdr PARAMS ((FILE *));
+
+int _fseek_hdr (FILE *stream)
+{
+  struct
+    {
+      char magic[2];
+      char fill1[6];
+      unsigned short hdr_size;
+    } exe_hdr;
+  struct
+    {
+      char sig[16];
+      char bound;
+      char fill1;
+      unsigned short hdr_loc_lo;      /* cannot use long, alignment! */
+      unsigned short hdr_loc_hi;
+    } patch;
+  long original_pos;
+  int saved_errno;
+
+  original_pos = ftell (stream);
+  if (fread (&exe_hdr, sizeof (exe_hdr), 1, stream) != 1)
+    goto failure;
+  if (memcmp (exe_hdr.magic, "MZ", 2) != 0)
+    return (fseek (stream, original_pos, SEEK_SET) == -1 ? -1 : 0);
+  if (fseek (stream, original_pos + 16 * exe_hdr.hdr_size, SEEK_SET) == -1)
+    goto failure;
+  if (fread (&patch, sizeof (patch), 1, stream) != 1)
+    goto failure;
+  if (memcmp (patch.sig, "emx", 3) != 0)
+    goto failure;
+  if (fseek (stream, original_pos + patch.hdr_loc_lo
+             + 65536L * patch.hdr_loc_hi, SEEK_SET) == -1)
+    goto failure;
+  return 0;
+
+failure:
+  saved_errno = errno;
+  fseek (stream, original_pos, SEEK_SET);
+  errno = saved_errno;
+  return -1;
+}
+#endif
+
 /*
  * Finish up the reading of an a.out file header
@@ -62 +128 @@
   (void)_fseek_hdr(bfd_cache_lookup(abfd));
   add = bfd_tell (abfd) - org_pos;
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
+
+  if (bfd_bread ((PTR) &exec_bytes, EXEC_BYTES_SIZE, abfd)
       != EXEC_BYTES_SIZE)
   {
@@ -76 +143 @@
 
   NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec);
-  exec.emx_add = add;
+  exec.a_hdrofs = add;
   target = NAME(aout,some_aout_object_p) (abfd, &exec, MY(callback));
   return target;

trunk/src/binutils/bfd/libaout.h

@@ -253 +253 @@
 {
     long a_info;                /* Magic number and flags, packed */
-#if defined (__EMX__)
-    long emx_add;
+#if defined (EMX)
+    long a_hdrofs;              /* Offset from file start to a.out header */
 #endif
     bfd_vma a_text;             /* length of text, in bytes  */

trunk/src/binutils/bfd/sysdep.h

@@ -26 +26 @@
 
 #include "config.h"
-
-#ifdef __EMX__ /* r=bird: hmm seen this before. */
-#ifdef TRAD_HEADER
-#include TRAD_HEADER
-#endif
-#endif /* __EMX__ */
 
 #ifdef HAVE_STDDEF_H

trunk/src/binutils/bfd/targets.c

@@ -935 +935 @@
 #endif
         &hp300hpux_vec,
+        &i386aout_emx_vec,
         &i386aout_vec,
         &i386bsd_vec,

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

@@ -44 +44 @@
 #include <sys/user.h>           /* After a.out.h  */
 
-#ifndef __EMX__ /* r=bird: Code was initially removed. Why don't we include it? anything to do with sysdep.h? */
 #ifdef TRAD_HEADER
 #include TRAD_HEADER
 #endif
-#endif /* !__EMX__ */
 
 struct trad_core_struct
@@ -106 +104 @@
 
   /* Sanity check perhaps??? */
-#ifdef __EMX__                          /* r=bird: EMX not __EMX__ thing?? */
+#ifdef EMX
   if (u.u_magic != UMAGIC)
     return 0;
-#else /* !__EMX__ */
+#else /* !EMX */
   if (u.u_dsize > 0x1000000)    /* Remember, it's in pages...  */
     {
@@ -158 +156 @@
 #endif
   }
-#endif /* !__EMX__ */
+#endif /* !EMX */
 
   /* OK, we believe you.  You're a core file (sure, sure).  */