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 47381a49193e34ace1feab300a8396e25e920173..7722ff8fecaf3677562ec2923dd1fe872af5aafd 100644 (file)
--- 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 a570f88c5805db0e5c0047a72b88d0908305e2e7..7d971d8498317ae09dc18a2b6cb18f78ca1498e4 100644 (file)
--- 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 de3d3e9767f5b5983716f2366af5931c6fdb17fb..bde0e311ab212f975166aba4d4e95eaed475534c 100644 (file)
--- 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 1f50ae5ac4523cf8009007d53dd229728330ba44..e516966abd600f26029d96bf6134b71969ebbe19 100644 (file)
--- 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 0bd94f18d9969934d75f314ec7857f1c3f1bc291..70213c4cc0ac036d1b454ab5ed055a26f3647176 100644 (file)
--- 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 c706158bd787f084c03cab95eaafc64d6ceb7a29..0a092203010b417afff5d78e6b7f78af8505ba99 100644 (file)
--- 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 4bd2de3edddeb55559d86f306f29e802ede81e2a..7243a9875c02f683a664b75bf3d33df1b8ea2f3e 100644 (file)
--- 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 89ea6b2106c8d75ee5e131006f0f300cda6bd867..06bc027b1485259ad772b33a9868b386f535a650 100644 (file)
--- 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 e89cb95a3961875a450146a1a0bf52d271d19b51..502f603415aa266309ec3113e2b282cf27721000 100644 (file)
--- 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 35e3a24e4856f9b6caa26f509049ae70b10bd224..a8cd7d67c44024349e7ccb9915b4174994ccbfd8 100644 (file)
--- 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 d68149eb7ea77468f3d4f984f8f1c7564df48d72..16c24dc4c25c5f3f2bc49979ece04c64c65a9d2a 100644 (file)
--- 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 bf7ff2827832783ab93d88e3c32998ae7cae113c..f2c81386960511922b6983ff9053da688f39c6d6 100644 (file)
--- 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 1c15ae9685946c2f4e7197479903439048ca7046..7d67077fd2ab8ab318f38593816534a0e07f5538 100644 (file)
--- 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 3edaa63455afe08bd3aceaecf76c239362261e70..568b9c5945a760d1a9baecc5d0d40a70984ffa10 100644 (file)
--- 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 81d7094a00059da7c5a813fc7d20f6e54c9432e9..8e025a8d6a046aaa9881711d42b0a27b9977de4f 100644 (file)
--- 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 7f3ffd2a4c50e024d8e411be23e9906756701e08..49a3981ac0ffc1f9b402ba7b198f3b4246bab509 100644 (file)
--- 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 899b461cf58983f654a0f2ccf5dd0bfb254fdfa3..5dc089d3528bf1a135f56f45f112dcc41e785a81 100644 (file)
--- 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 53d6d3e5ea49cab7f34f8d35139af26681ee2294..cea3f9fa7d988ffdd60472b42285d8ceebecab41 100644 (file)
--- 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 89678ec55eb687a9fb28dfd0bdbc198495a3b8be..4f5925c6b16eaa37e33aa8b6d8ac2b2b4ca39df0 100644 (file)
--- 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 8c5bfe3fc6af645bdbece07d20c00e4fda2e386c..adf6baa297f1206b66c2e846453d188700bca280 100644 (file)
--- 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 04c71b2183b0afd05a642ebbf91f5dc9a9bc6aa5..04ad3e781dcb1a6f9891e79a735954577ab8ed25 100644 (file)
--- 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 7ece957de26e090533c11cf4c2d8f019fcab6f16..9be9f3b13bc88ca9ba2224845ab6b3004642f1b0 100644 (file)
--- 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 b5f0194944884381ebff852de9665cbbfbecef31..8614ec2b5467063da6bef0b727ae7ffa57968deb 100644 (file)
--- 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 ff2a997d6672d0818901542ed1bd187d361dfa4f..d05c99242031bde0ae46a7f71fc8a452cf7a17e3 100644 (file)
--- 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 2c7f83579a4543e6f0a3412104344d4b2e87869a..cfea930ab775f176ae499c9fa887acd8489f4142 100644 (file)
--- 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 61bbf81db1d8e51088b89637fe97d05d6ccc56ff..9738df7ce37b54a8e0e18e25b25a3dd34b76abb5 100644 (file)
--- 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 d5b8ee1ae5734ccbeaef173236a79628b7175c8d..378350248e8237682632b731a8c148de2f7e1955 100644 (file)
--- 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 a9b66ddf395383cab39bf861cc778666b7d115d0..88000fa1a7f3eb9774d8a0758280a8c4f83a632b 100644 (file)
--- 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 7ac8782598ef55275f1769d1c7951689cdad7ef3..5f7885b89c20c2c0199210f0d22a43fbfe545891 100644 (file)
--- 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 fca0c7f9830f3e888557c74e36eb3c3618f263d3..7a78a2cd5845f894b0cf1d48cb873582a01d974a 100644 (file)
--- 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 6dfa6f1ad4d22136ff4c7a672b04539f83f865b5..cbba0c080fce8c3c344ebfff1360106fa26ec82a 100644 (file)
--- 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 7d339666e462242fa50605c74bdc89897c774e03..53da208ef67874183edd823b6d2225c36196cf9c 100644 (file)
--- 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 f097363432b9d818fb22019182792e21598a662f..49570fe5b493f900498d1ba2bb3bc39f81c3caa3 100644 (file)
--- 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 6ebb94f61da30bcab0b870671c8e5c4a28f7e1e8..2ec8b6cd7a334a9383d28dac05b4cc2a29376a87 100644 (file)
--- 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 5fa0d9edd4e3df87500141600650deb58345a832..45001145f072b56e17512b169d3eacb85678ed57 100644 (file)
--- 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 449d5dd61ab23c058d7e0137b016d1515640b13c..a7a7c0e61d4d9773ec7da9788c89c04dbb8c29c4 100644 (file)
--- 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 47e295cecac4249966dc12a80b5d73994b07a54d..2d539df2e1d2342df36af830710cf63ab7fc62c8 100644 (file)
--- 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 d05dbb6daee8d54c221a2b645aba81456876525a..bd19310332b3afe1eb1a553e3fdd81784fc33bc6 100644 (file)
--- 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 29f00c0cf1ba39d6f2e8e24bd2c0dff88fefc2d6..3881215c11d1aefb616e7b39ce2367276ee72771 100644 (file)
--- 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 d007b23e3d7833abf4b03f37e478e83649008e49..76a6296f0deba7895ea992a35ec689e1d726e508 100644 (file)
--- 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 bef1c3f631a174b4e1c3650ed3e4ea5f39e7894e..7548fad50419b227764dd584ec3e9666eae8d226 100644 (file)
--- 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 7bcfa8d1f2d531cab140738f438b4cf50b3286b2..ba6e135e9e212407ffb6ae34c0334955f6c1fa84 100644 (file)
--- 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 68a3d2d8bb3400e454efda2cbe88074b6624a7fc..63c4f583dc1c71c184e0875caa035096d9c7efa4 100644 (file)
--- 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 47f87dbd3965bd1ecf982d4eb99a08542333b0ba..3aaf293879239faafbb7c16247c5c73a24cac3dd 100644 (file)
--- 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 648915c468adefddf85e1b0dfdb24d2e228e725c..7c89f1e5a27db106605a5f0ae335d96e45db1290 100644 (file)
--- 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 1f2e286f83dddd23d9b5d0c7534447a054875a61..9274720b46a124ae412b5a2e7875a2d04696faf6 100644 (file)
--- 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 d27fa577602d1d6c25b9e62893ae5cc4694ce37a..529ecefe460b006063dd17d92f9de2a59b596a9f 100644 (file)
--- 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 ee809a7c9440cf689c0f7b70bb3ec172615b0fdc..16c8c42a24e1631ae4f0412d5092f18335b7c102 100644 (file)
--- 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 9df8d0fc1745253bd04ef83df4564237dc67273c..55a839140854bd670524a63d887d0196509f6bbd 100644 (file)
--- 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 53dc64de554977becb3f22f3d16ffc95074f9462..07f0eac4ca905ef348d7c4ba3f58640307877e7f 100644 (file)
--- 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 b7d9c64bfa00458f5a0b9f5ea45ba7c8b40dbdac..81d09469e274721c033d4164df7a66fe04ece4a0 100644 (file)
--- 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 5a06c9a6cb0c2aedf517029e91295757b492f994..245b4b8556280441634364d9bcb8c43b6681a3a5 100644 (file)
--- 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 41b41e5f059dc97fd17c4da9b69af7515034d62e..50f03a6d14c5247827ccc0df406e705d7a51c235 100644 (file)
--- 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 77be063c0842c70d381a353d70bf9a7884f50376..dbbac9a6e0999da41d21011d3c3d8ed6159a4c1c 100644 (file)
--- 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 38acd9ac023dfb14c9cc1799ae29424e6a5ffb25..c3140cad6d6d486371e6c3ddf5aaf5fb1d574acc 100644 (file)
--- 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 0d58d50cef1382e09447fb2f447732a75b7a9be0..c7ff793d1f75a4361aa70e6bf59d7f3ba365fc4e 100644 (file)
--- 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 65baf14638edd412f2cb3d33d291cef7e885a936..b7d2b5364ab94c670ab25217527b89dcc67077c7 100644 (file)
--- 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 e4c55d9619b9863aca552b651b4082836e2f9e36..cdee2fe5c71c460a151c8f8ef9b61bd318b8eb12 100644 (file)
--- 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 41207d643afd933c236e6a83a01c183bad35f004..511acb03e680dfbb5def4878ac03210a094cec92 100644 (file)
--- 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 27b717ba9f66160be4220cea61819e4926d11087..63685b04bbfa904b8ca28afb726323af575d9c36 100644 (file)
--- 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 73d23126f2d4612c58d912578e17c833c33bc646..864b6e55bdc8a6480043bc7c29d19149cd38768c 100644 (file)
--- 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 e0dc26c1ce6dd1a9c3a0a581a0588cf25d22d0aa..b230a71641b92d1c776f6d315d3cdfca3168e838 100644 (file)
--- 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 82a3d12b9ce1456f79994c341ffd5b8e5095d2a0..99abb3c1e78e5f276b0d01af439b834687aaecaa 100644 (file)
--- 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 b7e7cba923ba381bcef084dc91c08d94e4cdfc2e..d8313e4b4ec687a23decd8861e37fd4fe15fde57 100644 (file)
--- 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 83e671ca0d6221b5382a5e03b3cfcd0c5049092c..2100d403e1f5c0f6946855ae0c06035e3123e5af 100644 (file)
--- 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 d51886c333b3ff1b331c51b3d58f616bcee9d92a..75c4c5b3cf34b7248c74c7eb6621b8d65aa35ffc 100644 (file)
--- 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 aaa49fcae7d5536f7436418680d2ef795a020cf9..f71c12b620bf1c4b8f7c78fba1be0a035579481b 100644 (file)
--- 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