This commit was manufactured by cvs2svn to create branch 'binutils-csl-binutils-csl-2_17-branchpoint

2_17-branch'.

Sprout from gdb-csl-available-20060303-branch 2006-03-03 15:25:31 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'gdb-csl-'
Cherrypick from master 2006-03-20 01:07:29 UTC John David Anglin <dave.anglin@nrc-cnrc.gc.ca> '	* hppa.h (SHF_HP_TLS, SHF_HP_NEAR_SHARED, SHF_HP_FAR_SHARED,':
    ChangeLog
    Makefile.in
    Makefile.tpl
    compile
    configure
    configure.in
    include/elf/ChangeLog
    include/elf/arm.h
    include/elf/hppa.h
    include/elf/m68k.h
    include/opcode/ChangeLog
    include/opcode/arm.h
    include/opcode/hppa.h

7 files changed, 80 insertions, 12 deletions

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 27665852b..9d47ffbac 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,24 @@
+2006-03-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hppa.h (SHF_HP_TLS, SHF_HP_NEAR_SHARED, SHF_HP_FAR_SHARED,
+	SHF_HP_COMDAT, SHF_HP_CONST, SHN_TLS_COMMON, SHN_NS_COMMON,
+	SHN_NS_UNDEF, SHN_FS_UNDEF, SHN_HP_EXTERN, SHN_HP_EXTHINT,
+	SHN_HP_UNDEF_BIND_IMM, SHT_HP_OVLBITS, SHT_HP_DLKM, SHT_HP_COMDAT,
+	SHT_HP_OBJDICT, SHT_HP_ANNOT, STB_HP_ALIAS): Define.
+
+2006-03-10  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (EF_ARM_EABI_VER5): Define.
+
+2006-03-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A,
+	EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B, EF_M68K_ISA_C): Adjust.
+	(EF_M68K_ISA_A_NODIV, EF_M68K_ISA_B_NOUSP): New.
+	(EF_M68K_HW_DIV, EF_M68K_USP): Remove.
+	(EF_M68K_MAC, EF_M68K_EMAC, EF_M68K_FLOAT): Adjust.
+	(EF_M68K_EMAC_B): New.
+
 2006-03-03  Bjoern Haase  <bjoern.m.haase@web.de>
 
 	* avr.h (R_AVR_MS8_LDI,R_AVR_MS8_LDI_NEG): Add.
diff --git a/include/elf/arm.h b/include/elf/arm.h
index 9ad04205c..8311c131c 100644
--- a/include/elf/arm.h
+++ b/include/elf/arm.h
@@ -56,6 +56,7 @@
 #define EF_ARM_EABI_VER2     0x02000000
 #define EF_ARM_EABI_VER3     0x03000000
 #define EF_ARM_EABI_VER4     0x04000000
+#define EF_ARM_EABI_VER5     0x05000000
 
 /* Local aliases for some flags to match names used by COFF port.  */
 #define F_INTERWORK	   EF_ARM_INTERWORK
diff --git a/include/elf/hppa.h b/include/elf/hppa.h
index 38a464e90..15be2d565 100644
--- a/include/elf/hppa.h
+++ b/include/elf/hppa.h
@@ -490,6 +490,30 @@ typedef enum elf_hppa_reloc_type elf_hppa_reloc_type;
 #define PT_PARISC_UNWIND	0x70000001
 #define PT_PARISC_WEAKORDER	0x70000002
 
+/* Flag bits in sh_flags of ElfXX_Shdr.  */
+#define SHF_HP_TLS              0x01000000
+#define SHF_HP_NEAR_SHARED      0x02000000
+#define SHF_HP_FAR_SHARED       0x04000000
+#define SHF_HP_COMDAT           0x08000000
+#define SHF_HP_CONST            0x00800000
+
+/* Reserved section header indices.  */
+#define SHN_TLS_COMMON          (SHN_LOOS + 0x0)
+#define SHN_NS_COMMON           (SHN_LOOS + 0x1)
+#define SHN_FS_COMMON           (SHN_LOOS + 0x2)
+#define SHN_NS_UNDEF            (SHN_LOOS + 0x3)
+#define SHN_FS_UNDEF            (SHN_LOOS + 0x4)
+#define SHN_HP_EXTERN           (SHN_LOOS + 0x5)
+#define SHN_HP_EXTHINT          (SHN_LOOS + 0x6)
+#define SHN_HP_UNDEF_BIND_IMM   (SHN_LOOS + 0x7)
+
+/* Values of sh_type in ElfXX_Shdr.  */
+#define SHT_HP_OVLBITS  (SHT_LOOS + 0x0)
+#define SHT_HP_DLKM     (SHT_LOOS + 0x1)
+#define SHT_HP_COMDAT   (SHT_LOOS + 0x2)
+#define SHT_HP_OBJDICT  (SHT_LOOS + 0x3)
+#define SHT_HP_ANNOT    (SHT_LOOS + 0x4)
+
 /* Flag bits in p_flags of ElfXX_Phdr.  */
 #define PF_HP_CODE		0x00040000
 #define PF_HP_MODIFY		0x00080000
@@ -571,6 +595,9 @@ typedef enum elf_hppa_reloc_type elf_hppa_reloc_type;
 #define PT_HP_STACK		(PT_LOOS + 0x14)
 #define PT_HP_CORE_UTSNAME	(PT_LOOS + 0x15)
 
+/* Binding information.  */
+#define STB_HP_ALIAS		(STB_LOOS + 0x0)
+
 /* Additional symbol types.  */
 #define STT_HP_OPAQUE		(STT_LOOS + 0x1)
 #define STT_HP_STUB		(STT_LOOS + 0x2)
