* ld-tic6x/shlib-1b.rd: Update expected readelf output.

	* ld-tic6x/shlib-1rb.rd: Likewise.
	* ld-tic6x/shlib-1.rd: Likewise.
	* ld-tic6x/shlib-1r.rd: Likewise.
	* ld-tic6x/shlib-app-1b.rd: Likewise.
	* ld-tic6x/shlib-app-1rb.rd: Likewise.
	* ld-tic6x/shlib-app-1.rd: Likewise.
	* ld-tic6x/shlib-app-1r.rd: Likewise.
	* ld-tic6x/shlib-noindex.rd: Likewise.
	* ld-tic6x/static-app-1b.rd: Likewise.
	* ld-tic6x/static-app-1rb.rd: Likewise.
	* ld-tic6x/static-app-1.rd: Likewise.
	* ld-tic6x/static-app-1r.rd: Likewise.

14 files changed, 29 insertions, 13 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 751a387..7bdd72c 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2012-05-29  Nick Clifton  <nickc@redhat.com>
+
+	* ld-tic6x/shlib-1b.rd: Update expected readelf output.
+	* ld-tic6x/shlib-1rb.rd: Likewise.
+	* ld-tic6x/shlib-1.rd: Likewise.
+	* ld-tic6x/shlib-1r.rd: Likewise.
+	* ld-tic6x/shlib-app-1b.rd: Likewise.
+	* ld-tic6x/shlib-app-1rb.rd: Likewise.
+	* ld-tic6x/shlib-app-1.rd: Likewise.
+	* ld-tic6x/shlib-app-1r.rd: Likewise.
+	* ld-tic6x/shlib-noindex.rd: Likewise.
+	* ld-tic6x/static-app-1b.rd: Likewise.
+	* ld-tic6x/static-app-1rb.rd: Likewise.
+	* ld-tic6x/static-app-1.rd: Likewise.
+	* ld-tic6x/static-app-1r.rd: Likewise.
+
 2012-05-28  Nick Clifton  <nickc@redhat.com>
 
 	* ld-ifunc/ifunc-13a-i386.s: Fix use of .global directive.
diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd
index a0232cd..470af65 100644
--- a/ld/testsuite/ld-tic6x/shlib-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1.rd
@@ -15,7 +15,7 @@ Section Headers:
   \[10\] \.got              PROGBITS        10000100 002100 000028 00  WA  0   0  4
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
   \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
   \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-1b.rd b/ld/testsuite/ld-tic6x/shlib-1b.rd
index a0232cd..470af65 100644
--- a/ld/testsuite/ld-tic6x/shlib-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1b.rd
@@ -15,7 +15,7 @@ Section Headers:
   \[10\] \.got              PROGBITS        10000100 002100 000028 00  WA  0   0  4
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
   \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
   \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-1r.rd b/ld/testsuite/ld-tic6x/shlib-1r.rd
index a0232cd..470af65 100644
--- a/ld/testsuite/ld-tic6x/shlib-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1r.rd
@@ -15,7 +15,7 @@ Section Headers:
   \[10\] \.got              PROGBITS        10000100 002100 000028 00  WA  0   0  4
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
   \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
   \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.rd b/ld/testsuite/ld-tic6x/shlib-1rb.rd
index a0232cd..470af65 100644
--- a/ld/testsuite/ld-tic6x/shlib-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd
@@ -15,7 +15,7 @@ Section Headers:
   \[10\] \.got              PROGBITS        10000100 002100 000028 00  WA  0   0  4
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
   \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
   \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.rd b/ld/testsuite/ld-tic6x/shlib-app-1.rd
