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.
author: Joseph Myers <joseph@codesourcery.com> 2010-10-21 21:16:54 +0000
committer: Joseph Myers <joseph@codesourcery.com> 2010-10-21 21:16:54 +0000
commit: 75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7 (patch)
tree: cc6cb48ca8f40be4818245293713f772320062d7 /gas
parent: 7dc98aeaf1f3fe256e284347a41f1c150955c37d (diff)
download: gdb-75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7.zip
gdb-75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7.tar.gz
gdb-75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7.tar.bz2
21 files changed, 64 insertions, 40 deletions
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
author	Joseph Myers <joseph@codesourcery.com>	2010-10-21 21:16:54 +0000
committer	Joseph Myers <joseph@codesourcery.com>	2010-10-21 21:16:54 +0000
commit	75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7 (patch)
tree	cc6cb48ca8f40be4818245293713f772320062d7 /gas
parent	7dc98aeaf1f3fe256e284347a41f1c150955c37d (diff)
download	gdb-75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7.zip gdb-75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7.tar.gz gdb-75fa6dc1e84d6a0286b47adf8cc7aec06b3ffed7.tar.bz2