From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 21 Oct 2010 21:16:54 +0000 (+0000)
Subject: bfd:
X-Git-Tag: binutils-2_21-branchpoint~146
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7;p=external%2Fbinutils.git

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.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 47381a4..7722ff8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_merge_arch_attributes): Update for
+	attribute renaming.
+	(elf_backend_obj_attrs_section): Change to ".c6xabi.attributes".
+
 2010-10-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* elf-bfd.h (struct elf_backend_data): New member
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index a570f88..7d971d8 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -1673,7 +1673,7 @@ elf32_tic6x_obj_attrs_arg_type (int tag)
     return ATTR_TYPE_FLAG_INT_VAL;
 }
 
-/* Merge the Tag_C6XABI_Tag_CPU_arch attribute values ARCH1 and ARCH2
+/* Merge the Tag_ISA attribute values ARCH1 and ARCH2
    and return the merged value.  At present, all merges succeed, so no
    return value for errors is defined.  */
 
@@ -1687,11 +1687,11 @@ elf32_tic6x_merge_arch_attributes (int arch1, int arch2)
 
   /* In most cases, the numerically greatest value is the correct
      merged value, but merging C64 and C67 results in C674X.  */
-  if ((min_arch == C6XABI_Tag_CPU_arch_C67X
-       || min_arch == C6XABI_Tag_CPU_arch_C67XP)
-      && (max_arch == C6XABI_Tag_CPU_arch_C64X
-	  || max_arch == C6XABI_Tag_CPU_arch_C64XP))
-    return C6XABI_Tag_CPU_arch_C674X;
+  if ((min_arch == C6XABI_Tag_ISA_C67X
+       || min_arch == C6XABI_Tag_ISA_C67XP)
+      && (max_arch == C6XABI_Tag_ISA_C64X
+	  || max_arch == C6XABI_Tag_ISA_C64XP))
+    return C6XABI_Tag_ISA_C674X;
 
   return max_arch;
 }
@@ -1724,9 +1724,9 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd)
 
   /* No specification yet for handling of unknown attributes, so just
      ignore them and handle known ones.  */
-  out_attr[Tag_C6XABI_Tag_CPU_arch].i
-    = elf32_tic6x_merge_arch_attributes (in_attr[Tag_C6XABI_Tag_CPU_arch].i,
-					 out_attr[Tag_C6XABI_Tag_CPU_arch].i);
+  out_attr[Tag_ISA].i
+    = elf32_tic6x_merge_arch_attributes (in_attr[Tag_ISA].i,
+					 out_attr[Tag_ISA].i);
 
   /* Merge Tag_compatibility attributes and any common GNU ones.  */
   _bfd_elf_merge_object_attributes (ibfd, obfd);
@@ -1765,7 +1765,7 @@ elf32_tic6x_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 #define elf_backend_may_use_rel_p	1
 #define elf_backend_may_use_rela_p	1
 #define elf_backend_obj_attrs_arg_type	elf32_tic6x_obj_attrs_arg_type
