Resolve merge conflicts, adjust method of W^X handing (.sh files)

remove testsuites (not useable) remove mmalloc (not part of new binutils).

1 files changed, 108 insertions, 80 deletions

diff --git a/gnu/usr.bin/binutils/bfd/riscix.c b/gnu/usr.bin/binutils/bfd/riscix.c
index f5a9ec9bdcb..519514e4cf6 100644
--- a/gnu/usr.bin/binutils/bfd/riscix.c
+++ b/gnu/usr.bin/binutils/bfd/riscix.c
@@ -1,5 +1,5 @@
 /* BFD back-end for RISC iX (Acorn, arm) binaries.
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001
+   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
 
@@ -55,19 +55,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define N_SHARED_LIB(x) ((x).a_info & MF_USES_SL)
 
 /* Only a pure OMAGIC file has the minimal header */
-#define N_TXTOFF(x)                     \
- ((x).a_info == OMAGIC ? 32             \
-  : (N_MAGIC(x) == ZMAGIC) ? TARGET_PAGE_SIZE  \
-  : 999)
-
-#define N_TXTADDR(x)                                                         \
-  (N_MAGIC(x) != ZMAGIC ? 0 /* object file or NMAGIC */                      \
+#define N_TXTOFF(x)		\
+ ((x).a_info == OMAGIC		\
+  ? 32				\
+  : (N_MAGIC(x) == ZMAGIC	\
+     ? TARGET_PAGE_SIZE		\
+     : 999))
+
+#define N_TXTADDR(x)							     \
+  (N_MAGIC(x) != ZMAGIC							     \
+   ? (bfd_vma) 0 /* object file or NMAGIC */				     \
    /* Programs with shared libs are loaded at the first page after all the   \
       text segments of the shared library programs.  Without looking this    \
       up we can't know exactly what the address will be.  A reasonable guess \
-      is that a_entry will be in the first page of the executable.  */       \
-   : N_SHARED_LIB(x) ? ((x).a_entry & ~(TARGET_PAGE_SIZE - 1))                      \
-   : TEXT_START_ADDR)
+      is that a_entry will be in the first page of the executable.  */	     \
+   : (N_SHARED_LIB(x)							     \
+      ? ((x).a_entry & ~(bfd_vma) (TARGET_PAGE_SIZE - 1))		     \
+      : (bfd_vma) TEXT_START_ADDR))
 
 #define N_SYMOFF(x) \
   (N_TXTOFF (x) + (x).a_text + (x).a_data + (x).a_trsize + (x).a_drsize)
@@ -79,7 +83,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_arm
 
-#define MY(OP) CAT(riscix_,OP)
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (riscix_,OP)
 #define TARGETNAME "a.out-riscix"
 #define N_BADMAG(x) ((((x).a_info & ~007200) != ZMAGIC) && \
                      (((x).a_info & ~006000) != OMAGIC) && \
@@ -90,47 +97,47 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-#define WRITE_HEADERS(abfd, execp)					   \
-  {									   \
-    bfd_size_type text_size; /* dummy vars */				   \
-    file_ptr text_end;							   \
-    if (adata(abfd).magic == undecided_magic)				   \
-      NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);	   \
-    									   \
-    execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	   \
-    execp->a_entry = bfd_get_start_address (abfd);			   \
-    									   \
-    execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		   \
-		       obj_reloc_entry_size (abfd));			   \
-    execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		   \
-		       obj_reloc_entry_size (abfd));			   \
-    NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);		   \
-    									   \
-    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false;	   \
-    if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)		   \
-	!= EXEC_BYTES_SIZE)						   \
-      return false;							   \
-    /* Now write out reloc info, followed by syms and strings */	   \
-									   \
-    if (bfd_get_outsymbols (abfd) != (asymbol **) NULL			   \
-	&& bfd_get_symcount (abfd) != 0)				   \
-      {									   \
+#define WRITE_HEADERS(abfd, execp)					    \
+  {									    \
+    bfd_size_type text_size; /* dummy vars */				    \
+    file_ptr text_end;							    \
+    if (adata(abfd).magic == undecided_magic)				    \
+      NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);	    \
+    									    \
+    execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	    \
+    execp->a_entry = bfd_get_start_address (abfd);			    \
+    									    \
+    execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		    \
+		       obj_reloc_entry_size (abfd));			    \
+    execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		    \
+		       obj_reloc_entry_size (abfd));			    \
+    NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);		    \
+    									    \
+    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0			    \
+	|| bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,   \
+		      abfd) != EXEC_BYTES_SIZE)				    \
+      return FALSE;							    \
+    /* Now write out reloc info, followed by syms and strings */	    \
+									    \
+    if (bfd_get_outsymbols (abfd) != (asymbol **) NULL			    \
+	&& bfd_get_symcount (abfd) != 0)				    \
+      {									    \
 	if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)  \
