* gas/testsuite/gas/arm/thumb-eabi.d: Add case for divided syntax encoding of movs.

	* gas/testsuite/gas/arm/thumb.d: Likewise.
	* gas/testsuite/gas/arm/thumb.s: Likewise.
	* gas/testsuite/gas/arm/thumb2_it.d: Update for change in lsls/movs disassembly.
	* gas/testsuite/gas/arm/thumb2_it_auto.d: Liekwise.
	* gas/testsuite/gas/arm/thumb32.d: Likewise.
	* ld/testsuite/ld-arm/arm-call.d: Handle change in lsls/movs disassembly.
	* ld/testsuite/ld-arm/farcall-thumb-arm-short.d: Likewise.
	* ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d: Likewise.
	* ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d: Likewise.
	* ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d: Likewise.
	* ld/testsuite/ld-arm/farcall-thumb-thumb-m.d: Likewise.
	* ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d: Likewise.
	* ld/testsuite/ld-arm/farcall-thumb-thumb.d: Likewise.
	* ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d: Likewise.
	* ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d: Likewise.
	* ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d: Likewise.
	* ld/testsuite/ld-arm/thumb2-bl-bad.d: Likewise.
	* opcodes/arm-dis.c (thumb-opcodes): Add disassembly for movs.

13 files changed, 27 insertions, 12 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a59ad4a..162f166 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2010-06-07  Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
+
+	* ld-arm/arm-call.d: Handle change in lsls/movs disassembly.
+	* ld-arm/farcall-thumb-arm-short.d: Likewise.
+	* ld-arm/farcall-thumb-thumb-blx-pic-veneer.d: Likewise.
+	* ld-arm/farcall-thumb-thumb-blx.d: Likewise.
+	* ld-arm/farcall-thumb-thumb-m-pic-veneer.d: Likewise.
+	* ld-arm/farcall-thumb-thumb-m.d: Likewise.
+	* ld-arm/farcall-thumb-thumb-pic-veneer.d: Likewise.
+	* ld-arm/farcall-thumb-thumb.d: Likewise.
+	* ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d: Likewise.
+	* ld-arm/thumb2-bl-as-thumb1-bad.d: Likewise.
+	* ld-arm/thumb2-bl-bad-noeabi.d: Likewise.
+	* ld-arm/thumb2-bl-bad.d: Likewise.
+
 2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/11628
diff --git a/ld/testsuite/ld-arm/arm-call.d b/ld/testsuite/ld-arm/arm-call.d
index fa452ab..a320743 100644
--- a/ld/testsuite/ld-arm/arm-call.d
+++ b/ld/testsuite/ld-arm/arm-call.d
@@ -46,7 +46,7 @@ Disassembly of section .text:
     8050:	f7ff fff1 	bl	8036 <t3>
     8054:	f7ff efd4 	blx	8000 <_start>
     8058:	f7ff efd2 	blx	8000 <_start>
-    805c:	0000      	lsls	r0, r0, #0
+    805c:	0000      	movs	r0, r0
 	...
 
 00008060 <__t1_from_arm>:
diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm-short.d b/ld/testsuite/ld-arm/farcall-thumb-arm-short.d
index f4caf87..4e19039 100644
--- a/ld/testsuite/ld-arm/farcall-thumb-arm-short.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-arm-short.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 f802 	bl	1008 <__bar_from_thumb>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	\.\.\.
 
 00001008 <__bar_from_thumb>:
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
index 86c0ca0..27b208e 100644
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 e802 	blx	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	\.\.\.
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
index 5e9ac5a..7998746 100644
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 e802 	blx	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	\.\.\.
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
index 79e6449..974c1e9 100644
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 f802 	bl	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	...
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
index 84782b8..e63b3f8 100644
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 f802 	bl	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	\.\.\.
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
index 8c2cddf..8b14599 100644
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 f802 	bl	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	...
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb.d b/ld/testsuite/ld-arm/farcall-thumb-thumb.d
index 8ea41c7..ffbc6df 100644
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 f802 	bl	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	\.\.\.
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d
index 540c452..8872909 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 f802 	bl	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	...
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
index 04eb991..6b47810 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 e802 	blx	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	\.\.\.
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d b/ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d
index 540c452..8872909 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 f802 	bl	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	...
 
 00001008 <__bar_veneer>:
diff --git a/ld/testsuite/ld-arm/thumb2-bl-bad.d b/ld/testsuite/ld-arm/thumb2-bl-bad.d
index 89c7a55..d78e451 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-bad.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-bad.d
@@ -4,7 +4,7 @@ Disassembly of section .text:
 
 00001000 <_start>:
     1000:	f000 e802 	blx	1008 <__bar_veneer>
-    1004:	0000      	lsls	r0, r0, #0
+    1004:	0000      	movs	r0, r0
 	\.\.\.
 
 00001008 <__bar_veneer>: