Changeset 86

Timestamp:

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

Author:

bird

Message:

Applied the original 2.11.2 diff.

Location:

trunk/src/binutils

Files:

• bfd/acinclude.m4 (modified) (1 diff, 1 prop)
• bfd/aoutx.h (modified) (11 diffs, 1 prop)
• bfd/archive.c (modified) (1 diff, 1 prop)
• bfd/bfd-in2.h (modified) (1 diff, 1 prop)
• bfd/config.bfd (modified) (1 diff, 1 prop)
• bfd/configure.in (modified) (2 diffs, 1 prop)
• bfd/host-aout.c (modified) (1 diff, 1 prop)
• bfd/hosts/i386emx.h (added)
• bfd/i386aoutemx.c (added)
• bfd/libaout.h (modified) (1 diff, 1 prop)
• bfd/syms.c (modified) (3 diffs, 1 prop)
• bfd/sysdep.h (modified) (1 diff, 1 prop)
• bfd/targets.c (modified) (1 diff, 1 prop)
• bfd/trad-core.c (modified) (11 diffs, 1 prop)
• binutils/addr2line.c (modified) (3 diffs, 1 prop)
• binutils/ar.c (modified) (2 diffs, 1 prop)
• binutils/bucomm.c (modified) (1 diff, 1 prop)
• binutils/nm.c (modified) (1 diff, 1 prop)
• binutils/objdump.c (modified) (1 diff, 1 prop)
• binutils/rename.c (modified) (1 diff, 1 prop)
• binutils/size.c (modified) (1 diff, 1 prop)
• binutils/strings.c (modified) (1 diff, 1 prop)
• config/mh-emx (added)
• configure.in (modified) (1 diff, 1 prop)
• gas/as.c (modified) (5 diffs, 1 prop)
• gas/config/tc-i386.c (modified) (2 diffs, 1 prop)
• gas/config/tc-i386.h (modified) (1 diff, 1 prop)
• gas/config/te-emx.h (added)
• gas/configure.in (modified) (1 diff, 1 prop)
• gas/write.c (modified) (2 diffs, 1 prop)
• gprof/gmon.h (modified) (1 diff, 1 prop)
• gprof/hertz.h (modified) (1 diff, 1 prop)
• include/aout/aout64.h (modified) (1 diff, 1 prop)
• ld/Makefile.in (modified) (1 diff, 1 prop)
• ld/configure.host (modified) (1 diff, 1 prop)
• ld/configure.tgt (modified) (1 diff, 1 prop)
• ld/emulparams/i386aoutemx.sh (added)
• ld/emultempl/i386aoutemx.em (added)
• ld/ldctor.c (modified) (1 diff, 1 prop)
• ld/ldemul.c (modified) (1 diff, 1 prop)
• ld/ldemul.h (modified) (1 diff, 1 prop)
• ld/ldfile.c (modified) (1 diff, 1 prop)
• ld/ldmain.c (modified) (2 diffs, 1 prop)
• ld/scripttempl/i386aoutemx.sc (added)
• libiberty/config/mh-emx (added)

trunk/src/binutils/bfd/acinclude.m4

@@ -4 +4 @@
 case "${host}" in
 changequote(,)dnl
-*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
 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]))
+
+
+
+
 
 reloc_howto_type *
@@ -1376 +1380 @@
   flagword visible;
 
-  if ((cache_ptr->type & N_STAB) != 0
+  if (
       || cache_ptr->type == N_FN)
     {
@@ -1615 +1619 @@
       cache_ptr->symbol.flags = BSF_WEAK;
       break;
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -3149 +3165 @@
          below.  */
       if (((type & N_EXT) == 0
-           || (type & N_STAB) != 0
+           || 
            || 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 ()
         continue;
 
@@ -3473 +3493 @@
           flags = BSF_WEAK;
           break;
+
+
+
+
+
+
+
+
+
+
+
         }
 
@@ -4189 +4220 @@
               break;
             case strip_debugger:
-              if ((type & N_STAB) != 0)
+              if ()
                 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 (
                       && 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
+
+
+
+
+
                   && (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 ||
+
+
+
                        bfd_is_com_section (sec))
                       && ! bfd_is_und_section (sec))

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

@@ -2803 +2803 @@
 #define BSF_DEBUGGING_RELOC 0x20000
 
+
+
+
+
+
+
   flagword flags;
 

trunk/src/binutils/bfd/config.bfd

@@ -915 +915 @@
     targ_selvecs=ieee_vec
     ;;
+
+
+
+
+
+
+
 # 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" ;;
+
     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 */
+
+
+
     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
 .
+
+
+
+
+
+
 .  flagword flags;
 .
@@ -459 +465 @@
             ? (type & BSF_GLOBAL) ? '!' : 'l'
             : (type & BSF_GLOBAL) ? 'g' : ' '),
+
+
+
+
            (type & BSF_WEAK) ? 'w' : ' ',
            (type & BSF_CONSTRUCTOR) ? 'C' : ' ',
@@ -602 +612 @@
         return 'W';
     }
+
+
+
+
+
+
   if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
     return '?';

trunk/src/binutils/bfd/sysdep.h

@@ -26 +26 @@
 
 #include "config.h"
+
+
+
+
 
 #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 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;
+
+
+
       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)
