PR gas/12532

	* gas/arm/plt-1.d: Update expected disassembly.
	* gas/arm/thumb2_bcond.d: Likewise.
	* gas/arm/weakdef-1.d: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e770121..6e3a05a 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-12  Nick Clifton  <nickc@redhat.com>
+
+       PR gas/12532
+       * gas/arm/plt-1.d: Update expected disassembly.
+       * gas/arm/thumb2_bcond.d: Likewise.
+       * gas/arm/weakdef-1.d: Likewise.
+
 2011-04-12  Alan Modra  <amodra@gmail.com>
 
        * gas/all/gas.exp (do_930509a): Don't xfail h8300 and mn10200.

diff --git a/gas/testsuite/gas/arm/plt-1.d b/gas/testsuite/gas/arm/plt-1.d
index ba25f8d..d2a64f7 100644 (file)
--- a/gas/testsuite/gas/arm/plt-1.d
+++ b/gas/testsuite/gas/arm/plt-1.d
@@ -10,29 +10,29 @@
 Disassembly of section \.text:
 
 0+000 <Strong1>:
-   0:  f7ff bffe       b\.w    12 <Strong2>
+   0:  f7ff bffe       b\.w    14 <Strong2>
                        0: R_ARM_THM_JUMP24     Strong2
-   4:  f7ff bffe       b\.w    12 <Strong2>
+   4:  f7ff bffe       b\.w    14 <Strong2>
                        4: R_ARM_THM_JUMP24     Strong2
-   8:  e7fe            b\.n    12 <Strong2>
+   8:  e7fe            b\.n    14 <Strong2>
                        8: R_ARM_THM_JUMP11     Strong2
-   a:  e7fe            b\.n    12 <Strong2>
-                       a: R_ARM_THM_JUMP11     Strong2
-   c:  f7ff bffe       b\.w    12 <Strong2>
-                       c: R_ARM_THM_JUMP24     Strong2
-  10:  e7fe            b\.n    12 <Strong2>
-                       10: R_ARM_THM_JUMP11    Strong2
+   a:  f7ff bffe       b\.w    14 <Strong2>
+                       a: R_ARM_THM_JUMP24     Strong2
+   e:  f7ff bffe       b\.w    14 <Strong2>
+                       e: R_ARM_THM_JUMP24     Strong2
+  12:  e7fe            b\.n    14 <Strong2>
+                       12: R_ARM_THM_JUMP11    Strong2
 
-0+012 <Strong2>:
-  12:  f7ff bffe       b\.w    0 <Strong1>
-                       12: R_ARM_THM_JUMP24    Strong1
-  16:  f7ff bffe       b\.w    0 <Strong1>
-                       16: R_ARM_THM_JUMP24    Strong1
-  1a:  e7fe            b\.n    0 <Strong1>
-                       1a: R_ARM_THM_JUMP11    Strong1
+0+014 <Strong2>:
+  14:  f7ff bffe       b\.w    0 <Strong1>
+                       14: R_ARM_THM_JUMP24    Strong1
+  18:  f7ff bffe       b\.w    0 <Strong1>
+                       18: R_ARM_THM_JUMP24    Strong1
   1c:  e7fe            b\.n    0 <Strong1>
                        1c: R_ARM_THM_JUMP11    Strong1
   1e:  f7ff bffe       b\.w    0 <Strong1>
                        1e: R_ARM_THM_JUMP24    Strong1
-  22:  e7fe            b\.n    0 <Strong1>
-                       22: R_ARM_THM_JUMP11    Strong1
+  22:  f7ff bffe       b\.w    0 <Strong1>
+                       22: R_ARM_THM_JUMP24    Strong1
+  26:  e7fe            b\.n    0 <Strong1>
+                       26: R_ARM_THM_JUMP11    Strong1

