* ld-arm/arm-app-abs32.d; Update expected disassembly in line with

	improved architecture detection.
	* ld-arm/arm-app.d: Likewise.
	* ld-arm/arm-lib-plt32.d: Likewise.
	* ld-arm/arm-lib.d: Likewise.
	* ld-arm/arm-static-app.d: Likewise.
	* ld-arm/armthumb-lib.d: Likewise.
	* ld-arm/farcall-mixed-app-v5.d: Likewise.
	* ld-arm/farcall-mixed-app.d: Likewise.
	* ld-arm/farcall-mixed-lib-v4t.d: Likewise.
	* ld-arm/farcall-mixed-lib.d: Likewise.
	* ld-arm/mixed-app-v5.d: Likewise.
	* ld-arm/mixed-app.d: Likewise.
	* ld-arm/mixed-lib.d: Likewise.
	* ld-arm/tls-app.d: Likewise.
	* ld-arm/tls-descrelax-be32.d: Likewise.
	* ld-arm/tls-descrelax.d: Likewise.
	* ld-arm/tls-descseq.d: Likewise.
	* ld-arm/tls-gdesc-got.d: Likewise.
	* ld-arm/tls-gdesc.d: Likewise.
	* ld-arm/tls-gdierelax.d: Likewise.
	* ld-arm/tls-gdierelax2.d: Likewise.
	* ld-arm/tls-gdlerelax.d: Likewise.
	* ld-arm/tls-lib-loc.d: Likewise.
	* ld-arm/tls-lib.d: Likewise.
	* ld-arm/tls-thumb1.d: Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 17583d4..7968f3b 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,32 @@
+2012-06-13  Nick Clifton  <nickc@redhat.com>
+
+       * ld-arm/arm-app-abs32.d; Update expected disassembly in line with
+       improved architecture detection.
+       * ld-arm/arm-app.d: Likewise.
+       * ld-arm/arm-lib-plt32.d: Likewise.
+       * ld-arm/arm-lib.d: Likewise.
+       * ld-arm/arm-static-app.d: Likewise.
+       * ld-arm/armthumb-lib.d: Likewise.
+       * ld-arm/farcall-mixed-app-v5.d: Likewise.
+       * ld-arm/farcall-mixed-app.d: Likewise.
+       * ld-arm/farcall-mixed-lib-v4t.d: Likewise.
+       * ld-arm/farcall-mixed-lib.d: Likewise.
+       * ld-arm/mixed-app-v5.d: Likewise.
+       * ld-arm/mixed-app.d: Likewise.
+       * ld-arm/mixed-lib.d: Likewise.
+       * ld-arm/tls-app.d: Likewise.
+       * ld-arm/tls-descrelax-be32.d: Likewise.
+       * ld-arm/tls-descrelax.d: Likewise.
+       * ld-arm/tls-descseq.d: Likewise.
+       * ld-arm/tls-gdesc-got.d: Likewise.
+       * ld-arm/tls-gdesc.d: Likewise.
+       * ld-arm/tls-gdierelax.d: Likewise.
+       * ld-arm/tls-gdierelax2.d: Likewise.
+       * ld-arm/tls-gdlerelax.d: Likewise.
+       * ld-arm/tls-lib-loc.d: Likewise.
+       * ld-arm/tls-lib.d: Likewise.
+       * ld-arm/tls-thumb1.d: Likewise.
+
 2012-06-12  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/14207

diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d
index dbfc7ed..e6c4632 100644 (file)
--- a/ld/testsuite/ld-arm/arm-app-abs32.d
+++ b/ld/testsuite/ld-arm/arm-app-abs32.d
@@ -1,6 +1,6 @@
 
 tmpdir/arm-app-abs32:     file format elf32-(little|big)arm.*
-architecture: arm, flags 0x00000112:
+architecture: armv4t, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address .*
 

diff --git a/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d
index 7730e90..88169af 100644 (file)
--- a/ld/testsuite/ld-arm/arm-app.d
+++ b/ld/testsuite/ld-arm/arm-app.d
@@ -1,6 +1,6 @@
 
 tmpdir/arm-app:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000112:
+architecture: armv4t, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d
index 3413dff..279ea5a 100644 (file)
--- a/ld/testsuite/ld-arm/arm-lib-plt32.d
+++ b/ld/testsuite/ld-arm/arm-lib-plt32.d
@@ -1,6 +1,6 @@
 
 tmpdir/arm-lib-plt32.so:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000150:
+architecture: armv4t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d
index 75845fb..22e21d5 100644 (file)
--- a/ld/testsuite/ld-arm/arm-lib.d
+++ b/ld/testsuite/ld-arm/arm-lib.d
@@ -1,6 +1,6 @@
 
 tmpdir/arm-lib.so:     file format elf32-(little|big)arm.*
-architecture: arm, flags 0x00000150:
+architecture: armv4t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/arm-static-app.d b/ld/testsuite/ld-arm/arm-static-app.d
index de2f7d6..c08c27f 100644 (file)
--- a/ld/testsuite/ld-arm/arm-static-app.d
+++ b/ld/testsuite/ld-arm/arm-static-app.d
@@ -1,6 +1,6 @@
 
 tmpdir/arm-static-app:     file format elf32-(little|big)arm.*
-architecture: arm, flags 0x00000112:
+architecture: armv4t, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d
index 6486ad5..dae72ed 100644 (file)
--- a/ld/testsuite/ld-arm/armthumb-lib.d
+++ b/ld/testsuite/ld-arm/armthumb-lib.d
@@ -1,6 +1,6 @@
 
 tmpdir/armthumb-lib.so:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000150:
+architecture: armv4t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
index ec8312f..781b972 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
@@ -1,6 +1,6 @@
 
 tmpdir/farcall-mixed-app-v5:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000112:
+architecture: armv4t, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d
index c7aff3e..b6cc2d0 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-mixed-app.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app.d
@@ -1,6 +1,6 @@
 
 tmpdir/farcall-mixed-app:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000112:
+architecture: armv4t, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
index feb109d..3be297b 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
@@ -1,5 +1,5 @@
 tmpdir/farcall-mixed-lib.so:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000150:
+architecture: armv4t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d
index e7cdbc9..05578f4 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-mixed-lib.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib.d
@@ -1,5 +1,5 @@
 tmpdir/farcall-mixed-lib.so:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000150:
+architecture: armv5t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d
index a30fde4..82013f3 100644 (file)
--- a/ld/testsuite/ld-arm/mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/mixed-app-v5.d
@@ -1,6 +1,6 @@
 
 tmpdir/mixed-app-v5:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000112:
+architecture: armv4t, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d
index 592e18a..4de8e57 100644 (file)
--- a/ld/testsuite/ld-arm/mixed-app.d
+++ b/ld/testsuite/ld-arm/mixed-app.d
@@ -1,6 +1,6 @@
 
 tmpdir/mixed-app:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000112:
+architecture: armv4t, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d
index bcd2e41..d3a9ff9 100644 (file)
--- a/ld/testsuite/ld-arm/mixed-lib.d
+++ b/ld/testsuite/ld-arm/mixed-lib.d
@@ -1,6 +1,6 @@
 
 tmpdir/mixed-lib.so:     file format elf32-(little|big)arm
-architecture: arm, flags 0x00000150:
+architecture: armv4t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/tls-app.d b/ld/testsuite/ld-arm/tls-app.d
index f85d443..a88ca7f 100644 (file)
--- a/ld/testsuite/ld-arm/tls-app.d
+++ b/ld/testsuite/ld-arm/tls-app.d
@@ -1,6 +1,6 @@
 
 .*:     file format elf32-.*arm.*
-architecture: arm, flags 0x00000112:
+architecture: armv4, flags 0x00000112:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x000081c8
 

diff --git a/ld/testsuite/ld-arm/tls-descrelax-be32.d b/ld/testsuite/ld-arm/tls-descrelax-be32.d
index 150e331..c1c7fcd 100644 (file)
--- a/ld/testsuite/ld-arm/tls-descrelax-be32.d
+++ b/ld/testsuite/ld-arm/tls-descrelax-be32.d
@@ -1,5 +1,5 @@
 .*:     file format elf32-.*
-architecture: arm, flags 0x[0-9a-f]+:
+architecture: armv5te, flags 0x[0-9a-f]+:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x[0-9a-f]+
 

diff --git a/ld/testsuite/ld-arm/tls-descrelax.d b/ld/testsuite/ld-arm/tls-descrelax.d
index 9b06d6a..97cbe00 100644 (file)
--- a/ld/testsuite/ld-arm/tls-descrelax.d
+++ b/ld/testsuite/ld-arm/tls-descrelax.d
@@ -1,5 +1,5 @@
 .*:     file format elf32-.*
-architecture: arm, flags 0x[0-9a-f]+:
+architecture: armv5t, flags 0x[0-9a-f]+:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x[0-9a-f]+
 

