Enlist the FreeBSD-CURRENT users as testers of what is to become Binutils

version 2.12.0.  These bits are taken from the FSF anoncvs repo on
27-January-2002 03:41 PST.

17 files changed, 859 insertions, 79 deletions

diff --git a/contrib/binutils/include/elf/ChangeLog b/contrib/binutils/include/elf/ChangeLog
index d346b9d..a0b4f71 100644
--- a/contrib/binutils/include/elf/ChangeLog
+++ b/contrib/binutils/include/elf/ChangeLog
@@ -1,15 +1,125 @@
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (DT_PPC64_GLINK): Define.
+
+2002-01-09  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* common.h: Update copyright years.
+	(NT_NETBSDCORE_PROCINFO): Define.
+	(NT_NETBSDCORE_FIRSTMACH): Define. 
+
+2002-01-06  Steve Ellcey  <sje@cup.hp.com>
+
+	* ia64.h (ELF_STRING_ia64_unwind_hdr): New Macro for HP-UX.
+	(SHT_IA_64_HP_OPT_ANOT): Ditto
+	(PT_IA_64_HP_OPT_ANOT): Ditto
+	(PT_IA_64_HP_HSL_ANOT): Ditto
+	(PT_IA_64_HP_STACK): Ditto
+	(SHN_IA_64_ANSI_COMMON): Ditto
+
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* external.h (Elf_External_Sym_Shndx): Declare.
+	* internal.h (struct elf_internal_sym <st_shndx>): Make it an
+	unsigned int.
+	* common.h (SHN_BAD): Define.
+
+2001-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h (SHN_XINDEX): Comment typo fix.
+	* internal.h (Elf_Internal_Ehdr): Change existing "unsigned short"
+	size, count and index fields to "unsigned int".
+
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+	    Richard Henderson  <rth@redhat.com>
+
+	* common.h (EM_XSTORMY16): Define.
+	* xstormy16.h: New file.
+
+2001-11-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h (NT_ARCH): Define.  Remove incorrect comment.
+
+2001-11-11  Geoffrey Keating  <geoffk@redhat.com>
+
+	* dwarf2.h (dwarf_line_number_ops): Add DWARF 3 opcodes.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmix.h: New file.
+
+2001-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h: White space changes to keep lines under 80 chars.
+
+2001-10-16  Jeff Holcomb  <jeffh@redhat.com>
+
+	* internal.h (elf_internal_shdr): Make contents a unsigned char *.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h (elf_internal_rela): Make r_addend a bfd_vma.
+
+2001-09-13  Alexandre Oliva  <aoliva@redhat.com>
+
+	* common.h (EM_OPENRISC_OLD): Renamed the old EM_OPENRISC entry.
+
+2001-09-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* common.h (EM_AVR_OLD): Renamed from...
+	(EM_AVR): this, redefined as in the current ELF standard.
+	(EM_PJ_OLD): Renamed from...
+	(EM_PJ): this, redefined as in the current ELF standard.
+	(EM_R30, EM_D10V, EM_D30V, EM_V850, EM_M32R, EM_MN10300,
+	EM_MN10200, EM_OPENRISC, EM_ARC_A5, EM_XTENSA): Defined as in
+	the current ELF standard.
+	(EM_CYGNUS_ARC): Removed, unused for a long time.
+
+2001-09-04  Richard Henderson  <rth@redhat.com>
+
+	* alpha.h (R_ALPHA_OP*, R_ALPHA_IMMED*, R_ALPHA_GPVALUE): Remove.
+	(R_ALPHA_GPREL16): Rename from R_ALPHA_IMMED_GP_16.
+
+2001-08-30  Eric Christopher  <echristo@redhat.com>
+
+	* mips.h: Remove E_MIPS_MACH_MIPS32_4K.
+
+2001-08-29  Jeff Law <law@redhat.com>
+
+	* h8.h (EF_H8_MACH): New mask for encoded machine type.
+	(E_H8_MACH_H8300, E_H8_MACH_H8300H, E_H8_MACH_H8300S): New
+	machine types.
+
+Tue Aug 26 23:32:34 2001  J"orn Rennecke <amylaar@redhat.com>
+
+	* h8.h: New file.
+
+2001-08-27  Staffan Ulfberg  <staffanu@swox.se>
+
+	* ppc.h: Add relocs from the 64-bit PowerPC ELF ABI revision 1.2.
+
+2001-06-30  Daniel Berlin  <dan@cgsoftware.com>
+
+	* dwarf2.h: Remerge with gcc version,
+	including all new DWARF 2.1 extensions.
+
 2001-06-29  James Cownie <jcownie@etnus.com>
 
 	* dwarf2.h: Add DWARF 2.1 attribues.
 
-2001-06-11  Alan Modra  <amodra@bigpond.net.au>
+2001-06-15  Per Bothner  <per@bothner.com>
+
+	* dwarf2.h:  Partial merge with gcc version.
+	(enum dwarf_descrim_list):  Fix typo -> dwarf_discrim_list.
+	(DW_LANG_Java):  Use value from dwarf 2.1 draft (also used in gcc).
+
+2001-05-15  Ralf Baechle  <ralf@gnu.org>
 
-	Merge from mainline.
-	2001-05-15  Ralf Baechle  <ralf@gnu.org>
 	* common.h: Remove definition of EM_MIPS_RS4_BE.  The constant was
 	never in active use and is used otherwise by the ABI.
 
-	2001-05-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+2001-05-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
 	* external.h: Fix typo.
 	* mips.h: Add/Extend many comments with reference to the MIPS ELF64
 	spec v. 2.4, available at e.g.
@@ -28,15 +138,40 @@
 	(ELF64_MIPS_R_TYPE): Likewise.
 	(OHW_R10KLDL): Define.
 
-	2001-04-24  Todd Fries  <todd@fries.net>
+2001-04-24  Todd Fries  <todd@fries.net>
+
 	* sparc.h: Fix typo.
 
-	2001-03-23  Nick Clifton  <nickc@redhat.com>
+2001-04-20  Johan Rydberg  <jrydberg@opencores.org>
+
+	* openrisc.h: New file.
+	* common.h (EM_OPENRISC): New constant.
+
+2001-04-23  Bo Thorsen  <bo@suse.de>
+
+	* x86-64.h: Add vtable support.
+
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
 	* mips.h: Remove extraneous whitespace.
 
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
+2001-03-22  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris.h: Add leading comment about PC-relative location.
+	(R_CRIS_COPY, R_CRIS_GLOB_DAT, R_CRIS_JUMP_SLOT, R_CRIS_RELATIVE,
+	R_CRIS_16_GOT, R_CRIS_32_GOT, R_CRIS_16_GOTPLT, R_CRIS_32_GOTPLT,
+	R_CRIS_32_GOTREL, R_CRIS_32_PLT_GOTREL, R_CRIS_32_PLT_PCREL):
+	New relocs.
+
+2001-02-27  Philip Blundell  <pb@futuretv.com>
+
+	* arm.h: Add new definitions from ARM document SWS ESPC 0003 B-01.
+	(EF_PIC, et al.): Rename to EF_ARM_xx.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
-	* Many files: Update copyright notices.
+	* common.h: Add linux target for S/390.
+	* s390.h: New file.
 
 2001-01-11  Peter Targett  <peter.targett@arccores.com>
 
diff --git a/contrib/binutils/include/elf/alpha.h b/contrib/binutils/include/elf/alpha.h
index 8bf67bd..ab429d4 100644
--- a/contrib/binutils/include/elf/alpha.h
+++ b/contrib/binutils/include/elf/alpha.h
@@ -80,23 +80,15 @@ START_RELOC_NUMBERS (elf_alpha_reloc_type)
   RELOC_NUMBER (R_ALPHA_SREL32, 10)	/* PC relative 32 bit */
   RELOC_NUMBER (R_ALPHA_SREL64, 11)	/* PC relative 64 bit */
 
