bfd:

	* elf32-tic6x.c (elf32_tic6x_merge_arch_attributes): Update for
	attribute renaming.
	(elf_backend_obj_attrs_section): Change to ".c6xabi.attributes".

binutils:
	* readelf.c (display_tic6x_attribute): Update for attribute
	renaming.

gas:
	* config/tc-tic6x.c (tic6x_arch_attribute, tic6x_arches,
	md_assemble, tic6x_set_attributes): Update for attribute renaming.
	* doc/c-tic6x.texi: Update for attribute renaming.

gas/testsuite:
	* gas/tic6x/attr-arch-directive-1.d,
	gas/tic6x/attr-arch-directive-2.d,
	gas/tic6x/attr-arch-directive-3.d,
	gas/tic6x/attr-arch-directive-4.d,
	gas/tic6x/attr-arch-directive-4.s,
	gas/tic6x/attr-arch-directive-5.d,
	gas/tic6x/attr-arch-directive-5.s,
	gas/tic6x/attr-arch-opts-c62x.d, gas/tic6x/attr-arch-opts-c64x+.d,
	gas/tic6x/attr-arch-opts-c64x.d, gas/tic6x/attr-arch-opts-c674x.d,
	gas/tic6x/attr-arch-opts-c67x+.d, gas/tic6x/attr-arch-opts-c67x.d,
	gas/tic6x/attr-arch-opts-none-1.d,
	gas/tic6x/attr-arch-opts-none-2.d,
	gas/tic6x/attr-arch-opts-override-1.d,
	gas/tic6x/attr-arch-opts-override-2.d: Update for attribute
	renaming and renumbering.

include/elf:
	* tic6x-attrs.h (Tag_C6XABI_Tag_CPU_arch): Change to Tag_ISA,
	value 4.
	* tic6x.h (Values for Tag_C6XABI_Tag_CPU_arch): Rename for
	attribute renaming.

ld:
	* emulparams/elf32_tic6x_le.sh (ATTRS_SECTIONS): Use
	.c6xabi.attributes, not __TI_build_attributes.

ld/testsuite:
	* ld-tic6x/attr-arch-c62x-c62x.d, ld-tic6x/attr-arch-c62x-c64x+.d,
	ld-tic6x/attr-arch-c62x-c64x.d, ld-tic6x/attr-arch-c62x-c674x.d,
	ld-tic6x/attr-arch-c62x-c67x+.d, ld-tic6x/attr-arch-c62x-c67x.d,
	ld-tic6x/attr-arch-c64x+-c62x.d, ld-tic6x/attr-arch-c64x+-c64x+.d,
	ld-tic6x/attr-arch-c64x+-c64x.d, ld-tic6x/attr-arch-c64x+-c674x.d,
	ld-tic6x/attr-arch-c64x+-c67x+.d, ld-tic6x/attr-arch-c64x+-c67x.d,
	ld-tic6x/attr-arch-c64x-c62x.d, ld-tic6x/attr-arch-c64x-c64x+.d,
	ld-tic6x/attr-arch-c64x-c64x.d, ld-tic6x/attr-arch-c64x-c674x.d,
	ld-tic6x/attr-arch-c64x-c67x+.d, ld-tic6x/attr-arch-c64x-c67x.d,
	ld-tic6x/attr-arch-c674x-c62x.d, ld-tic6x/attr-arch-c674x-c64x+.d,
	ld-tic6x/attr-arch-c674x-c64x.d, ld-tic6x/attr-arch-c674x-c674x.d,
	ld-tic6x/attr-arch-c674x-c67x+.d, ld-tic6x/attr-arch-c674x-c67x.d,
	ld-tic6x/attr-arch-c67x+-c62x.d, ld-tic6x/attr-arch-c67x+-c64x+.d,
	ld-tic6x/attr-arch-c67x+-c64x.d, ld-tic6x/attr-arch-c67x+-c674x.d,
	ld-tic6x/attr-arch-c67x+-c67x+.d, ld-tic6x/attr-arch-c67x+-c67x.d,
	ld-tic6x/attr-arch-c67x-c62x.d, ld-tic6x/attr-arch-c67x-c64x+.d,
	ld-tic6x/attr-arch-c67x-c64x.d, ld-tic6x/attr-arch-c67x-c674x.d,
	ld-tic6x/attr-arch-c67x-c67x+.d, ld-tic6x/attr-arch-c67x-c67x.d:
	Update for attribute renaming.