+
+
+
 #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??? */
+
+
+
+
   if (u.u_dsize > 0x1000000)    /* Remember, it's in pages...  */
     {
@@ -145 +151 @@
 #endif
   }
+
 
   /* OK, we believe you.  You're a core file (sure, sure).  */
@@ -171 +178 @@
   if (core_regsec (abfd) == NULL)
     return NULL;
+
+
+
+
+
 
   core_stacksec (abfd)->name = ".stack";
   core_datasec (abfd)->name = ".data";
+
+
+
   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 */
+
 
   /* What a hack... we'd like to steal it from the exec file,
      since the upage does not seem to provide it.  FIXME.  */
+
+
+
+
+
 #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
+
 
   /* This is tricky.  As the "register section", we give them the entire
@@ -218 +249 @@
   core_regsec (abfd)->vma = - (bfd_vma) u.u_ar0;
 
+
+
+
+
+
   core_datasec (abfd)->filepos = NBPG * UPAGES;
   core_stacksec (abfd)->filepos = (NBPG * UPAGES) + NBPG * u.u_dsize
@@ -224 +260 @@
 #endif
       ;
+
+
   core_regsec (abfd)->filepos = 0; /* Register segment is the upage */
 
@@ -229 +267 @@
   core_stacksec (abfd)->alignment_power = 2;
   core_datasec (abfd)->alignment_power = 2;
+
+
+
   core_regsec (abfd)->alignment_power = 2;
 
   abfd->sections = core_stacksec (abfd);
   core_stacksec (abfd)->next = core_datasec (abfd);
+
+
+
+
+
   core_datasec (abfd)->next = core_regsec (abfd);
   abfd->section_count = 3;
+
 
   return abfd->xvec;

trunk/src/binutils/binutils/addr2line.c

@@ -211 +211 @@
           if (base_names && filename != NULL)
             {
+
               char *h;
 
@@ -216 +217 @@
               if (h != NULL)
                 filename = h + 1;
+
+
+
             }
 
@@ -286 +290 @@
   textdomain (PACKAGE);
 
+
+
+
   program_name = *argv;
+
   xmalloc_set_program_name (program_name);
 

trunk/src/binutils/binutils/ar.c

@@ -385 +385 @@
   textdomain (PACKAGE);
 
+
+
+
+
+
   program_name = argv[0];
+
   xmalloc_set_program_name (program_name);
 
@@ -573 +579 @@
           full_pathname = true;
           break;
+
+
+
+
+
         default:
           /* xgettext:c-format */

trunk/src/binutils/binutils/bucomm.c

@@ -217 +217 @@
   static char template[] = "stXXXXXX";
   char *tmpname;
+
+
+
+
+
+
+
   char *slash = strrchr (filename, '/');
+
 
 #ifdef HAVE_DOS_BASED_FILE_SYSTEM

trunk/src/binutils/binutils/nm.c

@@ -406 +406 @@
   textdomain (PACKAGE);
 
+
+
+
+
+
   program_name = *argv;
+
   xmalloc_set_program_name (program_name);
 

trunk/src/binutils/binutils/objdump.c

@@ -2826 +2826 @@
   textdomain (PACKAGE);
 
+
+
+
+
+
   program_name = *argv;
+
   xmalloc_set_program_name (program_name);
 

trunk/src/binutils/binutils/rename.c

@@ -156 +156 @@
   exists = lstat (to, &s) == 0;
 
-#if defined (_WIN32) && !defined (__CYGWIN32__)
+#if 2__)
   /* Win32, unlike unix, will not erase `to' in `rename(from, to)' but
      fail instead.  Also, chown is not present.  */

trunk/src/binutils/binutils/size.c

@@ -119 +119 @@
   textdomain (PACKAGE);
 
+
+
+
+
+
   program_name = *argv;
+
   xmalloc_set_program_name (program_name);
 

trunk/src/binutils/binutils/strings.c

@@ -152 +152 @@
   textdomain (PACKAGE);
 
+
+
+
   program_name = argv[0];
+
   xmalloc_set_program_name (program_name);
   string_min = -1;

trunk/src/binutils/configure.in

@@ -217 +217 @@
   *-windows*)
     host_makefile_frag="${host_makefile_frag} config/mh-windows"
+
+
+
     ;;
   vax-*-ultrix2*)

trunk/src/binutils/gas/as.c