index e1809af..a7a48e5 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd
@@ -16,7 +16,7 @@ Section Headers:
   \[11\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
   \[12\] \.neardata         PROGBITS        100000c0 0020c0 00000c 00  WA  0   0  4
   \[13\] \.bss              NOBITS          100000cc 0020cc 000004 00  WA  0   0  4
-  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00      0   0  1
+  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020cc 000019 00      0   0  1
   \[15\] \.shstrtab         STRTAB          00000000 0020e5 000080 00      0   0  1
   \[16\] \.symtab           SYMTAB          00000000 002438 0001a0 10     17  20  4
   \[17\] \.strtab           STRTAB          00000000 0025d8 000055 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.rd b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
index 95547b0..e709d3f 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
@@ -16,7 +16,7 @@ Section Headers:
   \[11\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
   \[12\] \.neardata         PROGBITS        100000c0 0020c0 00000c 00  WA  0   0  4
   \[13\] \.bss              NOBITS          100000cc 0020cc 000004 00  WA  0   0  4
-  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00      0   0  1
+  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020cc 000019 00      0   0  1
   \[15\] \.shstrtab         STRTAB          00000000 0020e5 000080 00      0   0  1
   \[16\] \.symtab           SYMTAB          00000000 002438 0001a0 10     17  20  4
   \[17\] \.strtab           STRTAB          00000000 0025d8 000055 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.rd b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
index 566f2f9..af7f5bd 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
@@ -15,7 +15,7 @@ Section Headers:
   \[10\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
   \[11\] \.neardata         PROGBITS        100000c0 0020c0 000004 00  WA  0   0  4
   \[12\] \.bss              NOBITS          100000c4 0020c4 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00      0   0  1
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020c4 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 0020dd 00007b 00      0   0  1
   \[15\] \.symtab           SYMTAB          00000000 002400 000160 10     16  18  4
   \[16\] \.strtab           STRTAB          00000000 002560 00004d 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
index be163d9..109144b 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
@@ -15,7 +15,7 @@ Section Headers:
   \[10\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
   \[11\] \.neardata         PROGBITS        100000c0 0020c0 000004 00  WA  0   0  4
   \[12\] \.bss              NOBITS          100000c4 0020c4 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00      0   0  1
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020c4 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 0020dd 00007b 00      0   0  1
   \[15\] \.symtab           SYMTAB          00000000 002400 000160 10     16  18  4
   \[16\] \.strtab           STRTAB          00000000 002560 00004d 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd
index e9b57c7..63e4bd8 100644
--- a/ld/testsuite/ld-tic6x/shlib-noindex.rd
+++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd
@@ -16,7 +16,7 @@ Section Headers:
   \[11\] \.got              PROGBITS        10000100 002100 000028 00  WA  0   0  4
   \[12\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[13\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
-  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
+  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 002130 000019 00      0   0  1
   \[15\] \.shstrtab         STRTAB          00000000 002149 000080 00      0   0  1
   \[16\] \.symtab           SYMTAB          00000000 00249c 0001b0 10     17  20  4
   \[17\] \.strtab           STRTAB          00000000 00264c 000059 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/static-app-1.rd b/ld/testsuite/ld-tic6x/static-app-1.rd
index cec76d4..ff6e26e 100644
--- a/ld/testsuite/ld-tic6x/static-app-1.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1.rd
@@ -13,7 +13,7 @@ Section Headers:
   \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
   \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 000014 00  WA  0   0  4
   \[10\] \.bss              NOBITS          100000f4 0020f4 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00      0   0  1
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020f4 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 00210d 000071 00      0   0  1
   \[13\] \.symtab           SYMTAB          00000000 0023d8 0001a0 10     14  19  4
   \[14\] \.strtab           STRTAB          00000000 002578 000060 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/static-app-1b.rd b/ld/testsuite/ld-tic6x/static-app-1b.rd
index cec76d4..ff6e26e 100644
--- a/ld/testsuite/ld-tic6x/static-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1b.rd
@@ -13,7 +13,7 @@ Section Headers:
   \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
   \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 000014 00  WA  0   0  4
   \[10\] \.bss              NOBITS          100000f4 0020f4 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00      0   0  1
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020f4 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 00210d 000071 00      0   0  1
   \[13\] \.symtab           SYMTAB          00000000 0023d8 0001a0 10     14  19  4
   \[14\] \.strtab           STRTAB          00000000 002578 000060 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/static-app-1r.rd b/ld/testsuite/ld-tic6x/static-app-1r.rd
index cd8bc4c..d59eee9 100644
--- a/ld/testsuite/ld-tic6x/static-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1r.rd
@@ -13,7 +13,7 @@ Section Headers:
   \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
   \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 00000c 00  WA  0   0  4
   \[10\] \.bss              NOBITS          100000ec 0020ec 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00      0   0  1
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020ec 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 002105 000071 00      0   0  1
   \[13\] \.symtab           SYMTAB          00000000 0023d0 000190 10     14  18  4
   \[14\] \.strtab           STRTAB          00000000 002560 00005e 00      0   0  1
diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.rd b/ld/testsuite/ld-tic6x/static-app-1rb.rd
index cd8bc4c..d59eee9 100644
--- a/ld/testsuite/ld-tic6x/static-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd
@@ -13,7 +13,7 @@ Section Headers:
   \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
   \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 00000c 00  WA  0   0  4
   \[10\] \.bss              NOBITS          100000ec 0020ec 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00      0   0  1
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTE 00000000 0020ec 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 002105 000071 00      0   0  1
   \[13\] \.symtab           SYMTAB          00000000 0023d0 000190 10     14  18  4
   \[14\] \.strtab           STRTAB          00000000 002560 00005e 00      0   0  1