-#define elf_backend_obj_attrs_section	"__TI_build_attributes"
+#define elf_backend_obj_attrs_section	".c6xabi.attributes"
 #define elf_backend_obj_attrs_section_type	SHT_C6000_ATTRIBUTES
 #define elf_backend_obj_attrs_vendor	"c6xabi"
 #define elf_backend_rela_normal		1
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index de3d3e9..bde0e31 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_tic6x_attribute): Update for attribute
+	renaming.
+
 2010-10-08  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* dwarf.c (byte_get_signed): Make it extern.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 1f50ae5..e516966 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -10770,32 +10770,32 @@ display_tic6x_attribute (unsigned char * p)
 
   switch (tag)
     {
-    case Tag_C6XABI_Tag_CPU_arch:
+    case Tag_ISA:
       val = read_uleb128 (p, &len);
       p += len;
-      printf ("  Tag_C6XABI_Tag_CPU_arch: ");
+      printf ("  Tag_ISA: ");
 
       switch (val)
 	{
-	case C6XABI_Tag_CPU_arch_none:
+	case C6XABI_Tag_ISA_none:
 	  printf (_("None\n"));
 	  break;
-	case C6XABI_Tag_CPU_arch_C62X:
+	case C6XABI_Tag_ISA_C62X:
 	  printf ("C62x\n");
 	  break;
-	case C6XABI_Tag_CPU_arch_C67X:
+	case C6XABI_Tag_ISA_C67X:
 	  printf ("C67x\n");
 	  break;
-	case C6XABI_Tag_CPU_arch_C67XP:
+	case C6XABI_Tag_ISA_C67XP:
 	  printf ("C67x+\n");
 	  break;
-	case C6XABI_Tag_CPU_arch_C64X:
+	case C6XABI_Tag_ISA_C64X:
 	  printf ("C64x\n");
 	  break;
-	case C6XABI_Tag_CPU_arch_C64XP:
+	case C6XABI_Tag_ISA_C64XP:
 	  printf ("C64x+\n");
 	  break;
-	case C6XABI_Tag_CPU_arch_C674X:
+	case C6XABI_Tag_ISA_C674X:
 	  printf ("C674x\n");
 	  break;
 	default:
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0bd94f1..70213c4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2010-10-19  Alan Modra  <amodra@gmail.com>
 
 	* write.c (relax_segment): Correct address on frag added to stop
diff --git a/gas/config/tc-tic6x.c b/gas/config/tc-tic6x.c
index c706158..0a09220 100644
--- a/gas/config/tc-tic6x.c
+++ b/gas/config/tc-tic6x.c
@@ -82,9 +82,9 @@ static unsigned short tic6x_arch_enable = (TIC6X_INSN_C62X
    (architecture, as modified by other options).  */
 static unsigned short tic6x_features;
 
-/* The architecture attribute value, or C6XABI_Tag_CPU_arch_none if
+/* The architecture attribute value, or C6XABI_Tag_ISA_none if
    not yet set.  */
-static int tic6x_arch_attribute = C6XABI_Tag_CPU_arch_none;
+static int tic6x_arch_attribute = C6XABI_Tag_ISA_none;
 
 /* Whether any instructions at all have been seen.  Once any
    instructions have been seen, architecture attributes merge into the
@@ -120,21 +120,21 @@ typedef struct
 } tic6x_arch_table;
 static const tic6x_arch_table tic6x_arches[] =
   {
-    { "c62x", C6XABI_Tag_CPU_arch_C62X, TIC6X_INSN_C62X },
-    { "c64x", C6XABI_Tag_CPU_arch_C64X, TIC6X_INSN_C62X | TIC6X_INSN_C64X },
-    { "c64x+", C6XABI_Tag_CPU_arch_C64XP, (TIC6X_INSN_C62X
-					   | TIC6X_INSN_C64X
-					   | TIC6X_INSN_C64XP) },
-    { "c67x", C6XABI_Tag_CPU_arch_C67X, TIC6X_INSN_C62X | TIC6X_INSN_C67X },
-    { "c67x+", C6XABI_Tag_CPU_arch_C67XP, (TIC6X_INSN_C62X
-					   | TIC6X_INSN_C67X
-					   | TIC6X_INSN_C67XP) },
-    { "c674x", C6XABI_Tag_CPU_arch_C674X, (TIC6X_INSN_C62X
-					   | TIC6X_INSN_C64X
-					   | TIC6X_INSN_C64XP
-					   | TIC6X_INSN_C67X
-					   | TIC6X_INSN_C67XP
-					   | TIC6X_INSN_C674X) }
+    { "c62x", C6XABI_Tag_ISA_C62X, TIC6X_INSN_C62X },
+    { "c64x", C6XABI_Tag_ISA_C64X, TIC6X_INSN_C62X | TIC6X_INSN_C64X },
+    { "c64x+", C6XABI_Tag_ISA_C64XP, (TIC6X_INSN_C62X
+				      | TIC6X_INSN_C64X
+				      | TIC6X_INSN_C64XP) },
+    { "c67x", C6XABI_Tag_ISA_C67X, TIC6X_INSN_C62X | TIC6X_INSN_C67X },
+    { "c67x+", C6XABI_Tag_ISA_C67XP, (TIC6X_INSN_C62X
+				      | TIC6X_INSN_C67X
+				      | TIC6X_INSN_C67XP) },
+    { "c674x", C6XABI_Tag_ISA_C674X, (TIC6X_INSN_C62X
+				      | TIC6X_INSN_C64X
+				      | TIC6X_INSN_C64XP
+				      | TIC6X_INSN_C67X
+				      | TIC6X_INSN_C67XP
+				      | TIC6X_INSN_C674X) }
   };
 
 /* Update the selected architecture based on ARCH, giving an error if
@@ -2685,8 +2685,8 @@ md_assemble (char *str)
   /* If no .arch directives or -march options have been seen, we are
      assessing instruction validity based on the C674X default, so set
      the attribute accordingly.  */
-  if (tic6x_arch_attribute == C6XABI_Tag_CPU_arch_none)
-    tic6x_arch_attribute = C6XABI_Tag_CPU_arch_C674X;
+  if (tic6x_arch_attribute == C6XABI_Tag_ISA_none)
+    tic6x_arch_attribute = C6XABI_Tag_ISA_C674X;
 
   /* Reset global settings for parallel bars and predicates now to
      avoid extra errors if there are problems with this opcode.  */
@@ -3891,10 +3891,10 @@ tic6x_set_attribute_int (int tag, int value)
 static void
 tic6x_set_attributes (void)
 {
-  if (tic6x_arch_attribute == C6XABI_Tag_CPU_arch_none)
-    tic6x_arch_attribute = C6XABI_Tag_CPU_arch_C674X;
+  if (tic6x_arch_attribute == C6XABI_Tag_ISA_none)
+    tic6x_arch_attribute = C6XABI_Tag_ISA_C674X;
 
-  tic6x_set_attribute_int (Tag_C6XABI_Tag_CPU_arch, tic6x_arch_attribute);
+  tic6x_set_attribute_int (Tag_ISA, tic6x_arch_attribute);
 }
 
 /* Do machine-dependent manipulations of the frag chains after all
diff --git a/gas/doc/c-tic6x.texi b/gas/doc/c-tic6x.texi
index 4bd2de3..7243a98 100644
--- a/gas/doc/c-tic6x.texi
+++ b/gas/doc/c-tic6x.texi
@@ -114,7 +114,7 @@ These have the same effects as @option{-matomic} and
 Set the C6000 EABI build attribute @var{tag} to @var{value}.
 
 The @var{tag} is either an attribute number or
-@code{Tag_C6XABI_Tag_CPU_arch}.  The @var{value} is either a
+@code{Tag_ISA}.  The @var{value} is either a
 @code{number}, @code{"string"}, or @code{number, "string"} depending
 on the tag.
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 89ea6b2..06bc027 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 e89cb95..502f603 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 35e3a24..a8cd7d6 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 d68149e..16c24dc 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 bf7ff28..f2c8138 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 1c15ae9..7d67077 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 3edaa63..568b9c5 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 81d7094..8e025a8 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 7f3ffd2..49a3981 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 899b461..5dc089d 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 53d6d3e..cea3f9f 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 89678ec..4f5925c 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 8c5bfe3..adf6baa 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 04c71b2..04ad3e7 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 7ece957..9be9f3b 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 b5f0194..8614ec2 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 ff2a997..d05c992 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 2c7f835..cfea930 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
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 61bbf81..9738df7 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2010-07-23  Naveen.H.S  <naveen.S@kpitcummins.com>
 	    Ina Pandit  <ina.pandit@kpitcummins.com>
 
diff --git a/include/elf/tic6x-attrs.h b/include/elf/tic6x-attrs.h
index d5b8ee1..3783502 100644
--- a/include/elf/tic6x-attrs.h
+++ b/include/elf/tic6x-attrs.h
@@ -22,4 +22,4 @@
 /* Define the TAG macro before including this file; it takes a tag
    name and value.  */
 
-TAG(Tag_C6XABI_Tag_CPU_arch, 2)
+TAG(Tag_ISA, 4)
diff --git a/include/elf/tic6x.h b/include/elf/tic6x.h
index a9b66dd..88000fa 100644
--- a/include/elf/tic6x.h
+++ b/include/elf/tic6x.h
@@ -134,17 +134,17 @@ enum
     Tag_C6XABI_last
   };
 
-/* Values for Tag_C6XABI_Tag_CPU_arch.  GNU-specific names pending any
-   ABI defining official names associated with the values.  */
+/* Values for Tag_ISA.  GNU-specific names; the ABI does not specify
+   names for these values.  */
 enum
   {
-    C6XABI_Tag_CPU_arch_none = 0,
-    C6XABI_Tag_CPU_arch_C62X = 1,
-    C6XABI_Tag_CPU_arch_C67X = 3,
-    C6XABI_Tag_CPU_arch_C67XP = 4,
-    C6XABI_Tag_CPU_arch_C64X = 6,
-    C6XABI_Tag_CPU_arch_C64XP = 7,
-    C6XABI_Tag_CPU_arch_C674X = 8
+    C6XABI_Tag_ISA_none = 0,
+    C6XABI_Tag_ISA_C62X = 1,
+    C6XABI_Tag_ISA_C67X = 3,
+    C6XABI_Tag_ISA_C67XP = 4,
+    C6XABI_Tag_ISA_C64X = 6,
+    C6XABI_Tag_ISA_C64XP = 7,
+    C6XABI_Tag_ISA_C674X = 8
   };
 
 #endif /* _ELF_TIC6X_H */
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