-/* Inherited these from ECOFF, but they are not particularly useful
-   and are depreciated.  And not implemented in the BFD, btw.  */
-  RELOC_NUMBER (R_ALPHA_OP_PUSH, 12)	/* OP stack push */
-  RELOC_NUMBER (R_ALPHA_OP_STORE, 13)	/* OP stack pop and store */
-  RELOC_NUMBER (R_ALPHA_OP_PSUB, 14)	/* OP stack subtract */
-  RELOC_NUMBER (R_ALPHA_OP_PRSHIFT, 15)	/* OP stack right shift */
-
-  RELOC_NUMBER (R_ALPHA_GPVALUE, 16)
-  RELOC_NUMBER (R_ALPHA_GPRELHIGH, 17)
-  RELOC_NUMBER (R_ALPHA_GPRELLOW, 18)
-  RELOC_NUMBER (R_ALPHA_IMMED_GP_16, 19)
-  RELOC_NUMBER (R_ALPHA_IMMED_GP_HI32, 20)
-  RELOC_NUMBER (R_ALPHA_IMMED_SCN_HI32, 21)
-  RELOC_NUMBER (R_ALPHA_IMMED_BR_HI32, 22)
-  RELOC_NUMBER (R_ALPHA_IMMED_LO32, 23)
-
-/* These relocations are specific to shared libraries.  */
+  /* Skip 12 - 16; deprecated ECOFF relocs.  */
+
+  RELOC_NUMBER (R_ALPHA_GPRELHIGH, 17)	/* GP relative 32 bit, high 16 bits */
+  RELOC_NUMBER (R_ALPHA_GPRELLOW, 18)	/* GP relative 32 bit, low 16 bits */
+  RELOC_NUMBER (R_ALPHA_GPREL16, 19)	/* GP relative 16 bit */
+
+  /* Skip 20 - 23; deprecated ECOFF relocs.  */
+
+  /* These relocations are specific to shared libraries.  */
   RELOC_NUMBER (R_ALPHA_COPY, 24)	/* Copy symbol at runtime */
   RELOC_NUMBER (R_ALPHA_GLOB_DAT, 25)	/* Create GOT entry */
   RELOC_NUMBER (R_ALPHA_JMP_SLOT, 26)	/* Create PLT entry */
diff --git a/contrib/binutils/include/elf/arm.h b/contrib/binutils/include/elf/arm.h
index 28e87a8..269a225 100644
--- a/contrib/binutils/include/elf/arm.h
+++ b/contrib/binutils/include/elf/arm.h
@@ -1,5 +1,5 @@
 /* ARM ELF support for BFD.
-   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -25,29 +25,34 @@
 /* Processor specific flags for the ELF header e_flags field.  */
 #define EF_ARM_RELEXEC     0x01
 #define EF_ARM_HASENTRY    0x02
-#define EF_INTERWORK       0x04
-#define EF_APCS_26         0x08
-#define EF_APCS_FLOAT      0x10
-#define EF_PIC             0x20
-#define EF_ALIGN8	   0x40		/* 8-bit structure alignment is in use.  */
-#define EF_NEW_ABI         0x80
-#define EF_OLD_ABI         0x100
-#define EF_SOFT_FLOAT      0x200
-
-/* Other constants defined in the ARM ELF spec. version A-08.  */
+#define EF_ARM_INTERWORK   0x04
+#define EF_ARM_APCS_26     0x08
+#define EF_ARM_APCS_FLOAT  0x10
+#define EF_ARM_PIC         0x20
+#define EF_ARM_ALIGN8	   0x40		/* 8-bit structure alignment is in use.  */
+#define EF_ARM_NEW_ABI     0x80
+#define EF_ARM_OLD_ABI     0x100
+#define EF_ARM_SOFT_FLOAT  0x200
+#define EF_ARM_VFP_FLOAT   0x400
+
+/* Other constants defined in the ARM ELF spec. version B-01.  */
 #define EF_ARM_SYMSARESORTED 0x04	/* NB conflicts with EF_INTERWORK */
+#define EF_ARM_DYNSYMSUSESEGIDX 0x08	/* NB conflicts with EF_APCS26 */
+#define EF_ARM_MAPSYMSFIRST 0x10	/* NB conflicts with EF_APCS_FLOAT */
 #define EF_ARM_EABIMASK      0xFF000000
 
 #define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
 #define EF_ARM_EABI_UNKNOWN  0x00000000
 #define EF_ARM_EABI_VER1     0x01000000
+#define EF_ARM_EABI_VER2     0x02000000
 
 /* Local aliases for some flags to match names used by COFF port.  */
-#define F_INTERWORK	   EF_INTERWORK
-#define F_APCS26	   EF_APCS_26
-#define F_APCS_FLOAT	   EF_APCS_FLOAT
-#define F_PIC              EF_PIC
-#define F_SOFT_FLOAT	   EF_SOFT_FLOAT
+#define F_INTERWORK	   EF_ARM_INTERWORK
+#define F_APCS26	   EF_ARM_APCS_26
+#define F_APCS_FLOAT	   EF_ARM_APCS_FLOAT
+#define F_PIC              EF_ARM_PIC
+#define F_SOFT_FLOAT	   EF_ARM_SOFT_FLOAT
+#define F_VFP_FLOAT	   EF_ARM_VFP_FLOAT
 
 /* Additional symbol types for Thumb.  */
 #define STT_ARM_TFUNC      STT_LOPROC   /* A Thumb function.  */
@@ -109,13 +114,21 @@ START_RELOC_NUMBERS (elf_arm_reloc_type)
   FAKE_RELOC   (LAST_INVALID_RELOC,   249)
 #else /* not OLD_ARM_ABI */
   FAKE_RELOC   (FIRST_INVALID_RELOC1,  28)
-  FAKE_RELOC   (LAST_INVALID_RELOC1,   99)
+  FAKE_RELOC   (LAST_INVALID_RELOC1,   31)
+  RELOC_NUMBER (R_ARM_ALU_PCREL7_0,    32)
+  RELOC_NUMBER (R_ARM_ALU_PCREL15_8,   33)
+  RELOC_NUMBER (R_ARM_ALU_PCREL23_15,  34)
+  RELOC_NUMBER (R_ARM_LDR_SBREL11_0,   35)
+  RELOC_NUMBER (R_ARM_ALU_SBREL19_12,  36)
+  RELOC_NUMBER (R_ARM_ALU_SBREL27_20,  37)
+  FAKE_RELOC   (FIRST_INVALID_RELOC2,  38)
+  FAKE_RELOC   (LAST_INVALID_RELOC2,   99)
   RELOC_NUMBER (R_ARM_GNU_VTENTRY,    100)
   RELOC_NUMBER (R_ARM_GNU_VTINHERIT,  101)
   RELOC_NUMBER (R_ARM_THM_PC11,       102)   /* Cygnus extension to abi: Thumb unconditional branch.  */
   RELOC_NUMBER (R_ARM_THM_PC9,        103)   /* Cygnus extension to abi: Thumb conditional branch.  */
-  FAKE_RELOC   (FIRST_INVALID_RELOC2, 104)
-  FAKE_RELOC   (LAST_INVALID_RELOC2,  248)
+  FAKE_RELOC   (FIRST_INVALID_RELOC3, 104)
+  FAKE_RELOC   (LAST_INVALID_RELOC3,  248)
   RELOC_NUMBER (R_ARM_RXPC25,         249)
 #endif /* not OLD_ARM_ABI */
   RELOC_NUMBER (R_ARM_RSBREL32,       250)
diff --git a/contrib/binutils/include/elf/common.h b/contrib/binutils/include/elf/common.h
index 4c50b89..289d3f2 100644
--- a/contrib/binutils/include/elf/common.h
+++ b/contrib/binutils/include/elf/common.h
@@ -1,6 +1,6 @@
 /* ELF support for BFD.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001
+   2001, 2002
    Free Software Foundation, Inc.
 
    Written by Fred Fish @ Cygnus Support, from information published
@@ -114,6 +114,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define EM_960         19       /* Intel 80960 */
 #define EM_PPC	       20	/* PowerPC */
 #define EM_PPC64       21	/* 64-bit PowerPC */