diff --git a/ld/testsuite/ld-arm/tls-descseq.d b/ld/testsuite/ld-arm/tls-descseq.d
index 1a04bb0..d39a891 100644 (file)
--- a/ld/testsuite/ld-arm/tls-descseq.d
+++ b/ld/testsuite/ld-arm/tls-descseq.d
@@ -1,6 +1,6 @@
 
 tmpdir/tls-lib2inline.so:     file format elf32-.*arm
-architecture: arm, flags 0x[0-9a-f]+:
+architecture: armv5t, flags 0x[0-9a-f]+:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x[0-9a-f]+
 

diff --git a/ld/testsuite/ld-arm/tls-gdesc-got.d b/ld/testsuite/ld-arm/tls-gdesc-got.d
index ab65936..4d7777a 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdesc-got.d
+++ b/ld/testsuite/ld-arm/tls-gdesc-got.d
@@ -1,6 +1,6 @@
 
 .*/tls-lib2-got.so:     file format elf32-.*arm.*
-architecture: arm, flags 0x00000150:
+architecture: armv4, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x000082.0
 

diff --git a/ld/testsuite/ld-arm/tls-gdesc.d b/ld/testsuite/ld-arm/tls-gdesc.d
index ce18eac..43ad706 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdesc.d
+++ b/ld/testsuite/ld-arm/tls-gdesc.d
@@ -1,6 +1,6 @@
 
 tmpdir/tls-lib2.so:     file format elf32-.*arm
-architecture: arm, flags 0x[0-9a-f]+:
+architecture: armv.t, flags 0x[0-9a-f]+:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x[0-9a-f]+
 

diff --git a/ld/testsuite/ld-arm/tls-gdierelax.d b/ld/testsuite/ld-arm/tls-gdierelax.d
index 36d22f7..bb450ab 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdierelax.d
+++ b/ld/testsuite/ld-arm/tls-gdierelax.d
@@ -1,6 +1,6 @@
 
 tmpdir/tls-app-rel-ie:     file format elf32-.*arm.*
-architecture: arm, flags 0x[0-9a-f]+:
+architecture: armv5t, flags 0x[0-9a-f]+:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x[0-9a-f]+
 

diff --git a/ld/testsuite/ld-arm/tls-gdierelax2.d b/ld/testsuite/ld-arm/tls-gdierelax2.d
index e9a91dc..3a80094 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdierelax2.d
+++ b/ld/testsuite/ld-arm/tls-gdierelax2.d
@@ -1,6 +1,6 @@
 
 tmpdir/tls-app-rel-ie2:     file format elf32-.*arm.*
-architecture: arm, flags 0x[0-9a-f]+:
+architecture: armv5t, flags 0x[0-9a-f]+:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x[0-9a-f]+
 

diff --git a/ld/testsuite/ld-arm/tls-gdlerelax.d b/ld/testsuite/ld-arm/tls-gdlerelax.d
index 3499f69..02bddad 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdlerelax.d
+++ b/ld/testsuite/ld-arm/tls-gdlerelax.d
@@ -1,6 +1,6 @@
 
 tmpdir/tls-app-rel-le:     file format elf32-.*arm.*
-architecture: arm, flags 0x[0-9a-f]+:
+architecture: armv5t, flags 0x[0-9a-f]+:
 EXEC_P, HAS_SYMS, D_PAGED
 start address 0x[0-9a-f]+
 

diff --git a/ld/testsuite/ld-arm/tls-lib-loc.d b/ld/testsuite/ld-arm/tls-lib-loc.d
index 2235dcb..8dc4d71 100644 (file)
--- a/ld/testsuite/ld-arm/tls-lib-loc.d
+++ b/ld/testsuite/ld-arm/tls-lib-loc.d
@@ -1,6 +1,6 @@
 
 .*:     file format elf32-.*arm
-architecture: arm, flags 0x00000150:
+architecture: armv5t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/tls-lib.d b/ld/testsuite/ld-arm/tls-lib.d
index 8e99e9c..a299fba 100644 (file)
--- a/ld/testsuite/ld-arm/tls-lib.d
+++ b/ld/testsuite/ld-arm/tls-lib.d
@@ -1,6 +1,6 @@
 
 .*:     file format elf32-.*arm.*
-architecture: arm, flags 0x00000150:
+architecture: armv4, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*
 

diff --git a/ld/testsuite/ld-arm/tls-thumb1.d b/ld/testsuite/ld-arm/tls-thumb1.d
index 808baa8..86c59a4 100644 (file)
--- a/ld/testsuite/ld-arm/tls-thumb1.d
+++ b/ld/testsuite/ld-arm/tls-thumb1.d
@@ -1,5 +1,5 @@
 .*:     file format elf32-.*arm
-architecture: arm, flags 0x00000150:
+architecture: armv4t, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x.*