diff --git a/gas/testsuite/gas/arm/thumb2_bcond.d b/gas/testsuite/gas/arm/thumb2_bcond.d
index 48aa397..edf286d 100644 (file)
--- a/gas/testsuite/gas/arm/thumb2_bcond.d
+++ b/gas/testsuite/gas/arm/thumb2_bcond.d
@@ -5,23 +5,23 @@
 
 Disassembly of section .text:
 0+000 <[^>]+> bf18             it      ne
-0+002 <[^>]+> e7fd             bne.n   0+0 <[^>]+>
-0+004 <[^>]+> bf38             it      cc
-0+006 <[^>]+> f7ff bffb        bcc.w   0+0 <[^>]+>
-0+00a <[^>]+> bf28             it      cs
-0+00c <[^>]+> f7ff fff8        blcs    0+0 <[^>]+>
-0+010 <[^>]+> bfb8             it      lt
-0+012 <[^>]+> 47a8             blxlt   r5
-0+014 <[^>]+> bf08             it      eq
-0+016 <[^>]+> 4740             bxeq    r8
-0+018 <[^>]+> bfc8             it      gt
-0+01a <[^>]+> e8d4 f001        tbbgt   \[r4, r1\]
-0+01e <[^>]+> bfb8             it      lt
-0+020 <[^>]+> df00             svclt   0
-0+022 <[^>]+> bf08             it      eq
-0+024 <[^>]+> f8d0 f000        ldreq.w pc, \[r0\]
-0+028 <[^>]+> bfdc             itt     le
-0+02a <[^>]+> be00             bkpt    0x0000
-0+02c <[^>]+> bf00             nople
-0+02e <[^>]+> bf00             nop
+0+002 <[^>]+> f7ff bffd        bne.w   0+0 <[^>]+>
+0+006 <[^>]+> bf38             it      cc
+0+008 <[^>]+> f7ff bffa        bcc.w   0+0 <[^>]+>
+0+00c <[^>]+> bf28             it      cs
+0+00e <[^>]+> f7ff fff7        blcs    0+0 <[^>]+>
+0+012 <[^>]+> bfb8             it      lt
+0+014 <[^>]+> 47a8             blxlt   r5
+0+016 <[^>]+> bf08             it      eq
+0+018 <[^>]+> 4740             bxeq    r8
+0+01a <[^>]+> bfc8             it      gt
+0+01c <[^>]+> e8d4 f001        tbbgt   \[r4, r1\]
+0+020 <[^>]+> bfb8             it      lt
+0+022 <[^>]+> df00             svclt   0
+0+024 <[^>]+> bf08             it      eq
+0+026 <[^>]+> f8d0 f000        ldreq.w pc, \[r0\]
+0+02a <[^>]+> bfdc             itt     le
+0+02c <[^>]+> be00             bkpt    0x0000
+0+02e <[^>]+> bf00             nople
+0+030 <[^>]+> bf00             nop
 #...

diff --git a/gas/testsuite/gas/arm/weakdef-1.d b/gas/testsuite/gas/arm/weakdef-1.d
index 8351fc2..3ba6f9a 100644 (file)
--- a/gas/testsuite/gas/arm/weakdef-1.d
+++ b/gas/testsuite/gas/arm/weakdef-1.d
@@ -10,11 +10,11 @@
 Disassembly of section .text:
 
 0+000 <Weak>:
-   0:  e7fe            b.n     2 <Strong>
-                       0: R_ARM_THM_JUMP11     Strong
+   0:  f7ff bffe       b.w     4 <Strong>
+                       0: R_ARM_THM_JUMP24     Strong
 
-0+002 <Strong>:
-   2:  f7ff bffe       b.w     0 <Random>
-                       2: R_ARM_THM_JUMP24     Random
-   6:  f7ff bffe       b.w     0 <Weak>
-                       6: R_ARM_THM_JUMP24     Weak
+0+004 <Strong>:
+   4:  f7ff bffe       b.w     0 <Random>
+                       4: R_ARM_THM_JUMP24     Random
+   8:  f7ff bffe       b.w     0 <Weak>
+                       8: R_ARM_THM_JUMP24     Weak