+#define EM_S390        22	/* IBM S/390 */
 
 #define EM_V800        36	/* NEC V800 series */
 #define EM_FR20	       37	/* Fujitsu FR20 */
@@ -161,6 +162,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define EM_MMIX	       80	/* Donald Knuth's educational 64-bit processor */
 #define EM_HUANY       81	/* Harvard's machine-independent format */
 #define EM_PRISM       82	/* SiTera Prism */
+#define EM_AVR         83	/* Atmel AVR 8-bit microcontroller */
+#define EM_FR30        84	/* Fujitsu FR30 */
+#define EM_D10V        85	/* Mitsubishi D10V */
+#define EM_D30V        86	/* Mitsubishi D30V */
+#define EM_V850        87	/* NEC v850 */
+#define EM_M32R        88	/* Mitsubishi M32R */
+#define EM_MN10300     89	/* Matsushita MN10300 */
+#define EM_MN10200     90	/* Matsushita MN10200 */
+#define EM_PJ          91	/* picoJava */
+#define EM_OPENRISC    92	/* OpenRISC 32-bit embedded processor */
+#define EM_ARC_A5      93	/* ARC Cores Tangent-A5 */
+#define EM_XTENSA      94	/* Tensilica Xtensa Architecture */
 
 /* If it is necessary to assign new unofficial EM_* values, please pick large
    random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision
@@ -174,7 +187,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    unofficial e_machine number should eventually ask registry@sco.com for
    an officially blessed number to be added to the list above.  */
 
-#define EM_PJ          99       /* picoJava */
+#define EM_PJ_OLD      99       /* picoJava */
 
 /* Cygnus PowerPC ELF backend.  Written in the absence of an ABI.  */
 #define EM_CYGNUS_POWERPC 0x9025
@@ -186,15 +199,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Old version of PowerPC, this should be removed shortly. */
 #define EM_PPC_OLD	17
 
-/* Cygnus ARC ELF backend.  Written in the absence of an ABI.  */
-#define EM_CYGNUS_ARC 0x9040
-
 /* Cygnus M32R ELF backend.  Written in the absence of an ABI.  */
 #define EM_CYGNUS_M32R 0x9041
 
 /* Alpha backend magic number.  Written in the absence of an ABI.  */
 #define EM_ALPHA	0x9026
 
+/* old S/390 backend magic number. Written in the absence of an ABI.  */
+#define EM_S390_OLD	0xa390
+
 /* D10V backend magic number.  Written in the absence of an ABI.  */
 #define EM_CYGNUS_D10V	0x7650
 
@@ -214,7 +227,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* AVR magic number
    Written in the absense of an ABI.  */
-#define EM_AVR			0x1057
+#define EM_AVR_OLD		0x1057
+
+/* OpenRISC magic number
+   Written in the absense of an ABI.  */
+#define EM_OPENRISC_OLD		0x3426
+
+#define EM_XSTORMY16	        0xad45
 
 /* See the above comment before you add a new EM_* value here.  */
 
@@ -237,6 +256,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PT_LOPROC	0x70000000	/* Processor-specific */
 #define PT_HIPROC	0x7FFFFFFF	/* Processor-specific */
 
+#define PT_GNU_EH_FRAME	(PT_LOOS + 0x474e550)
+
 /* Program segment permissions, in program header p_flags field.  */
 
 #define PF_X		(1 << 0)	/* Segment is executable */
@@ -321,10 +342,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define NT_LWPSINFO	17		/* Has a struct lwpsinfo_t */
 #define NT_WIN32PSTATUS	18		/* Has a struct win32_pstatus */
 
+
+/* Note segments for core files on NetBSD systems.  Note name
+   must start with "NetBSD-CORE".  */
+
+#define NT_NETBSDCORE_PROCINFO	1	/* Has a struct procinfo */
+#define NT_NETBSDCORE_FIRSTMACH	32	/* start of machdep note types */
+
+
 /* Values of note segment descriptor types for object files.  */
-/* (Only for hppa right now.  Should this be moved elsewhere?)  */
 
 #define NT_VERSION	1		/* Contains a version string.  */
+#define NT_ARCH		2		/* Contains an architecture string.  */
 
 /* These three macros disassemble and assemble a symbol table st_info field,
    which contains the symbol binding and symbol type.  The STB_ and STT_
@@ -386,8 +415,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SHN_HIOS        0xFF3F		/* OS specific semantics, hi */
 #define SHN_ABS	        0xFFF1		/* Associated symbol is absolute */
 #define SHN_COMMON      0xFFF2		/* Associated symbol is in common */
-#define SHN_XINDEX      0xFFFF		/* Section index it held elsewhere */
+#define SHN_XINDEX      0xFFFF		/* Section index is held elsewhere */
 #define SHN_HIRESERVE   0xFFFF		/* End range of reserved indices */
+#define SHN_BAD		((unsigned) -1) /* Used internally by bfd */
 
 /* The following constants control how a symbol may be accessed once it has
    become part of an executable or shared library.  */
diff --git a/contrib/binutils/include/elf/cris.h b/contrib/binutils/include/elf/cris.h
index 8605375..3bd03e8 100644
--- a/contrib/binutils/include/elf/cris.h
+++ b/contrib/binutils/include/elf/cris.h
@@ -30,6 +30,8 @@ START_RELOC_NUMBERS (elf_cris_reloc_type)
   RELOC_NUMBER (R_CRIS_8,		1)
   RELOC_NUMBER (R_CRIS_16,		2)
   RELOC_NUMBER (R_CRIS_32,		3)
+
+  /* The "PC" position is the location right after the relocation.  */
   RELOC_NUMBER (R_CRIS_8_PCREL,		4)
   RELOC_NUMBER (R_CRIS_16_PCREL,	5)
   RELOC_NUMBER (R_CRIS_32_PCREL,	6)
@@ -37,6 +39,58 @@ START_RELOC_NUMBERS (elf_cris_reloc_type)
   RELOC_NUMBER (R_CRIS_GNU_VTINHERIT,	7)
   RELOC_NUMBER (R_CRIS_GNU_VTENTRY,	8)
 
+  /* Copy contents at dynlinking.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_COPY.  */
+  RELOC_NUMBER (R_CRIS_COPY, 9)
+
+  /* Create GOT entry.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_GLOB_DAT.  */
+  RELOC_NUMBER (R_CRIS_GLOB_DAT, 10)
+
+  /* Create PLT entry.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_JUMP_SLOT.  */
+  RELOC_NUMBER (R_CRIS_JUMP_SLOT, 11)
+
+  /* Adjust by program base.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_RELATIVE.  */
+  RELOC_NUMBER (R_CRIS_RELATIVE, 12)
+
+  /* A 16-bit offset to entry in GOT and request to create GOT entry for
+     that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_16_GOT.  */
+  RELOC_NUMBER (R_CRIS_16_GOT, 13)
+
+  /* A 32-bit offset to entry in GOT and request to create GOT entry for
+     that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOT.  */
+  RELOC_NUMBER (R_CRIS_32_GOT, 14)
+
+  /* A 16-bit offset to entry in PLT part of GOT and request to create PLT
+     entry for that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_16_GOTPLT.  */
+  RELOC_NUMBER (R_CRIS_16_GOTPLT, 15)
+
+  /* A 32-bit offset to entry in PLT part of GOT and request to create PLT
+     entry for that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTPLT.  */
+  RELOC_NUMBER (R_CRIS_32_GOTPLT, 16)
+
+  /* A 32-bit offset from GOT to (local) symbol: no GOT entry should be
+     necessary.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTREL.  */
+  RELOC_NUMBER (R_CRIS_32_GOTREL, 17)
+
+  /* A 32-bit offset from GOT to entry for this symbol in PLT and request
+     to create PLT entry for symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTREL.  */
+  RELOC_NUMBER (R_CRIS_32_PLT_GOTREL, 18)
+
+  /* A 32-bit offset from location after this relocation (addend specifies
+     offset) to entry for this symbol in PLT and request to create PLT
+     entry for symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_PLT_PCREL.  */
+  RELOC_NUMBER (R_CRIS_32_PLT_PCREL, 19)
+
   /* No other relocs must be visible outside the assembler.  */
 
 END_RELOC_NUMBERS (R_CRIS_max)
diff --git a/contrib/binutils/include/elf/dwarf2.h b/contrib/binutils/include/elf/dwarf2.h
index edaa664..a99dca7 100644
--- a/contrib/binutils/include/elf/dwarf2.h
+++ b/contrib/binutils/include/elf/dwarf2.h
@@ -32,7 +32,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  *
    by UNIX International.  Copies of this specification are available from
    UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
 
-
    This file also now contains definitions from the DWARF 2.1 specification.  */
 
 /* This file is shared between GCC and GDB, and should not contain
@@ -178,6 +177,15 @@ enum dwarf_tag
     DW_TAG_variant_part = 0x33,
     DW_TAG_variable = 0x34,
     DW_TAG_volatile_type = 0x35,
+    /* DWARF 2.1.  */
+    DW_TAG_dwarf_procedure = 0x36,
+    DW_TAG_restrict_type = 0x37,
+    DW_TAG_interface_type = 0x38,
+    DW_TAG_namespace = 0x39,
+    DW_TAG_imported_module = 0x3a,
+    DW_TAG_unspecified_type = 0x3b,
+    DW_TAG_partial_unit = 0x3c,
+    DW_TAG_imported_unit = 0x3d,
     /* SGI/MIPS Extensions.  */
     DW_TAG_MIPS_loop = 0x4081,
     /* GNU extensions.  */
@@ -493,7 +501,9 @@ enum dwarf_type
     DW_ATE_signed = 0x5,
     DW_ATE_signed_char = 0x6,
     DW_ATE_unsigned = 0x7,
-    DW_ATE_unsigned_char = 0x8
+    DW_ATE_unsigned_char = 0x8,
+    /* DWARF 2.1.  */
+    DW_ATE_imaginary_float = 0x9
   };
 
 #define	DW_ATE_lo_user 0x80
@@ -559,8 +569,8 @@ enum dwarf_inline_attribute
     DW_INL_declared_inlined = 3
   };
 
-/* Descriminant lists.  */
-enum dwarf_descrim_list
+/* Discriminant lists.  */
+enum dwarf_discrim_list
   {
     DW_DSC_label = 0,
     DW_DSC_range = 1
@@ -578,7 +588,11 @@ enum dwarf_line_number_ops
     DW_LNS_negate_stmt = 6,
     DW_LNS_set_basic_block = 7,
     DW_LNS_const_add_pc = 8,
-    DW_LNS_fixed_advance_pc = 9
+    DW_LNS_fixed_advance_pc = 9,
+    /* DWARF 3 */
+    DW_LNS_set_prologue_end = 10,
+    DW_LNS_set_epilogue_begin = 11,
+    DW_LNS_set_isa = 12
   };
 
 /* Line number extended opcodes.  */
@@ -651,7 +665,12 @@ enum dwarf_source_language
     DW_LANG_Fortran90 = 0x0008,
     DW_LANG_Pascal83 = 0x0009,
     DW_LANG_Modula2 = 0x000a,
-    DW_LANG_Java = 0x9af4,
+    DW_LANG_Java = 0x000b,
+    /* DWARF 2.1.  */
+    DW_LANG_C99 = 0x000c,
+    DW_LANG_Ada95 = 0x000d,
+    DW_LANG_Fortran95 = 0x000e,
+    /* MIPS.  */
     DW_LANG_Mips_Assembler = 0x8001
   };
 
@@ -668,4 +687,28 @@ enum dwarf_macinfo_record_type
     DW_MACINFO_end_file = 4,
     DW_MACINFO_vendor_ext = 255
   };
+
+/* @@@ For use with GNU frame unwind information.  */
+
+#define DW_EH_PE_absptr		0x00
+#define DW_EH_PE_omit		0xff
+
+#define DW_EH_PE_uleb128	0x01
+#define DW_EH_PE_udata2		0x02
+#define DW_EH_PE_udata4		0x03
+#define DW_EH_PE_udata8		0x04
+#define DW_EH_PE_sleb128	0x09
+#define DW_EH_PE_sdata2		0x0A
+#define DW_EH_PE_sdata4		0x0B
+#define DW_EH_PE_sdata8		0x0C
+#define DW_EH_PE_signed		0x08
+
+#define DW_EH_PE_pcrel		0x10
+#define DW_EH_PE_textrel	0x20
+#define DW_EH_PE_datarel	0x30
+#define DW_EH_PE_funcrel	0x40
+#define DW_EH_PE_aligned	0x50
+
+#define DW_EH_PE_indirect	0x80
+
 #endif /* _ELF_DWARF2_H */
diff --git a/contrib/binutils/include/elf/external.h b/contrib/binutils/include/elf/external.h
index 38e6596..403ee62 100644
--- a/contrib/binutils/include/elf/external.h
+++ b/contrib/binutils/include/elf/external.h
@@ -143,6 +143,10 @@ typedef struct {
   unsigned char	st_size[8];		/* Associated symbol size */
 } Elf64_External_Sym;
 
+typedef struct {
+  unsigned char est_shndx[4];		/* Section index */
+} Elf_External_Sym_Shndx;
+
 /* Note segments */
 
 typedef struct {
diff --git a/contrib/binutils/include/elf/h8.h b/contrib/binutils/include/elf/h8.h
new file mode 100644
index 0000000..ac9db56
--- /dev/null
+++ b/contrib/binutils/include/elf/h8.h
@@ -0,0 +1,96 @@
+/* H8300/h8500 ELF support for BFD.
+   Copyright 2001 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _ELF_H8_H
+#define _ELF_H8_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+/* Relocations 59..63 are GNU extensions.  */
+START_RELOC_NUMBERS (elf_h8_reloc_type)
+  RELOC_NUMBER (R_H8_NONE, 0)
+  RELOC_NUMBER (R_H8_DIR32, 1)
+  RELOC_NUMBER (R_H8_DIR32_28, 2)
+  RELOC_NUMBER (R_H8_DIR32_24, 3)
+  RELOC_NUMBER (R_H8_DIR32_16, 4)
+  RELOC_NUMBER (R_H8_DIR32U, 6)
+  RELOC_NUMBER (R_H8_DIR32U_28, 7)
+  RELOC_NUMBER (R_H8_DIR32U_24, 8)
+  RELOC_NUMBER (R_H8_DIR32U_20, 9)
+  RELOC_NUMBER (R_H8_DIR32U_16, 10)
+  RELOC_NUMBER (R_H8_DIR24, 11)
+  RELOC_NUMBER (R_H8_DIR24_20, 12)
+  RELOC_NUMBER (R_H8_DIR24_16, 13)
+  RELOC_NUMBER (R_H8_DIR24U, 14)
+  RELOC_NUMBER (R_H8_DIR24U_20, 15)
+  RELOC_NUMBER (R_H8_DIR24U_16, 16)
+  RELOC_NUMBER (R_H8_DIR16, 17)
+  RELOC_NUMBER (R_H8_DIR16U, 18)
+  RELOC_NUMBER (R_H8_DIR16S_32, 19)
+  RELOC_NUMBER (R_H8_DIR16S_28, 20)
+  RELOC_NUMBER (R_H8_DIR16S_24, 21)
+  RELOC_NUMBER (R_H8_DIR16S_20, 22)
+  RELOC_NUMBER (R_H8_DIR16S, 23)
+  RELOC_NUMBER (R_H8_DIR8, 24)
+  RELOC_NUMBER (R_H8_DIR8U, 25)
+  RELOC_NUMBER (R_H8_DIR8Z_32, 26)
+  RELOC_NUMBER (R_H8_DIR8Z_28, 27)
+  RELOC_NUMBER (R_H8_DIR8Z_24, 28)
+  RELOC_NUMBER (R_H8_DIR8Z_20, 29)
+  RELOC_NUMBER (R_H8_DIR8Z_16, 30)
+  RELOC_NUMBER (R_H8_PCREL16, 31)
+  RELOC_NUMBER (R_H8_PCREL8, 32)
+  RELOC_NUMBER (R_H8_BPOS, 33)
+  FAKE_RELOC (R_H8_FIRST_INVALID_DIR_RELOC, 34)
+  FAKE_RELOC (R_H8_LAST_INVALID_DIR_RELOC, 58)
+  RELOC_NUMBER (R_H8_DIR16A8, 59)
+  RELOC_NUMBER (R_H8_DIR16R8, 60)
+  RELOC_NUMBER (R_H8_DIR24A8, 61)
+  RELOC_NUMBER (R_H8_DIR24R8, 62)
+  RELOC_NUMBER (R_H8_DIR32A16, 63)
+  RELOC_NUMBER (R_H8_ABS32, 65)
+  RELOC_NUMBER (R_H8_ABS32A16, 127)
+  RELOC_NUMBER (R_H8_SYM, 128)
+  RELOC_NUMBER (R_H8_OPneg, 129)
+  RELOC_NUMBER (R_H8_OPadd, 130)
+  RELOC_NUMBER (R_H8_OPsub, 131)
+  RELOC_NUMBER (R_H8_OPmul, 132)
+  RELOC_NUMBER (R_H8_OPdiv, 133)
+  RELOC_NUMBER (R_H8_OPshla, 134)
+  RELOC_NUMBER (R_H8_OPshra, 135)
+  RELOC_NUMBER (R_H8_OPsctsize, 136)
+  RELOC_NUMBER (R_H8_OPhword, 137)
+  RELOC_NUMBER (R_H8_OPlword, 138)
+  RELOC_NUMBER (R_H8_OPhigh, 139)
+  RELOC_NUMBER (R_H8_OPlow, 140)
+  RELOC_NUMBER (R_H8_OPscttop, 141)
+END_RELOC_NUMBERS (R_H8_max)
+
+/* Machine variant if we know it.  This field was invented at Cygnus,
+   but it is hoped that other vendors will adopt it.  If some standard
+   is developed, this code should be changed to follow it. */
+
+#define EF_H8_MACH		0x00FF0000
+
+#define E_H8_MACH_H8300		0x00800000
+#define E_H8_MACH_H8300H	0x00810000
+#define E_H8_MACH_H8300S	0x00820000
+
+#endif
diff --git a/contrib/binutils/include/elf/ia64.h b/contrib/binutils/include/elf/ia64.h
index edfc7c5..5e632ed 100644
--- a/contrib/binutils/include/elf/ia64.h
+++ b/contrib/binutils/include/elf/ia64.h
@@ -49,6 +49,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ELF_STRING_ia64_unwind_info	".IA_64.unwind_info"
 #define ELF_STRING_ia64_unwind_once	".gnu.linkonce.ia64unw."
 #define ELF_STRING_ia64_unwind_info_once ".gnu.linkonce.ia64unwi."
+/* .IA_64.unwind_hdr is only used by HP-UX.  */
+#define ELF_STRING_ia64_unwind_hdr	".IA_64.unwind_hdr"
 
 /* Bits in the sh_flags field of Elf64_Shdr:  */
 
@@ -60,6 +62,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SHT_IA_64_EXT		(SHT_LOPROC + 0)	/* extension bits */
 #define SHT_IA_64_UNWIND	(SHT_LOPROC + 1)	/* unwind bits */
 
+/* SHT_IA_64_HP_OPT_ANOT is only generated by HPUX compilers for its
+   optimization annotation section.  GCC does not generate it but we
+   want readelf to know what they are.  Do not use two capital Ns in
+   annotate or sed will turn it into 32 or 64 during the build.  */
+#define SHT_IA_64_HP_OPT_ANOT	0x60000004
+
 /* Bits in the p_flags field of Elf64_Phdr:  */
 
 #define PF_IA_64_NORECOV	0x80000000
@@ -69,10 +77,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* arch extension bits */
 #define PT_IA_64_UNWIND 	(PT_LOPROC + 1)	/* ia64 unwind bits */
 
+/* HP-UX specific values for p_type in Elf64_Phdr.
+   These values are currently just used to make
+   readelf more usable on HP-UX.  */
+
+#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
+#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
+#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
+
 /* Possible values for d_tag in Elf64_Dyn:  */
 
 #define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
 
+/* This section only used by HP-UX, The HP linker gives weak symbols
+   precedence over regular common symbols.  We want common to override
+   weak.  Using this common instead of SHN_COMMON does that.  */
+
+#define SHN_IA_64_ANSI_COMMON 0xFF00
+
 /* ia64-specific relocation types: */
 
 /* Relocs apply to specific instructions within a bundle.  The least
diff --git a/contrib/binutils/include/elf/internal.h b/contrib/binutils/include/elf/internal.h
index eb79917..5d39d3a 100644
--- a/contrib/binutils/include/elf/internal.h
+++ b/contrib/binutils/include/elf/internal.h
@@ -1,5 +1,5 @@
 /* ELF support for BFD.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001
    Free Software Foundation, Inc.
 
    Written by Fred Fish @ Cygnus Support, from information published
@@ -42,20 +42,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define EI_NIDENT	16		/* Size of e_ident[] */
 
 typedef struct elf_internal_ehdr {
-  unsigned char		e_ident[EI_NIDENT];	/* ELF "magic number" */
-  bfd_vma		e_entry;		/* Entry point virtual address */
-  bfd_size_type		e_phoff;		/* Program header table file offset */
-  bfd_size_type		e_shoff;		/* Section header table file offset */
-  unsigned long		e_version;		/* Identifies object file version */
-  unsigned long		e_flags;		/* Processor-specific flags */
-  unsigned short	e_type;			/* Identifies object file type */
-  unsigned short	e_machine;		/* Specifies required architecture */
-  unsigned short	e_ehsize;		/* ELF header size in bytes */
-  unsigned short	e_phentsize;		/* Program header table entry size */
-  unsigned short	e_phnum;		/* Program header table entry count */
-  unsigned short	e_shentsize;		/* Section header table entry size */
-  unsigned short	e_shnum;		/* Section header table entry count */
-  unsigned short	e_shstrndx;		/* Section header string table index */
+  unsigned char		e_ident[EI_NIDENT]; /* ELF "magic number" */
+  bfd_vma		e_entry;	/* Entry point virtual address */
+  bfd_size_type		e_phoff;	/* Program header table file offset */
+  bfd_size_type		e_shoff;	/* Section header table file offset */
+  unsigned long		e_version;	/* Identifies object file version */
+  unsigned long		e_flags;	/* Processor-specific flags */
+  unsigned short	e_type;		/* Identifies object file type */
+  unsigned short	e_machine;	/* Specifies required architecture */
+  unsigned int		e_ehsize;	/* ELF header size in bytes */
+  unsigned int		e_phentsize;	/* Program header table entry size */
+  unsigned int		e_phnum;	/* Program header table entry count */
+  unsigned int		e_shentsize;	/* Section header table entry size */
+  unsigned int		e_shnum;	/* Section header table entry count */
+  unsigned int		e_shstrndx;	/* Section header string table index */
 } Elf_Internal_Ehdr;
 
 #define elf32_internal_ehdr elf_internal_ehdr
@@ -98,7 +98,7 @@ typedef struct elf_internal_shdr {
 
   /* The internal rep also has some cached info associated with it. */
   asection *	bfd_section;		/* Associated BFD section.  */
-  PTR		contents;		/* Section contents.  */
+  unsigned char *contents;		/* Section contents.  */
 } Elf_Internal_Shdr;
 
 #define elf32_internal_shdr elf_internal_shdr
@@ -114,7 +114,7 @@ struct elf_internal_sym {
   unsigned long	st_name;		/* Symbol name, index in string tbl */
   unsigned char	st_info;		/* Type and binding attributes */
   unsigned char	st_other;		/* Visibilty, and target specific */
-  unsigned short st_shndx;		/* Associated section index */
+  unsigned int  st_shndx;		/* Associated section index */
 };
 
 typedef struct elf_internal_sym Elf_Internal_Sym;
@@ -153,7 +153,7 @@ typedef struct elf_internal_rel {
 typedef struct elf_internal_rela {
   bfd_vma	r_offset;	/* Location at which to apply the action */
   bfd_vma	r_info;		/* Index and Type of relocation */
-  bfd_signed_vma r_addend;	/* Constant addend used to compute value */
+  bfd_vma	r_addend;	/* Constant addend used to compute value */
 } Elf_Internal_Rela;
 
 #define elf32_internal_rela elf_internal_rela
diff --git a/contrib/binutils/include/elf/mips.h b/contrib/binutils/include/elf/mips.h
index 6ad8d5b..3b6fe99 100644
--- a/contrib/binutils/include/elf/mips.h
+++ b/contrib/binutils/include/elf/mips.h
@@ -172,12 +172,10 @@ END_RELOC_NUMBERS (R_MIPS_maxext)
    the rest are open. */
 
 #define E_MIPS_MACH_3900	0x00810000
-
 #define E_MIPS_MACH_4010	0x00820000
 #define E_MIPS_MACH_4100	0x00830000
 #define E_MIPS_MACH_4650	0x00850000
 #define E_MIPS_MACH_4111	0x00880000
-#define E_MIPS_MACH_MIPS32_4K	0x00890000
 #define E_MIPS_MACH_SB1         0x008a0000
 
 /* Processor specific section indices.  These sections do not actually
diff --git a/contrib/binutils/include/elf/mmix.h b/contrib/binutils/include/elf/mmix.h
new file mode 100644
index 0000000..fa367e5
--- /dev/null
+++ b/contrib/binutils/include/elf/mmix.h
@@ -0,0 +1,151 @@
+/* MMIX support for BFD.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* This file holds definitions specific to the MMIX ELF ABI. */
+#ifndef ELF_MMIX_H
+#define ELF_MMIX_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_mmix_reloc_type)
+  RELOC_NUMBER (R_MMIX_NONE, 0)
+
+  /* Standard absolute relocations.  */
+  RELOC_NUMBER (R_MMIX_8, 1)
+  RELOC_NUMBER (R_MMIX_16, 2)
+  RELOC_NUMBER (R_MMIX_24, 3)
+  RELOC_NUMBER (R_MMIX_32, 4)
+  RELOC_NUMBER (R_MMIX_64, 5)
+
+  /* Standard relative relocations.  */
+  RELOC_NUMBER (R_MMIX_PC_8, 6)
+  RELOC_NUMBER (R_MMIX_PC_16, 7)
+  RELOC_NUMBER (R_MMIX_PC_24, 8)
+  RELOC_NUMBER (R_MMIX_PC_32, 9)
+  RELOC_NUMBER (R_MMIX_PC_64, 10)
+
+  /* GNU extensions for C++ vtables.  */
+  RELOC_NUMBER (R_MMIX_GNU_VTINHERIT, 11)
+  RELOC_NUMBER (R_MMIX_GNU_VTENTRY, 12)
+
+  /* A GETA instruction.  */
+  RELOC_NUMBER (R_MMIX_GETA, 13)
+  RELOC_NUMBER (R_MMIX_GETA_1, 14)
+  RELOC_NUMBER (R_MMIX_GETA_2, 15)
+  RELOC_NUMBER (R_MMIX_GETA_3, 16)
+
+  /* A conditional branch instruction.  */
+  RELOC_NUMBER (R_MMIX_CBRANCH, 17)
+  RELOC_NUMBER (R_MMIX_CBRANCH_J, 18)
+  RELOC_NUMBER (R_MMIX_CBRANCH_1, 19)
+  RELOC_NUMBER (R_MMIX_CBRANCH_2, 20)
+  RELOC_NUMBER (R_MMIX_CBRANCH_3, 21)
+
+  /* A PUSHJ instruction.  */
+  RELOC_NUMBER (R_MMIX_PUSHJ, 22)
+  RELOC_NUMBER (R_MMIX_PUSHJ_1, 23)
+  RELOC_NUMBER (R_MMIX_PUSHJ_2, 24)
+  RELOC_NUMBER (R_MMIX_PUSHJ_3, 25)
+
+  /* A JMP instruction.  */
+  RELOC_NUMBER (R_MMIX_JMP, 26)
+  RELOC_NUMBER (R_MMIX_JMP_1, 27)
+  RELOC_NUMBER (R_MMIX_JMP_2, 28)
+  RELOC_NUMBER (R_MMIX_JMP_3, 29)
+
+  /* A relative address such as in a GETA or a branch.  */
+  RELOC_NUMBER (R_MMIX_ADDR19, 30)
+
+  /* A relative address such as in a JMP (only).  */
+  RELOC_NUMBER (R_MMIX_ADDR27, 31)
+
+  /* A general register or a number 0..255.  */
+  RELOC_NUMBER (R_MMIX_REG_OR_BYTE, 32)
+
+  /* A general register. */
+  RELOC_NUMBER (R_MMIX_REG, 33)
+
+  /* A global register and an offset, equivalent of the expression.  */
+  RELOC_NUMBER (R_MMIX_BASE_PLUS_OFFSET, 34)
+
+  /* A LOCAL assertion.  */
+  RELOC_NUMBER (R_MMIX_LOCAL, 35)
+END_RELOC_NUMBERS (R_MMIX_max)
+
+
+/* Section Attributes.  */
+/* A section containing necessary information for relaxation.  */
+#define SHF_MMIX_CANRELAX	0x80000000
+
+/* Symbol attributes.  */
+/* A symbol with this section-index is a register.  */
+#define SHN_REGISTER	SHN_LOPROC
+
+/* This section holds contents for each initialized register, at VMA
+   regno*8.  A symbol relative to this section will be transformed to an
+   absolute symbol with the value corresponding to the register number at
+   final link time.  A symbol with a value outside the inclusive range
+   32*8 .. 254*8 is an error.  It is highly recommended to only use an
+   upper bound of 253*8 or lower as specified in the (currently
+   unspecified) ABI.  */
+#define MMIX_REG_CONTENTS_SECTION_NAME ".MMIX.reg_contents"
+
+/* This is a faked section holding symbols with SHN_REGISTER.  Don't
+   confuse it with MMIX_REG_CONTENTS_SECTION_NAME; this one has no
+   contents, just values.  It is an error for a value in this section to
+   be outside the range 32..255 and it must never become an actual section
+   in an object file.  */
+#define MMIX_REG_SECTION_NAME "*REG*"
+
+/* Appended with a number N=0..65535, this is a representation of the
+   mmixal "BSPEC N" ... "ESPEC" directive pair; the contents go into an
+   ELF section by name ".MMIX.spec_data.N".  */
+#define MMIX_OTHER_SPEC_SECTION_PREFIX ".MMIX.spec_data."
+
+/* A section SECNAME is noted to start at "__.MMIX.start.SECNAME" by the
+   presence of this symbol.  Currently only implemented for ".text"
+   through the symbol "__.MMIX.start..text".  */
+#define MMIX_LOC_SECTION_START_SYMBOL_PREFIX "__.MMIX.start."
+
+/* This symbol is always a function.  */
+#define MMIX_START_SYMBOL_NAME "Main"
+
+
+/* We smuggle in a few MMO specifics here.  We don't make a specific MMO
+   file, since we can't reasonably support MMO without ELF; we have to
+   include this file anyway.  */
+
+#define MMO_TEXT_SECTION_NAME ".text"
+#define MMO_DATA_SECTION_NAME ".data"
+
+/* A definition for the flags we put in spec data in files.  A copy of our
+   own of some flags to keep immune to BFD flag changes.  See section.c of
+   2001-07-18 for flag documentation.  */
+#define MMO_SEC_ALLOC      0x001
+#define MMO_SEC_LOAD       0x002
+#define MMO_SEC_RELOC      0x004
+#define MMO_SEC_READONLY   0x010
+#define MMO_SEC_CODE       0x020
+#define MMO_SEC_DATA       0x040
+#define MMO_SEC_NEVER_LOAD 0x400
+#define MMO_SEC_IS_COMMON 0x8000
+#define MMO_SEC_DEBUGGING 0x10000
+
+#endif /* ELF_MMIX_H */
diff --git a/contrib/binutils/include/elf/openrisc.h b/contrib/binutils/include/elf/openrisc.h
new file mode 100644
index 0000000..c609906
--- /dev/null
+++ b/contrib/binutils/include/elf/openrisc.h
@@ -0,0 +1,39 @@
+/* OpenRISC ELF support for BFD.
+   Copyright 2001 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _ELF_OPENRISC_H
+#define _ELF_OPENRISC_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_openrisc_reloc_type)
+  RELOC_NUMBER (R_OPENRISC_NONE, 0)
+  RELOC_NUMBER (R_OPENRISC_INSN_REL_26, 1)
+  RELOC_NUMBER (R_OPENRISC_INSN_ABS_26, 2)
+  RELOC_NUMBER (R_OPENRISC_LO_16_IN_INSN, 3)
+  RELOC_NUMBER (R_OPENRISC_HI_16_IN_INSN, 4)
+  RELOC_NUMBER (R_OPENRISC_8, 5)
+  RELOC_NUMBER (R_OPENRISC_16, 6)
+  RELOC_NUMBER (R_OPENRISC_32, 7)
+  RELOC_NUMBER (R_OPENRISC_GNU_VTINHERIT, 8)
+  RELOC_NUMBER (R_OPENRISC_GNU_VTENTRY, 9)
+END_RELOC_NUMBERS (R_OPENRISC_max)
+
+#endif /* _ELF_OPENRISC_H */
diff --git a/contrib/binutils/include/elf/ppc.h b/contrib/binutils/include/elf/ppc.h
index 426961e..8e4af62f 100644
--- a/contrib/binutils/include/elf/ppc.h
+++ b/contrib/binutils/include/elf/ppc.h
@@ -1,5 +1,5 @@
 /* PPC ELF support for BFD.
-   Copyright 1995, 1996, 1998, 2000 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
 
    By Michael Meissner, Cygnus Support, <meissner@cygnus.com>, from information
    in the System V Application Binary Interface, PowerPC Processor Supplement
@@ -68,6 +68,40 @@ START_RELOC_NUMBERS (elf_ppc_reloc_type)
   RELOC_NUMBER (R_PPC_SECTOFF_LO, 34)
   RELOC_NUMBER (R_PPC_SECTOFF_HI, 35)
   RELOC_NUMBER (R_PPC_SECTOFF_HA, 36)
+  RELOC_NUMBER (R_PPC_ADDR30, 37)
+
+/* The following relocs are from the 64-bit PowerPC ELF ABI. */
+  RELOC_NUMBER (R_PPC64_ADDR64,		 38)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHER,	 39)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHERA,	 40)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHEST,	 41)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHESTA, 42)
+  RELOC_NUMBER (R_PPC64_UADDR64,	 43)
+  RELOC_NUMBER (R_PPC64_REL64,		 44)
+  RELOC_NUMBER (R_PPC64_PLT64,		 45)
+  RELOC_NUMBER (R_PPC64_PLTREL64,	 46)
+  RELOC_NUMBER (R_PPC64_TOC16,		 47)
+  RELOC_NUMBER (R_PPC64_TOC16_LO,	 48)
+  RELOC_NUMBER (R_PPC64_TOC16_HI,	 49)
+  RELOC_NUMBER (R_PPC64_TOC16_HA,	 50)
+  RELOC_NUMBER (R_PPC64_TOC,		 51)
+  RELOC_NUMBER (R_PPC64_PLTGOT16,	 52)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_LO,	 53)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_HI,	 54)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_HA,	 55)
+
+/* The following relocs were added in the 64-bit PowerPC ELF ABI revision 1.2. */
+  RELOC_NUMBER (R_PPC64_ADDR16_DS,       56)
+  RELOC_NUMBER (R_PPC64_ADDR16_LO_DS,    57)
+  RELOC_NUMBER (R_PPC64_GOT16_DS,        58)
+  RELOC_NUMBER (R_PPC64_GOT16_LO_DS,     59)
+  RELOC_NUMBER (R_PPC64_PLT16_LO_DS,     60)
+  RELOC_NUMBER (R_PPC64_SECTOFF_DS,      61)
+  RELOC_NUMBER (R_PPC64_SECTOFF_LO_DS,   62)
+  RELOC_NUMBER (R_PPC64_TOC16_DS,        63)
+  RELOC_NUMBER (R_PPC64_TOC16_LO_DS,     64)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_DS,     65)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_LO_DS,  66)
 
 /* The remaining relocs are from the Embedded ELF ABI, and are not
    in the SVR4 ELF ABI.  */