diff --git a/include/elf/m68k.h b/include/elf/m68k.h
index 929cd60f4..08d0c4419 100644
--- a/include/elf/m68k.h
+++ b/include/elf/m68k.h
@@ -58,16 +58,18 @@ END_RELOC_NUMBERS (R_68K_max)
 
 /* We use the bottom 8 bits to encode information about the
    coldfire variant.  */
-#define EF_M68K_ISA_MASK	0x07  /* Which ISA */
-#define EF_M68K_ISA_A		0x01
-#define EF_M68K_ISA_A_PLUS	0x02
-#define EF_M68K_ISA_B		0x03
-#define EF_M68K_HW_DIV		0x08  /* Has HW divide */
+#define EF_M68K_ISA_MASK	0x0F  /* Which ISA */
+#define EF_M68K_ISA_A_NODIV	0x01  /* ISA A except for div */
+#define EF_M68K_ISA_A		0x02
+#define EF_M68K_ISA_A_PLUS	0x03
+#define EF_M68K_ISA_B_NOUSP	0x04  /* ISA_B except for USP */
+#define EF_M68K_ISA_B		0x05
+#define EF_M68K_ISA_C		0x06
 #define EF_M68K_MAC_MASK	0x30 
-#define EF_M68K_MAC		0x10  /* Has MAC */
-#define EF_M68K_EMAC		0x20  /* Has EMAC */
-#define EF_M68K_USP		0x40  /* Has USP insns */
-#define EF_M68K_FLOAT		0x80  /* Has float insns */
+#define EF_M68K_MAC		0x10  /* MAC */
+#define EF_M68K_EMAC		0x20  /* EMAC */
+#define EF_M68K_EMAC_B		0x30  /* EMAC_B */
+#define EF_M68K_FLOAT		0x40  /* Has float insns */
 #define EF_M68K_CF_MASK		0xFF
      
 #endif
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 9edfd3f3b..158c55ce9 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-10  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (ARM_AEXT_V7_ARM): Include v6ZK extensions.
+
+2006-03-04  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hppa.h (pa_opcodes): Reorder bb opcodes so that pa10 opcodes come
+	first.  Correct mask of bb "B" opcode.
+
 2006-02-27  H.J. Lu <hongjiu.lu@intel.com>
 
 	* i386.h (i386_optab): Support Intel Merom New Instructions.
@@ -275,6 +284,14 @@
 	FloatMF to fldcw, fstcw, fnstcw, and the memory formas of fstsw and
 	fnstsw.
 
+2006-02-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* m68k.h (m68008, m68ec030, m68882): Remove.
+	(m68k_mask): New.
+	(cpu_m68k, cpu_cf): New.
+	(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
+	mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
+
 2005-01-25  Alexandre Oliva  <aoliva@redhat.com>
 
 	2004-11-10  Alexandre Oliva  <aoliva@redhat.com>
diff --git a/include/opcode/arm.h b/include/opcode/arm.h
index 3260b2fea..1d3aa5aeb 100644
--- a/include/opcode/arm.h
+++ b/include/opcode/arm.h
@@ -88,7 +88,7 @@
 #define ARM_AEXT_V6KT2  (ARM_AEXT_V6T2 | ARM_EXT_V6K)
 #define ARM_AEXT_V6ZT2  (ARM_AEXT_V6T2 | ARM_EXT_V6Z)
 #define ARM_AEXT_V6ZKT2 (ARM_AEXT_V6T2 | ARM_EXT_V6K | ARM_EXT_V6Z)
-#define ARM_AEXT_V7_ARM	(ARM_AEXT_V6T2 | ARM_EXT_V7)
+#define ARM_AEXT_V7_ARM	(ARM_AEXT_V6ZKT2 | ARM_EXT_V7)
 #define ARM_AEXT_V7A	(ARM_AEXT_V7_ARM | ARM_EXT_V7A)
 #define ARM_AEXT_V7R	(ARM_AEXT_V7_ARM | ARM_EXT_V7R | ARM_EXT_DIV)
 #define ARM_AEXT_NOTM \
diff --git a/include/opcode/hppa.h b/include/opcode/hppa.h
index 5b08b9d2b..d1c0e8395 100644
--- a/include/opcode/hppa.h
+++ b/include/opcode/hppa.h
@@ -593,10 +593,10 @@ static const struct pa_opcode pa_opcodes[] =
 { "addbf",	0xa8000000, 0xfc000000, "?dnx,b,w", pa10, 0},
 { "addibt",	0xa4000000, 0xfc000000, "?dn5,b,w", pa10, 0},
 { "addibf",	0xac000000, 0xfc000000, "?dn5,b,w", pa10, 0},
+{ "bb",		0xc0004000, 0xffe06000, "?bnx,!,w", pa10, FLAG_STRICT}, 
 { "bb",		0xc0006000, 0xffe06000, "?Bnx,!,w", pa20, FLAG_STRICT}, 
+{ "bb",		0xc4004000, 0xfc006000, "?bnx,Q,w", pa10, FLAG_STRICT}, 
 { "bb",		0xc4004000, 0xfc004000, "?Bnx,B,w", pa20, FLAG_STRICT}, 
-{ "bb",		0xc0004000, 0xffe06000, "?bnx,!,w", pa10, FLAG_STRICT}, 
-{ "bb",		0xc4004000, 0xfc004000, "?bnx,Q,w", pa10, 0}, 
 { "bvb",	0xc0004000, 0xffe04000, "?bnx,w", pa10, 0},
 { "clrbts",	0xe8004005, 0xffffffff, "", pa20, FLAG_STRICT},
 { "popbts",	0xe8004005, 0xfffff007, "$", pa20, FLAG_STRICT},