* gas/arm/thumbv6.s: Add nops.

	* gas/arm/thumbv6.d: Use -M force-thumb option to objdump.  Add nops.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5b2d0fcf2f29d22962c3c2bdeea0a60efed66e42..7e837390810893f383460f38272990de30c684e8 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-14  Mark Mitchell  <mark@codesourcery.com>
+
+       * gas/arm/thumbv6.s: Add nops.
+       * gas/arm/thumbv6.d: Use -M force-thumb option to objdump.  Add nops.
+       
 2003-12-14  Alan Modra  <amodra@bigpond.net.au>
 
        * gas/mmix/basep-8.d: Update for lcomm symbol type change.

diff --git a/gas/testsuite/gas/arm/thumbv6.d b/gas/testsuite/gas/arm/thumbv6.d
index e8f54f5238e7ceee23dddb7e174dc876ed243ec7..b460d6423fdaff0562475e43bbeda381bb2580a1 100644 (file)
--- a/gas/testsuite/gas/arm/thumbv6.d
+++ b/gas/testsuite/gas/arm/thumbv6.d
@@ -1,6 +1,6 @@
 #name: THUMB V6 instructions
 #as: -march=armv6 -mthumb
-#objdump: -dr --prefix-addresses --show-raw-insn
+#objdump: -dr --prefix-addresses --show-raw-insn -M force-thumb
 
 .*: +file format .*arm.*
 
@@ -17,3 +17,7 @@ Disassembly of section .text:
 0+012 <[^>]*> b251 *   sxtb    r1, r2
 0+014 <[^>]*> b2a3 *   uxth    r3, r4
 0+016 <[^>]*> b2f5 *   uxtb    r5, r6
+0+018 <[^>]*> 46c0 *   nop[    ]+\(mov r8, r8\)
+0+01a <[^>]*> 46c0 *   nop[    ]+\(mov r8, r8\)
+0+01c <[^>]*> 46c0 *   nop[    ]+\(mov r8, r8\)
+0+01e <[^>]*> 46c0 *   nop[    ]+\(mov r8, r8\)

diff --git a/gas/testsuite/gas/arm/thumbv6.s b/gas/testsuite/gas/arm/thumbv6.s
index b02d60c29378ddcbb944c7164e1b956dbce84b73..a4049750c1c9143ff10fb8dec7dc06bea9c9d274 100644 (file)
--- a/gas/testsuite/gas/arm/thumbv6.s
+++ b/gas/testsuite/gas/arm/thumbv6.s
@@ -15,3 +15,10 @@ label:
        sxtb   r1, r2
        uxth   r3, r4
        uxtb   r5, r6
+
+       # Add four nop instructions to ensure that the output is
+       # 32-byte aligned as required for arm-aout.
+       nop
+       nop
+       nop
+       nop