@@ -98,6 +132,47 @@ START_RELOC_NUMBERS (elf_ppc_reloc_type)
 
 END_RELOC_NUMBERS (R_PPC_max)
 
+/* Aliases for R_PPC64-relocs. */
+#define R_PPC64_NONE              R_PPC_NONE
+#define R_PPC64_ADDR32            R_PPC_ADDR32
+#define R_PPC64_ADDR24            R_PPC_ADDR24
+#define R_PPC64_ADDR16            R_PPC_ADDR16
+#define R_PPC64_ADDR16_LO         R_PPC_ADDR16_LO
+#define R_PPC64_ADDR16_HI         R_PPC_ADDR16_HI
+#define R_PPC64_ADDR16_HA         R_PPC_ADDR16_HA
+#define R_PPC64_ADDR14            R_PPC_ADDR14
+#define R_PPC64_ADDR14_BRTAKEN    R_PPC_ADDR14_BRTAKEN
+#define R_PPC64_ADDR14_BRNTAKEN   R_PPC_ADDR14_BRNTAKEN
+#define R_PPC64_REL24             R_PPC_REL24
+#define R_PPC64_REL14             R_PPC_REL14
+#define R_PPC64_REL14_BRTAKEN     R_PPC_REL14_BRTAKEN
+#define R_PPC64_REL14_BRNTAKEN    R_PPC_REL14_BRNTAKEN
+#define R_PPC64_GOT16             R_PPC_GOT16
+#define R_PPC64_GOT16_LO          R_PPC_GOT16_LO
+#define R_PPC64_GOT16_HI          R_PPC_GOT16_HI
+#define R_PPC64_GOT16_HA          R_PPC_GOT16_HA
+#define R_PPC64_COPY              R_PPC_COPY
+#define R_PPC64_GLOB_DAT          R_PPC_GLOB_DAT
+#define R_PPC64_JMP_SLOT          R_PPC_JMP_SLOT
+#define R_PPC64_RELATIVE          R_PPC_RELATIVE
+#define R_PPC64_UADDR32           R_PPC_UADDR32
+#define R_PPC64_UADDR16           R_PPC_UADDR16
+#define R_PPC64_REL32             R_PPC_REL32
+#define R_PPC64_PLT32             R_PPC_PLT32
+#define R_PPC64_PLTREL32          R_PPC_PLTREL32
+#define R_PPC64_PLT16_LO          R_PPC_PLT16_LO
+#define R_PPC64_PLT16_HI          R_PPC_PLT16_HI
+#define R_PPC64_PLT16_HA          R_PPC_PLT16_HA
+#define R_PPC64_SECTOFF           R_PPC_SECTOFF
+#define R_PPC64_SECTOFF_LO        R_PPC_SECTOFF_LO
+#define R_PPC64_SECTOFF_HI        R_PPC_SECTOFF_HI
+#define R_PPC64_SECTOFF_HA        R_PPC_SECTOFF_HA
+#define R_PPC64_ADDR30            R_PPC_ADDR30
+#define R_PPC64_GNU_VTINHERIT	  R_PPC_GNU_VTINHERIT
+#define R_PPC64_GNU_VTENTRY	  R_PPC_GNU_VTENTRY
+
+/* Specify the start of the .glink section.  */
+#define DT_PPC64_GLINK		DT_LOPROC
 
 /* Processor specific flags for the ELF header e_flags field.  */
 
