From 75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 21 Oct 2010 21:16:54 +0000
Subject: 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.
---
 ld/ChangeLog                                  |  5 +++++
 ld/emulparams/elf32_tic6x_le.sh               |  2 +-
 ld/testsuite/ChangeLog                        | 22 ++++++++++++++++++++++
 ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d   |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d  |  2 +-
 ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d   |  2 +-
 39 files changed, 64 insertions(+), 37 deletions(-)

(limited to 'ld')

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7ac8782..5f7885b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* emulparams/elf32_tic6x_le.sh (ATTRS_SECTIONS): Use
+	.c6xabi.attributes, not __TI_build_attributes.
+
 2010-10-20  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* plugin.c (get_symbols): Check symbol type correctly.
diff --git a/ld/emulparams/elf32_tic6x_le.sh b/ld/emulparams/elf32_tic6x_le.sh
index fca0c7f..7a78a2c 100644
--- a/ld/emulparams/elf32_tic6x_le.sh
+++ b/ld/emulparams/elf32_tic6x_le.sh
@@ -37,4 +37,4 @@ OTHER_BSS_SECTIONS="
     . +=  0x100000;
     _STACK_START = .;
   }"
-ATTRS_SECTIONS='__TI_build_attributes 0 : { KEEP (*(__TI_build_attributes)) KEEP (*(.gnu.attributes)) }'
+ATTRS_SECTIONS='.c6xabi.attributes 0 : { KEEP (*(.c6xabi.attributes)) KEEP (*(.gnu.attributes)) }'
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6dfa6f1..cbba0c0 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,25 @@
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2010-10-20  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* ld-plugin/plugin.exp: Mark tests UNSUPPORTED, not UNRESOLVED, if
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d
index 7d33966..53da208 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C62x
+  Tag_ISA: C62x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d
index f097363..49570fe 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x\+
+  Tag_ISA: C64x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d
index 6ebb94f..2ec8b6c 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x
+  Tag_ISA: C64x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d
index 5fa0d9e..4500114 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d
index 449d5dd..a7a7c0e 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x\+
+  Tag_ISA: C67x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d
index 47e295c..2d539df 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x
+  Tag_ISA: C67x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d
index d05dbb6..bd19310 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x\+
+  Tag_ISA: C64x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d
index 29f00c0..3881215 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x\+
+  Tag_ISA: C64x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d
index d007b23..76a6296 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x\+
+  Tag_ISA: C64x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d
index bef1c3f..7548fad 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d
index 7bcfa8d..ba6e135 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d
index 68a3d2d..63c4f58 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d
index 47f87db..3aaf293 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x
+  Tag_ISA: C64x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d
index 648915c..7c89f1e 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x\+
+  Tag_ISA: C64x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d
index 1f2e286..9274720 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C64x
+  Tag_ISA: C64x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d
index d27fa57..529ecef 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d
index ee809a7..16c8c42 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d
index 9df8d0f..55a8391 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d
index 53dc64d..07f0eac 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d
index b7d9c64..81d0946 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d
index 5a06c9a..245b4b8 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d
index 41b41e5..50f03a6 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d
index 77be063..dbbac9a 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d
index 38acd9a..c3140ca 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d
index 0d58d50..c7ff793 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x\+
+  Tag_ISA: C67x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d
index 65baf14..b7d2b53 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d
index e4c55d9..cdee2fe 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d
index 41207d6..511acb0 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d
index 27b717b..63685b0 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x\+
+  Tag_ISA: C67x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d
index 73d2312..864b6e5 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x\+
+  Tag_ISA: C67x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d
index e0dc26c..b230a71 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x
+  Tag_ISA: C67x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d
index 82a3d12..99abb3c 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d
index b7e7cba..d8313e4 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d
index 83e671c..2100d40 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C674x
+  Tag_ISA: C674x
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d
index d51886c..75c4c5b 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x\+
+  Tag_ISA: C67x\+
diff --git a/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d
index aaa49fc..f71c12b 100644
--- a/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d
+++ b/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d
@@ -7,4 +7,4 @@
 
 Attribute Section: c6xabi
 File Attributes
-  Tag_C6XABI_Tag_CPU_arch: C67x
+  Tag_ISA: C67x
-- 
cgit v1.1