* gas/i386/relax-1.s: Use .p2align, not .align.

	* gas/i386/relax-2.s: Likewise.
	* gas/i386/relax-1.d: Remove label match.
	* gas/i386/relax-2.d: Likewise.  Correct test name.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 73a0c15..a19b611 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-27  Alan Modra  <amodra@gmail.com>
+
+       * gas/i386/relax-1.s: Use .p2align, not .align.
+       * gas/i386/relax-2.s: Likewise.
+       * gas/i386/relax-1.d: Remove label match.
+       * gas/i386/relax-2.d: Likewise.  Correct test name.
+
 2010-10-26  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * gas/i386/relax-1.d: Generalize regexes a bit.

diff --git a/gas/testsuite/gas/i386/relax-1.d b/gas/testsuite/gas/i386/relax-1.d
index 13a1616..ada0d7a 100644 (file)
--- a/gas/testsuite/gas/i386/relax-1.d
+++ b/gas/testsuite/gas/i386/relax-1.d
@@ -6,7 +6,6 @@
 
 Disassembly of section .text:
 
-0+ <.text>:
 #...
    e:  e9 8d 00 00 00          jmp    (0x)?a0( .*)?
 #...

diff --git a/gas/testsuite/gas/i386/relax-1.s b/gas/testsuite/gas/i386/relax-1.s
index 9bae8d9..1e103fb 100644 (file)
--- a/gas/testsuite/gas/i386/relax-1.s
+++ b/gas/testsuite/gas/i386/relax-1.s
@@ -4,7 +4,7 @@
         .fill 14, 1, 0x90
        jmp     .LBB1_23
         .fill 18, 1, 0x90
-       .align  16, 0x90
+       .p2align        4, 0x90
         .fill 96, 1, 0x90
 .LBB1_23:
        nop

diff --git a/gas/testsuite/gas/i386/relax-2.d b/gas/testsuite/gas/i386/relax-2.d
index e31fd20..26b8490 100644 (file)
--- a/gas/testsuite/gas/i386/relax-2.d
+++ b/gas/testsuite/gas/i386/relax-2.d
@@ -1,4 +1,4 @@
-#name: i386 relax 3
+#name: i386 relax 2
 #objdump: -dw
 
 .*: +file format .*
@@ -6,7 +6,6 @@
 
 Disassembly of section .text:
 
-0+ <.text>:
 #...
   38:  0f 85 88 00 00 00       jne    (0x)?c6( .*)?
 #...

diff --git a/gas/testsuite/gas/i386/relax-2.s b/gas/testsuite/gas/i386/relax-2.s
index f01aea4..abc6ae1 100644 (file)
--- a/gas/testsuite/gas/i386/relax-2.s
+++ b/gas/testsuite/gas/i386/relax-2.s
@@ -4,7 +4,7 @@
         .fill 10, 1, 0x90
        jne .LBB0_43
         .fill 5, 1, 0x90
-       .align 16, 0x90
+       .p2align 4, 0x90
         .fill 118, 1, 0x90
 .LBB0_43:
        nop