diff --git a/contrib/binutils/include/elf/s390.h b/contrib/binutils/include/elf/s390.h
new file mode 100644
index 0000000..8b67c96
--- /dev/null
+++ b/contrib/binutils/include/elf/s390.h
@@ -0,0 +1,73 @@
+/* 390 ELF support for BFD.
+   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Contributed by Carl B. Pedersen and Martin Schwidefsky.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+#ifndef _ELF_390_H
+#define _ELF_390_H
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* Symbol types.  */
+
+#define STACK_REG		15		/* Global Stack reg */
+#define BACKL_REG		14		/* Global Backlink reg */
+#define BASE_REG		13		/* Global Base reg */
+#define GOT_REG 		12		/* Holds addr of GOT */
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+
+START_RELOC_NUMBERS (elf_s390_reloc_type)
+    RELOC_NUMBER (R_390_NONE, 0)	/* No reloc.  */
+    RELOC_NUMBER (R_390_8, 1)		/* Direct 8 bit.  */
+    RELOC_NUMBER (R_390_12, 2)		/* Direct 12 bit.  */
+    RELOC_NUMBER (R_390_16, 3)		/* Direct 16 bit.  */
+    RELOC_NUMBER (R_390_32, 4)		/* Direct 32 bit.  */
+    RELOC_NUMBER (R_390_PC32, 5)	/* PC relative 32 bit.  */
+    RELOC_NUMBER (R_390_GOT12, 6)	/* 12 bit GOT offset.  */
+    RELOC_NUMBER (R_390_GOT32, 7)	/* 32 bit GOT offset.  */
+    RELOC_NUMBER (R_390_PLT32, 8)	/* 32 bit PC relative PLT address.  */
+    RELOC_NUMBER (R_390_COPY, 9)	/* Copy symbol at runtime.  */
+    RELOC_NUMBER (R_390_GLOB_DAT, 10)	/* Create GOT entry.  */
+    RELOC_NUMBER (R_390_JMP_SLOT, 11)	/* Create PLT entry.  */
+    RELOC_NUMBER (R_390_RELATIVE, 12)	/* Adjust by program base.  */
+    RELOC_NUMBER (R_390_GOTOFF, 13)	/* 32 bit offset to GOT.  */
+    RELOC_NUMBER (R_390_GOTPC, 14)	/* 32 bit PC relative offset to GOT.  */
+    RELOC_NUMBER (R_390_GOT16, 15)	/* 16 bit GOT offset.  */
+    RELOC_NUMBER (R_390_PC16, 16)	/* PC relative 16 bit.  */
+    RELOC_NUMBER (R_390_PC16DBL, 17)	/* PC relative 16 bit shifted by 1.  */
+    RELOC_NUMBER (R_390_PLT16DBL, 18)	/* 16 bit PC rel. PLT shifted by 1.  */
+    RELOC_NUMBER (R_390_PC32DBL, 19)	/* PC relative 32 bit shifted by 1.  */
+    RELOC_NUMBER (R_390_PLT32DBL, 20)	/* 32 bit PC rel. PLT shifted by 1.  */
+    RELOC_NUMBER (R_390_GOTPCDBL, 21)	/* 32 bit PC rel. GOT shifted by 1.  */
+    RELOC_NUMBER (R_390_64, 22)		/* Direct 64 bit.  */
+    RELOC_NUMBER (R_390_PC64, 23)	/* PC relative 64 bit.  */
+    RELOC_NUMBER (R_390_GOT64, 24)	/* 64 bit GOT offset.  */
+    RELOC_NUMBER (R_390_PLT64, 25)	/* 64 bit PC relative PLT address.  */
+    RELOC_NUMBER (R_390_GOTENT, 26)	/* 32 bit PC rel. to GOT entry >> 1. */
+    /* These are GNU extensions to enable C++ vtable garbage collection.  */
+    RELOC_NUMBER (R_390_GNU_VTINHERIT, 250)
+    RELOC_NUMBER (R_390_GNU_VTENTRY, 251)
+END_RELOC_NUMBERS (R_390_max)
+
+#endif /* _ELF_390_H */
+
+
diff --git a/contrib/binutils/include/elf/x86-64.h b/contrib/binutils/include/elf/x86-64.h
index a4da0a3..74febc2 100644
--- a/contrib/binutils/include/elf/x86-64.h
+++ b/contrib/binutils/include/elf/x86-64.h
@@ -41,6 +41,8 @@ START_RELOC_NUMBERS (elf_x86_64_reloc_type)
      RELOC_NUMBER (R_X86_64_PC16,     13)     /* 16 bit sign extended pc relative*/
      RELOC_NUMBER (R_X86_64_8,                14)     /* Direct 8 bit sign extended */
      RELOC_NUMBER (R_X86_64_PC8,              15)     /* 8 bit sign extended pc relative*/
