Fix tests to align to a 16 byte boundary.

12 files changed, 45 insertions, 7 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 58f4ee7..0a22d55 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,25 @@
+000-12-02  Chris Demetriou  <cgd@sibyte.com>
+
+        * gas/mips/elf_e_flags.s: Add padding to the end of the
+        file so that objdump output will be consistent.
+        * gas/mips/elf_e_flags1.d, gas/mips/elf_e_flags2.d,
+        gas/mips/elf_e_flags3.d, gas/mips/elf_e_flags4.d: Expect
+        "..." at end of objdump output because of zero bytes at end
+        of section.
+        * gas/mips/elf_e_flags.c: Add note to comment about
+        what's changing in elf_e_flags.s.
+
+        * gas/mips/la.s: Add padding to the end of the file so that
+        objdump output will be consistent.
+        * gas/mips/la-svr4pic.d, gas/mips/la-xgot.d: Expect "..." at
+        end of objdump output because of zero bytes at end of
+        section.
+
+        * gas/mips/sync.s: Add padding to the end of the file so that
+        objdump output will be consistent.
+        * gas/mips/sync.d: Expect "..." at end of objdump output
+        because of zero bytes at end of section.
+
 2000-12-01  Chris Demetriou  <cgd@sibyte.com>
 
         * gas/mips/mips16.d: Expect mips16 nops to be used for padding
diff --git a/gas/testsuite/gas/mips/elf_e_flags.c b/gas/testsuite/gas/mips/elf_e_flags.c
index 7615f9c..7583cc9 100644
--- a/gas/testsuite/gas/mips/elf_e_flags.c
+++ b/gas/testsuite/gas/mips/elf_e_flags.c
@@ -13,7 +13,13 @@
 
    Ian 10 June 1999: I tweaked the resulting assembler file so that it
    would generate the same code when gas was configured for mips-elf
-   and for mips64-elf.  */
+   and for mips64-elf.
+
+   18 October 2000: Chris Demetriou <cgd@sibyte.com> tweaked the code so
+   that it would always generate enough zero-padding at the end to make
+   objdump print "...", so that the test would be successful even on
+   machines that pad results to cache line or other boundaries
+   (e.g. mips-linux). */
 
 int
 foo (int a, int b)
diff --git a/gas/testsuite/gas/mips/elf_e_flags.s b/gas/testsuite/gas/mips/elf_e_flags.s
index 1eca8c4..3bfb625 100644
--- a/gas/testsuite/gas/mips/elf_e_flags.s
+++ b/gas/testsuite/gas/mips/elf_e_flags.s
@@ -41,3 +41,6 @@ main:
 	.set	reorder
 
 	.end	main
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.space  8
diff --git a/gas/testsuite/gas/mips/elf_e_flags1.d b/gas/testsuite/gas/mips/elf_e_flags1.d
index a0aa2f1..adef2c0 100644
--- a/gas/testsuite/gas/mips/elf_e_flags1.d
+++ b/gas/testsuite/gas/mips/elf_e_flags1.d
@@ -3,7 +3,7 @@
 # objdump: -fd
 
 .*:.*file format.*mips.*
-architecture: mips:[34][0-9]00, flags 0x00000011:
+architecture: mips:.*, flags 0x00000011:
 HAS_RELOC, HAS_SYMS
 start address 0x0000000000000000
 
@@ -25,3 +25,4 @@ Disassembly of section .text:
   28:	00000000 	nop
   2c:	03e00008 	jr	\$ra
   30:	27bd0028 	addiu	\$sp,\$sp,40
+	...
diff --git a/gas/testsuite/gas/mips/elf_e_flags2.d b/gas/testsuite/gas/mips/elf_e_flags2.d
index e313bd3..4255f6a 100644
--- a/gas/testsuite/gas/mips/elf_e_flags2.d
+++ b/gas/testsuite/gas/mips/elf_e_flags2.d
@@ -25,3 +25,4 @@ Disassembly of section .text:
   24:	00000000 	nop
   28:	03e00008 	jr	\$ra
   2c:	27bd0028 	addiu	\$sp,\$sp,40