18 files changed, 35 insertions, 17 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 89ea6b2106..06bc027b14 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* gas/tic6x/attr-arch-directive-1.d,
+	gas/tic6x/attr-arch-directive-2.d,
+	gas/tic6x/attr-arch-directive-3.d,
+	gas/tic6x/attr-arch-directive-4.d,
+	gas/tic6x/attr-arch-directive-4.s,
+	gas/tic6x/attr-arch-directive-5.d,
+	gas/tic6x/attr-arch-directive-5.s,
+	gas/tic6x/attr-arch-opts-c62x.d, gas/tic6x/attr-arch-opts-c64x+.d,
+	gas/tic6x/attr-arch-opts-c64x.d, gas/tic6x/attr-arch-opts-c674x.d,
+	gas/tic6x/attr-arch-opts-c67x+.d, gas/tic6x/attr-arch-opts-c67x.d,
+	gas/tic6x/attr-arch-opts-none-1.d,
+	gas/tic6x/attr-arch-opts-none-2.d,
+	gas/tic6x/attr-arch-opts-override-1.d,
+	gas/tic6x/attr-arch-opts-override-2.d: Update for attribute
+	renaming and renumbering.
+
 2010-10-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/12049
diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-1.d b/gas/testsuite/gas/tic6x/attr-arch-directive-1.d
index e89cb95a39..502f603415 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-directive-1.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-directive-1.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C62x
+  Tag_ISA: C62x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-2.d b/gas/testsuite/gas/tic6x/attr-arch-directive-2.d
index 35e3a24e48..a8cd7d67c4 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-directive-2.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-directive-2.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x\+
+  Tag_ISA: C64x\+
diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-3.d b/gas/testsuite/gas/tic6x/attr-arch-directive-3.d
index d68149eb7e..16c24dc4c2 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-directive-3.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-directive-3.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-4.d b/gas/testsuite/gas/tic6x/attr-arch-directive-4.d
index bf7ff28278..f2c8138696 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-directive-4.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-directive-4.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C62x
+  Tag_ISA: C62x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-4.s b/gas/testsuite/gas/tic6x/attr-arch-directive-4.s
index 1c15ae9685..7d67077fd2 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-directive-4.s
+++ b/gas/testsuite/gas/tic6x/attr-arch-directive-4.s
@@ -1,3 +1,3 @@
 # .c6xabi_attribute directives override other architecture information.
-.c6xabi_attribute 2, 1
+.c6xabi_attribute 4, 1
 .arch c674x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-5.d b/gas/testsuite/gas/tic6x/attr-arch-directive-5.d
index 3edaa63455..568b9c5945 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-directive-5.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-directive-5.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C62x
+  Tag_ISA: C62x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-directive-5.s b/gas/testsuite/gas/tic6x/attr-arch-directive-5.s
index 81d7094a00..8e025a8d6a 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-directive-5.s
+++ b/gas/testsuite/gas/tic6x/attr-arch-directive-5.s
@@ -1,3 +1,3 @@
 # .c6xabi_attribute directives override other architecture information.
 .arch c674x
-.c6xabi_attribute Tag_C6XABI_Tag_CPU_arch, 1
+.c6xabi_attribute Tag_ISA, 1
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d
index 7f3ffd2a4c..49a3981ac0 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C62x
+  Tag_ISA: C62x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d
index 899b461cf5..5dc089d352 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x\+
+  Tag_ISA: C64x\+
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d
index 53d6d3e5ea..cea3f9fa7d 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x
+  Tag_ISA: C64x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d
index 89678ec55e..4f5925c6b1 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d
index 8c5bfe3fc6..adf6baa297 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x\+
+  Tag_ISA: C67x\+
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d
index 04c71b2183..04ad3e781d 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x
+  Tag_ISA: C67x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d b/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d
index 7ece957de2..9be9f3b13b 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d b/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d
index b5f0194944..8614ec2b54 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d b/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d
index ff2a997d66..d05c992420 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C62x
+  Tag_ISA: C62x
diff --git a/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d b/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d
index 2c7f83579a..cfea930ab7 100644
--- a/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d
+++ b/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d
@@ -5,4 +5,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x