@@ -110 +110 @@
 
 static struct itbl_file_list *itbl_files;
+
+
+
+
+
+
+
 
 
@@ -780 +787 @@
   int keep_it;
 
+
+
+
+
+
+
+
   start_time = get_run_time ();
 
@@ -801 +815 @@
 #endif
 
+
+
+
   myname = argv[0];
+
   xmalloc_set_program_name (myname);
 
@@ -827 +845 @@
   subsegs_begin ();
   parse_args (&argc, &argv);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   read_begin ();
   input_scrub_begin ();
@@ -928 +969 @@
   if (!keep_it)
     unlink (out_file_name);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   input_scrub_end ();

trunk/src/binutils/gas/config/tc-i386.c

@@ -4509 +4509 @@
   {"64", no_argument, NULL, OPTION_64},
 #endif
+
+
+
+
+
+
   {NULL, no_argument, NULL, 0}
 };
 size_t md_longopts_size = sizeof (md_longopts);
+
+
+
+
+
 
 int
@@ -4565 +4576 @@
       default_arch = "i386";
       break;
+
+
+
+
+
+
+
+
+
+
 
     default:

trunk/src/binutils/gas/config/tc-i386.h

@@ -94 +94 @@
 #ifdef TE_DYNIX
 #define AOUT_TARGET_FORMAT      "a.out-i386-dynix"
+
+
+
 #endif
 #ifndef AOUT_TARGET_FORMAT

trunk/src/binutils/gas/configure.in

@@ -280 +280 @@
       i386-*-mingw32*)      fmt=coff em=pe bfd_gas=yes ;;
       i386-*-*nt*)          fmt=coff em=pe bfd_gas=yes ;;
+
       i386-*-vxworks*)      fmt=aout ;;
       i386-*-chaos)         fmt=elf ;;

trunk/src/binutils/gas/write.c

@@ -857 +857 @@
 
 #ifdef BFD_ASSEMBLER
+
+
+
         /* We can never adjust a reloc against a weak symbol.  If we
            did, and the weak symbol was overridden by a real symbol
@@ -866 +869 @@
             goto done;
           }
+
 #endif
 

trunk/src/binutils/gprof/gmon.h

@@ -70 +70 @@
 /*
  * Histogram counters are unsigned shorts:
+
  */
+
+
+
 #define HISTCOUNTER unsigned short
+
 
 /*

trunk/src/binutils/gprof/hertz.h

@@ -3 +3 @@
 
 #include "gprof.h"
+
+
+
+
 
 #define HZ_WRONG 0              /* impossible clock frequency */

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

@@ -323 +323 @@
 #define N_WEAKD 0x10            /* Weak data symbol.  */
 #define N_WEAKB 0x11            /* Weak bss symbol.  */
+
+
+
+
 
 /* Relocations 

trunk/src/binutils/ld/Makefile.in

@@ -1317 +1317 @@
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
         ${GENSCRIPTS} i386pe_posix "$(tdir_i386pe_posix)"
+
+
+
 elnk960.c: $(srcdir)/emulparams/lnk960.sh \
   $(srcdir)/emultempl/lnk960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}

trunk/src/binutils/ld/configure.host

@@ -223 +223 @@
   ;;
 
+
+
+
 esac

trunk/src/binutils/ld/configure.tgt

@@ -171 +171 @@
 i[3456]86-*-interix*)   targ_emul=i386pe_posix;
                         targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+
 i[3456]86-*-beospe*)    targ_emul=i386beos ;;
 i[3456]86-*-beos*)      targ_emul=elf_i386_be ;;

trunk/src/binutils/ld/ldctor.c

@@ -363 +363 @@
               if (e->name != NULL)
                 minfo ("%T\n", e->name);
-              else
+              else
                 minfo ("%G\n", e->section->owner, e->section, e->value);
+
+
             }
 

trunk/src/binutils/ld/ldemul.c

@@ -304 +304 @@
   return 0;
 }
+
+
+
+
+
+
+

trunk/src/binutils/ld/ldemul.h

@@ -140 +140 @@
     PARAMS ((char *, struct lang_input_statement_struct *));
 
+
+
+
 } ld_emulation_xfer_type;
 

trunk/src/binutils/ld/ldfile.c

@@ -240 +240 @@
            arch = arch->next)
         {
+
+
+
+
+
           found = ldfile_open_file_search (arch->name, entry, "lib", ".a");
           if (found)

trunk/src/binutils/ld/ldmain.c

@@ -174 +174 @@
   textdomain (PACKAGE);
 
+
+
+
+
   program_name = argv[0];
+
   xmalloc_set_program_name (program_name);
 
@@ -400 +405 @@
       if (! bfd_close (output_bfd))
         einfo (_("%F%B: final close failed: %E\n"), output_bfd);
+
+
+
 
       /* If the --force-exe-suffix is enabled, and we're making an