+	...
diff --git a/gas/testsuite/gas/mips/elf_e_flags3.d b/gas/testsuite/gas/mips/elf_e_flags3.d
index 9813491..aa90af7 100644
--- a/gas/testsuite/gas/mips/elf_e_flags3.d
+++ b/gas/testsuite/gas/mips/elf_e_flags3.d
@@ -25,3 +25,4 @@ Disassembly of section .text:
   24:	00000000 	nop
   28:	03e00008 	jr	\$ra
   2c:	27bd0028 	addiu	\$sp,\$sp,40
+	...
diff --git a/gas/testsuite/gas/mips/elf_e_flags4.d b/gas/testsuite/gas/mips/elf_e_flags4.d
index 833eba0..fd34499 100644
--- a/gas/testsuite/gas/mips/elf_e_flags4.d
+++ b/gas/testsuite/gas/mips/elf_e_flags4.d
@@ -25,3 +25,4 @@ Disassembly of section .text:
   24:	00000000 	nop
   28:	03e00008 	jr	\$ra
   2c:	27bd0028 	addiu	\$sp,\$sp,40
+	...
diff --git a/gas/testsuite/gas/mips/la-svr4pic.d b/gas/testsuite/gas/mips/la-svr4pic.d
index f4933e7..886f05f 100644
--- a/gas/testsuite/gas/mips/la-svr4pic.d
+++ b/gas/testsuite/gas/mips/la-svr4pic.d
@@ -469,3 +469,4 @@ Disassembly of section .text:
 [ 	]*[0-9a-f]+: R_MIPS_LO16	.bss
 [0-9a-f]+ <[^>]*> addu	\$a0,\$a0,\$at
 [0-9a-f]+ <[^>]*> addu	\$a0,\$a0,\$a1
+	...
diff --git a/gas/testsuite/gas/mips/la-xgot.d b/gas/testsuite/gas/mips/la-xgot.d
index 8daef02..d8f51ea 100644
--- a/gas/testsuite/gas/mips/la-xgot.d
+++ b/gas/testsuite/gas/mips/la-xgot.d
@@ -613,3 +613,4 @@ Disassembly of section .text:
 [ 	]*[0-9a-f]+: R_MIPS_LO16	.bss
 [0-9a-f]+ <[^>]*> addu	\$a0,\$a0,\$at
 [0-9a-f]+ <[^>]*> addu	\$a0,\$a0,\$a1
+	...
diff --git a/gas/testsuite/gas/mips/la.s b/gas/testsuite/gas/mips/la.s
index 078c811..dd0bff6 100644
--- a/gas/testsuite/gas/mips/la.s
+++ b/gas/testsuite/gas/mips/la.s
@@ -107,8 +107,5 @@ data_label:
 	la	$4,big_local_common+0x1a5a5($5)
 	la	$4,small_local_common+0x1a5a5($5)
 
-	.ifndef	KPIC
-# Round to a 16 byte boundary, for ease in testing multiple targets.
-	nop
-	nop
-	.endif
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.space  8
diff --git a/gas/testsuite/gas/mips/sync.d b/gas/testsuite/gas/mips/sync.d
index 0b9a187..6b70cbb 100644
--- a/gas/testsuite/gas/mips/sync.d
+++ b/gas/testsuite/gas/mips/sync.d
@@ -8,3 +8,4 @@ Disassembly of section \.text:
 0+0000 <foo> 0000000f[ 	]*sync
 0+0004 <foo\+0x4> 0000040f[ 	]*sync.p
 0+0008 <foo\+0x8> 0000000f[ 	]*sync
+	...
diff --git a/gas/testsuite/gas/mips/sync.s b/gas/testsuite/gas/mips/sync.s
index dec0ed3..fdaa955 100644
--- a/gas/testsuite/gas/mips/sync.s
+++ b/gas/testsuite/gas/mips/sync.s
@@ -3,3 +3,6 @@ foo:
 	sync
 	sync.p
 	sync.l
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.space  8