From b6426432a043e27baec202f27c2713ad638c9938 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Sun, 3 Dec 2000 20:57:19 +0000
Subject: [PATCH] More test case alignments.

---
 gas/testsuite/ChangeLog           | 8 ++++++++
 gas/testsuite/gas/mips/empic.d    | 5 +++--
 gas/testsuite/gas/mips/empic.s    | 8 +++++++-
 gas/testsuite/gas/mips/mips16-e.d | 4 ++--
 gas/testsuite/gas/mips/mips16-e.s | 7 +++++++
 gas/testsuite/gas/mips/mips16-f.s | 7 +++++++
 6 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 84d8ec6fb8..deac159197 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -20,6 +20,14 @@
         * gas/mips/sync.d: Expect "..." at end of objdump output
         because of zero bytes at end of section.
 
+        * gas/mips/empic.d: Pad sections out to 16 bytes, to avoid
+        alignment issues so tests are useful on multiple targets.
+        * gas/mips/empic.s: Likewise.
+        * gas/mips/mips16-e.d: Likewise.
+        * gas/mips/mips16-e.s: Likewise.
+        * gas/mips/mips16-f.d: Likewise.
+        * gas/mips/mips16-f.s: Likewise.
+
 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/empic.d b/gas/testsuite/gas/mips/empic.d
index bf8c637292..b64af18193 100644
--- a/gas/testsuite/gas/mips/empic.d
+++ b/gas/testsuite/gas/mips/empic.d
@@ -124,7 +124,7 @@ Contents of section \.text:
  00c0 00000000 00000034 00000000 10000032  .*
  00d0 10000033 24030034 2403003c 000000cc  .*
  00e0 00000034 00000000 00000000 000000cc  .*
- 00f0 00000000 00000034                    .*
+ 00f0 00000000 00000034 00000000 00000000  .*
 Contents of section \.data:
 Contents of section \.reginfo:
  0000 80000008 00000000 00000000 00000000  .*
@@ -148,4 +148,5 @@ Contents of section \.foo:
  00d0 00000000 00000004 00000000 00000104  .*
  00e0 00000000 00000008 00000000 000000e8  .*
  00f0 00000000 00000100 00000000 000000fc  .*
- 0100 00000000                             .*
+ 0100 00000000 00000000 00000000 00000000  .*
+
diff --git a/gas/testsuite/gas/mips/empic.s b/gas/testsuite/gas/mips/empic.s
index 2f273df97f..5f37adff38 100644
--- a/gas/testsuite/gas/mips/empic.s
+++ b/gas/testsuite/gas/mips/empic.s
@@ -60,7 +60,10 @@ l5:
 	nop
 	.dword	2b		# R_MIPS_64	.text CC
 	.dword	2b-l5		# R_MIPS_PC64	.text 98  or 34
-	
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+	.p2align 4
+
 	.section ".foo","ax",@progbits
 	nop
 l4:	
@@ -109,3 +112,6 @@ l4:
 l1:
 
 	nop
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+	.p2align 4
diff --git a/gas/testsuite/gas/mips/mips16-e.d b/gas/testsuite/gas/mips/mips16-e.d
index 1f23f685e1..084abc6688 100644
--- a/gas/testsuite/gas/mips/mips16-e.d
+++ b/gas/testsuite/gas/mips/mips16-e.d
@@ -29,7 +29,7 @@ OFFSET           TYPE              VALUE
 
 
 Contents of section \.text:
- 0000 65006500 65006500                    .*
+ 0000 65006500 65006500 65006500 65006500  .*
 Contents of section \.data:
 Contents of section \.reginfo:
  0000 00000001 00000000 00000000 00000000  .*
@@ -38,4 +38,4 @@ Contents of section \.mdebug:
 #...
 Contents of section foo:
  0000 00000000 00000008 00000000 00000003  .*
- 0010 00000000 00000008                    .*
+ 0010 00000000 00000008 00000000 00000000  .*
diff --git a/gas/testsuite/gas/mips/mips16-e.s b/gas/testsuite/gas/mips/mips16-e.s
index b19d0200c1..b7d96ab93b 100644
--- a/gas/testsuite/gas/mips/mips16-e.s
+++ b/gas/testsuite/gas/mips/mips16-e.s
@@ -4,6 +4,10 @@
 l1:     nop
 1:      nop
         nop
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+	.p2align 4
+
         .section "foo"
         .word   l1
         .word   l1+8
@@ -11,3 +15,6 @@ l1:     nop
         .word   1b+3
 	.word	g1
 	.word	g1+8
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+	.p2align 4
diff --git a/gas/testsuite/gas/mips/mips16-f.s b/gas/testsuite/gas/mips/mips16-f.s
index 0b254bd794..80e9753bd2 100644
--- a/gas/testsuite/gas/mips/mips16-f.s
+++ b/gas/testsuite/gas/mips/mips16-f.s
@@ -2,5 +2,12 @@
         .text
         nop
 l1:     nop
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+	.p2align 4
+
         .section "foo"
         .word   l1+3
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+	.p2align 4