Merge from mainline:

        2002-08-01  H.J. Lu <hjl@gnu.org>
        * gas/mips/elf-rel6.s: Add ".p2align 4".
        * gas/mips/elf-rel6.d: Check nop.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index edd43444fae93316b5b1bd03824cac49f0a7aedc..329c65f4485bdffbcf553f5344f1dcfe97ed3a03 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-06  Daniel Jacobowitz  <drow@mvista.com>
+
+       Merge from mainline:
+       2002-08-01  H.J. Lu <hjl@gnu.org>
+       * gas/mips/elf-rel6.s: Add ".p2align 4".
+       * gas/mips/elf-rel6.d: Check nop.
+
 2002-08-01  Daniel Jacobowitz  <drow@mvista.com>
 
        Merge from mainline:

diff --git a/gas/testsuite/gas/mips/elf-rel6.d b/gas/testsuite/gas/mips/elf-rel6.d
index 5baadf9445ced0f8f744d7d809ed6b9654b15e30..3ff37b27ed9f90acfe3893bfe008977c9b76d0df 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel6.d
+++ b/gas/testsuite/gas/mips/elf-rel6.d
@@ -8,3 +8,7 @@ Disassembly of section \.text:
                        0: R_MIPS16_GPREL       bar
 0+04 <.*> lb   v0,1\(v1\)
                        4: R_MIPS16_GPREL       bar
+0+08 <[^>]*> nop
+0+0a <[^>]*> nop
+0+0c <[^>]*> nop
+0+0e <[^>]*> nop

diff --git a/gas/testsuite/gas/mips/elf-rel6.s b/gas/testsuite/gas/mips/elf-rel6.s
index e0bc37ab69ee0ed40fa89a3e5366d9f7d60e7cb4..6735d7555fad0572d9edebf0312b693956f7b037 100644 (file)
--- a/gas/testsuite/gas/mips/elf-rel6.s
+++ b/gas/testsuite/gas/mips/elf-rel6.s
@@ -14,3 +14,6 @@ f:
        lb      $2,%gprel(bar)($3)
        lb      $2,%gprel(bar+1)($3)
        .end    f
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+       .p2align 4