* 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 17583d4bb99d5c3070483abaa261cf3939fd751f..7968f3bdb34918284198a4bb83d9cdc598f9e7cd 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 dbfc7ede65b257832a77e5c52c353ace9edf4aa8..e6c463220def2e8d57cf91ade976985050c3a599 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 7730e90411720f01624ae7e763b815562b1c4837..88169af17de497550e6b8f0c936b6ef238adc0c2 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 3413dffeb6cc07dac30222eeedc65ea4401e659b..279ea5a49df36f9a5b57da8d71d2e48fd693af7e 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 75845fb423b46b131c00350e1d9a6d13aedc69d2..22e21d5936e069ccf7b64f9118f8e321ffc3ec0e 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 de2f7d6f0dccadd91ffca7199d45734f7ece1ec2..c08c27ff152708edf4b1690ce6c19995cde63fe9 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 6486ad55338d1ebd903c9c7e5b6389ee54b3b524..dae72ed1555d7d7595352a30b9156bb84266a51a 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 ec8312f9c2537a6bd46a5f631fad6aa00e8f17a4..781b972780ea850d37c26d892565cf07b6176f68 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 c7aff3e6c053b252c0db536f8396f000c5d57742..b6cc2d0d25cc7a6dbfc2b96fc2b9672e0b224c96 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 feb109dc8a5b56157fb4b6cea1d122b9e7966054..3be297bc8d9d54842810f4c94f1764dc3dc9d272 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 e7cdbc9ed6282e7bad3a7ae53956f163bd66b210..05578f47f4c750b2880bd227f7e8d42abacf474a 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 a30fde47d70b1ea1a8677ada25647c84bfccbf13..82013f380d8f9fd75b8e8409552f202aada3b37c 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 592e18a5dff9da7b085fe7d001d4c1e66adcc2e4..4de8e57cbe620270120a50ec8c5093186f239b93 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 bcd2e41fcd4059ae61d60de16957ff0eda959e45..d3a9ff966c3bd09d39c9ecb4b29db4d37372a98f 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 f85d44367b2ad4c724622b9009cb3baed51f235c..a88ca7f8715bec60c26581bac95e86d38829ab8d 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 150e331aefaac76ae24c4b243f86545499194008..c1c7fcdcb78268523d16dbd3af5e44de7c7ae2f8 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 9b06d6ae98c7647866be4a91ad7c00991e906886..97cbe00356876ccb83437e26f3f108804f0a7a4a 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 1a04bb07ef79387837c6fcbd7a88291f5e98688c..d39a891d3d93fae53574d119b38bb20a4f4fc870 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 ab659362f4bdc82ebc09bf5e5400a183fb6861f3..4d7777a3bac4c084d699aa9c855231aeb6c99c8d 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 ce18eacedf351ac93bc02d06cb72f44df994b6d7..43ad70667eb799d7b2d9e074766933398b0b0dd5 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 36d22f7c739aece13d3ea24a104169b11238df44..bb450ab67b8251ffb4eb6d8a933345b3bb751eca 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 e9a91dcdd9555e11f801042ffb7f988b556feeed..3a800944d17668fd9074c0a22e841e12150b93a2 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 3499f6950ef376eff4bdc71c08d68c46e4f5cf00..02bddada9c17fb883171a04168123a6c9bcbd7a7 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 2235dcb5c69b1291ca6f92d1b522bb918fb2c6d3..8dc4d7130669432284ab543d07f65d8fb65047fe 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 8e99e9c0bd45907192aa1d6ea394ed4d3101ba7b..a299fbac631dea46c7eab826ebf71acb7963015e 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 808baa8373ded77295cdcacfdfa9d3e140e1d940..86c59a4f30f593a677a19c4f376292919a2171d5 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.*