-	  return false;							   \
-									   \
-	if (! NAME(aout,write_syms) (abfd)) return false;		   \
-									   \
+	  return FALSE;							    \
+									    \
+	if (! NAME(aout,write_syms) (abfd)) return FALSE;		    \
+									    \
 	if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0) \
-	  return false;							   \
-									   \
-	if (! riscix_squirt_out_relocs (abfd, obj_textsec (abfd)))	   \
-	  return false;							   \
+	  return FALSE;							    \
+									    \
+	if (! riscix_squirt_out_relocs (abfd, obj_textsec (abfd)))	    \
+	  return FALSE;							    \
 	if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0) \
-	  return false;							   \
-									   \
-	if (!NAME(aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))	   \
-	  return false;							   \
-      }									   \
+	  return FALSE;							    \
+									    \
+	if (!NAME(aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))	    \
+	  return FALSE;							    \
+      }									    \
   }
 
 #include "libaout.h"
@@ -143,20 +150,38 @@ riscix_fix_pcrel_26_done PARAMS ((bfd *, arelent *, asymbol *, PTR,
 static bfd_reloc_status_type
 riscix_fix_pcrel_26 PARAMS ((bfd *, arelent *, asymbol *, PTR,
 			     asection *, bfd *, char **));
+static const bfd_target *
+MY (object_p) PARAMS ((bfd *));
+
+reloc_howto_type *
+riscix_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
+
+void
+riscix_swap_std_reloc_out PARAMS ((bfd *, arelent *, struct reloc_std_external *));
+
+bfd_boolean
+riscix_squirt_out_relocs PARAMS ((bfd *, asection *));
+
+long
+MY (canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+
+const bfd_target *
+riscix_some_aout_object_p PARAMS ((bfd *, struct internal_exec *, const bfd_target *(*) (bfd *)));
+
 
 static reloc_howto_type riscix_std_reloc_howto[] = {
   /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
-  HOWTO( 0,              0,  0,   8,  false, 0, complain_overflow_bitfield,0,"8",        true, 0x000000ff,0x000000ff, false),
-  HOWTO( 1,              0,  1,   16, false, 0, complain_overflow_bitfield,0,"16",        true, 0x0000ffff,0x0000ffff, false),
-  HOWTO( 2,              0,  2,   32, false, 0, complain_overflow_bitfield,0,"32",        true, 0xffffffff,0xffffffff, false),
-  HOWTO( 3,              2,  3,   26, true, 0, complain_overflow_signed,  riscix_fix_pcrel_26 , "ARM26",      true, 0x00ffffff,0x00ffffff, false),
-  HOWTO( 4,              0,  0,   8,  true,  0, complain_overflow_signed,  0,"DISP8",     true, 0x000000ff,0x000000ff, true),
-  HOWTO( 5,              0,  1,   16, true,  0, complain_overflow_signed,  0,"DISP16",    true, 0x0000ffff,0x0000ffff, true),
-  HOWTO( 6,              0,  2,   32, true,  0, complain_overflow_signed,  0,"DISP32",    true, 0xffffffff,0xffffffff, true),
-  HOWTO( 7,              2,  3,   26, false, 0, complain_overflow_signed,  riscix_fix_pcrel_26_done, "ARM26D",true,0x00ffffff,0x00ffffff, false),
+  HOWTO( 0,              0,  0,   8,  FALSE, 0, complain_overflow_bitfield,0,"8",        TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO( 1,              0,  1,   16, FALSE, 0, complain_overflow_bitfield,0,"16",        TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO( 2,              0,  2,   32, FALSE, 0, complain_overflow_bitfield,0,"32",        TRUE, 0xffffffff,0xffffffff, FALSE),
+  HOWTO( 3,              2,  3,   26, TRUE, 0, complain_overflow_signed,  riscix_fix_pcrel_26 , "ARM26",      TRUE, 0x00ffffff,0x00ffffff, FALSE),
+  HOWTO( 4,              0,  0,   8,  TRUE,  0, complain_overflow_signed,  0,"DISP8",     TRUE, 0x000000ff,0x000000ff, TRUE),
+  HOWTO( 5,              0,  1,   16, TRUE,  0, complain_overflow_signed,  0,"DISP16",    TRUE, 0x0000ffff,0x0000ffff, TRUE),
+  HOWTO( 6,              0,  2,   32, TRUE,  0, complain_overflow_signed,  0,"DISP32",    TRUE, 0xffffffff,0xffffffff, TRUE),
+  HOWTO( 7,              2,  3,   26, FALSE, 0, complain_overflow_signed,  riscix_fix_pcrel_26_done, "ARM26D",TRUE,0x00ffffff,0x00ffffff, FALSE),
   EMPTY_HOWTO (-1),
-  HOWTO( 9,              0, -1,   16, false, 0, complain_overflow_bitfield,0,"NEG16",        true, 0x0000ffff,0x0000ffff, false),
-  HOWTO( 10,              0, -2,   32, false, 0, complain_overflow_bitfield,0,"NEG32",        true, 0xffffffff,0xffffffff, false)
+  HOWTO( 9,              0, -1,   16, FALSE, 0, complain_overflow_bitfield,0,"NEG16",        TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO( 10,              0, -2,   32, FALSE, 0, complain_overflow_bitfield,0,"NEG32",        TRUE, 0xffffffff,0xffffffff, FALSE)
 };
 
 #define RISCIX_TABLE_SIZE \
@@ -222,12 +247,12 @@ riscix_fix_pcrel_26 (abfd, reloc_entry, symbol, data, input_section,
       if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
 	flag = bfd_reloc_overflow;
     }
-  else if (relocation & ~0x03ffffff)
+  else if (relocation & ~ (bfd_vma) 0x03ffffff)
     flag = bfd_reloc_overflow;
 
   target &= ~0x00ffffff;
   target |= (relocation >> 2) & 0x00ffffff;
-  bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
+  bfd_put_32 (abfd, (bfd_vma) target, (bfd_byte *) data + addr);
 
   /* Now the ARM magic... Change the reloc type so that it is marked as done.
      Strictly this is only necessary if we are doing a partial relocation.  */
@@ -371,7 +396,7 @@ riscix_swap_std_reloc_out (abfd, g, natptr)
     }
 }
 
-boolean
+bfd_boolean
 riscix_squirt_out_relocs (abfd, section)
      bfd *abfd;
      asection *section;
@@ -381,15 +406,17 @@ riscix_squirt_out_relocs (abfd, section)
   size_t each_size;
 
   unsigned int count = section->reloc_count;
-  size_t natsize;
+  bfd_size_type natsize;
 
-  if (count == 0) return true;
+  if (count == 0)
+    return TRUE;
 
   each_size = obj_reloc_entry_size (abfd);
-  natsize = each_size * count;
+  natsize = each_size;
+  natsize *= count;
   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)
-    return false;
+    return FALSE;
 
   generic = section->orelocation;
 
@@ -399,14 +426,14 @@ riscix_squirt_out_relocs (abfd, section)
     riscix_swap_std_reloc_out (abfd, *generic,
 			       (struct reloc_std_external *) natptr);
 
-  if ( bfd_write ((PTR) native, 1, natsize, abfd) != natsize)
+  if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
     {
-      bfd_release(abfd, native);
-      return false;
+      bfd_release (abfd, native);
+      return FALSE;
     }
 
   bfd_release (abfd, native);
-  return true;
+  return TRUE;
 }
 
 /*
@@ -470,9 +497,9 @@ riscix_some_aout_object_p (abfd, execp, callback_to_real_object_p)
 {
   struct aout_data_struct *rawptr, *oldrawptr;
   const bfd_target *result;
+  bfd_size_type amt = sizeof (struct aout_data_struct);
 
-  rawptr = ((struct aout_data_struct  *)
-	    bfd_zalloc (abfd, sizeof (struct aout_data_struct )));
+  rawptr = (struct aout_data_struct  *) bfd_zalloc (abfd, amt);
 
   if (rawptr == NULL)
     return 0;
@@ -614,14 +641,15 @@ MY(object_p) (abfd)
   struct internal_exec exec;            /* Cleaned-up exec header */
   const bfd_target *target;
 
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE) {
-    if (bfd_get_error () != bfd_error_system_call)
-      bfd_set_error (bfd_error_wrong_format);
-    return 0;
-  }
+  if (bfd_bread ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
+      != EXEC_BYTES_SIZE)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
 
-  exec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
+  exec.a_info = H_GET_32 (abfd, exec_bytes.e_info);
 
   if (N_BADMAG (exec)) return 0;
 #ifdef MACHTYPE_OK