+     RELOC_NUMBER (R_X86_64_GNU_VTINHERIT, 250)       /* GNU C++ hack  */
+     RELOC_NUMBER (R_X86_64_GNU_VTENTRY, 251)         /* GNU C++ hack  */
 END_RELOC_NUMBERS (R_X86_64_max)
 
 #endif
diff --git a/contrib/binutils/include/elf/xstormy16.h b/contrib/binutils/include/elf/xstormy16.h
new file mode 100644
index 0000000..ee6c551
--- /dev/null
+++ b/contrib/binutils/include/elf/xstormy16.h
@@ -0,0 +1,53 @@
+/* XSTORMY16 ELF support for BFD.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _ELF_XSTORMY16_H
+#define _ELF_XSTORMY16_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_xstormy16_reloc_type)
+  RELOC_NUMBER (R_XSTORMY16_NONE, 0)
+
+  RELOC_NUMBER (R_XSTORMY16_32, 1)
+  RELOC_NUMBER (R_XSTORMY16_16, 2)
+  RELOC_NUMBER (R_XSTORMY16_8, 3)
+  RELOC_NUMBER (R_XSTORMY16_PC32, 4)
+  RELOC_NUMBER (R_XSTORMY16_PC16, 5)
+  RELOC_NUMBER (R_XSTORMY16_PC8, 6)
+
+  RELOC_NUMBER (R_XSTORMY16_REL_12, 7)
+  RELOC_NUMBER (R_XSTORMY16_24, 8)
+  RELOC_NUMBER (R_XSTORMY16_FPTR16, 9)
+
+  RELOC_NUMBER (R_XSTORMY16_GNU_VTINHERIT, 128)
+  RELOC_NUMBER (R_XSTORMY16_GNU_VTENTRY, 129)
+END_RELOC_NUMBERS (R_XSTORMY16_max)
+
+/* Define the data & instruction memory discriminator.  In a linked
+   executable, an symbol should be deemed to point to an instruction
+   if ((address & XSTORMY16_INSN_MASK) == XSTORMY16_INSN_VALUE), and similarly
+   for the data space.  See also `ld/emulparams/elf32xstormy16.sh'.  */
+#define XSTORMY16_DATA_MASK   0xffc00000
+#define XSTORMY16_DATA_VALUE  0x00000000
+#define XSTORMY16_INSN_MASK   0xffc00000
+#define XSTORMY16_INSN_VALUE  0x00400000
+
+#endif /* _ELF_XSTORMY16_H */