gas/testsuite/

	* gas/mips/mips.exp: Set has_newabi for mips*-sde-elf* too.
	* gas/mips/elf-rel-got-n32.s: Adjust padding.
	* gas/mips/elf-rel-got-n64.s: Likewise.
	* gas/mips/elf-rel23.s: Likewise.
	* gas/mips/elf-rel28.s: Likewise.
	* gas/mips/n32-consec.s: Likewise.
	* gas/mips/elf-rel-xgot-n32.d: Adjust output expected.
	* gas/mips/elf-rel-xgot-n64.d: Likewise.
	* gas/mips/elf-rel23.d: Likewise.
	* gas/mips/elf-rel23a.d: Likewise.
	* gas/mips/elf-rel23b.d: Likewise.
	* gas/mips/elf-rel28-n32.d: Likewise.

	ld/testsuite/
	* lib/ld-lib.exp (run_dump_test): Implement the EXTRA_OPTIONS
	argument and the "dump" keyword.
	* ld-mips-elf/emit-relocs-1a.s: Make section alignment uniform
	across targets.
	* ld-mips-elf/emit-relocs-1b.s: Likewise.
	* ld-mips-elf/jalbal.s: Adjust padding.
	* ld-mips-elf/elf-rel-got-n32-embed.d: New test.
	* ld-mips-elf/elf-rel-got-n64-embed.d: New test.
	* ld-mips-elf/elf-rel-xgot-n32-embed.d: New test.
	* ld-mips-elf/elf-rel-xgot-n64-embed.d: New test.
	* ld-mips-elf/elf-rel-got-n32.d: Remove -melf32btsmipn32.
	* ld-mips-elf/elf-rel-got-n64.d: Remove -melf64btsmip.  Adjust
	output.
	* ld-mips-elf/elf-rel-got-n64-linux.d: Remove -melf64btsmip.
	* ld-mips-elf/elf-rel-xgot-n32.d: Remove -melf32btsmipn32.
	Adjust output.
	* ld-mips-elf/elf-rel-xgot-n64.d: Remove -melf64btsmip.  Adjust
	output.
	* ld-mips-elf/elf-rel-xgot-n64-linux.d: Likewise.
	* ld-mips-elf/reloc-1-n64.d: Remove -melf64btsmip.
	* ld-mips-elf/mips-elf.exp: Set has_newabi for mips*-sde-elf*
	too.  Move tool flags from o32_as_flags and o32_ld_flags
	variables into abi_asflags and abi_ldflags arrays.  Adjust test
	cases run to use them.  Run the new tests.

13 files changed, 50 insertions, 4 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 33ddd17..d279b2e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,20 @@
 2012-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
 
+	* gas/mips/mips.exp: Set has_newabi for mips*-sde-elf* too.
+	* gas/mips/elf-rel-got-n32.s: Adjust padding.
+	* gas/mips/elf-rel-got-n64.s: Likewise.
+	* gas/mips/elf-rel23.s: Likewise.
+	* gas/mips/elf-rel28.s: Likewise.
+	* gas/mips/n32-consec.s: Likewise.
+	* gas/mips/elf-rel-xgot-n32.d: Adjust output expected.
+	* gas/mips/elf-rel-xgot-n64.d: Likewise.
+	* gas/mips/elf-rel23.d: Likewise.
+	* gas/mips/elf-rel23a.d: Likewise.
+	* gas/mips/elf-rel23b.d: Likewise.
+	* gas/mips/elf-rel28-n32.d: Likewise.
+
+2012-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
+
 	* gas/mips/branch-swap-2.l: New list test.
 	* gas/mips/branch-swap-2.s: New test source.
 	* gas/mips/mips.exp: Run the new test.
diff --git a/gas/testsuite/gas/mips/elf-rel-got-n32.s b/gas/testsuite/gas/mips/elf-rel-got-n32.s
index 099f5a0..a03fb66 100644
--- a/gas/testsuite/gas/mips/elf-rel-got-n32.s
+++ b/gas/testsuite/gas/mips/elf-rel-got-n32.s
@@ -137,6 +137,7 @@ fn:
 	b	.Lfn2
 
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
 	.space	8
 
 	.end	fn
@@ -151,6 +152,10 @@ fn2:
 	.globl  __start
 __start:
 	
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8
+
 	.data
 	.align	2
 sp2:
diff --git a/gas/testsuite/gas/mips/elf-rel-got-n64.s b/gas/testsuite/gas/mips/elf-rel-got-n64.s
index 8b7153e..4f6afde 100644
--- a/gas/testsuite/gas/mips/elf-rel-got-n64.s
+++ b/gas/testsuite/gas/mips/elf-rel-got-n64.s
@@ -137,7 +137,8 @@ fn:
 	ld	$5,dl2+34($5)
 	b	.Lfn2
 
-# Force at least 8 (non-deddlay-slot) zero bytes, to make 'objdump' print ...
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
 	.space	8
 
 	.end	fn
@@ -151,6 +152,10 @@ fn2:
 
 	.globl  __start
 __start:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8
 	
 	.data
 	.align	3
diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
index a7039df..b40e802 100644
--- a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
@@ -577,3 +577,4 @@ Disassembly of section \.text:
 000005f0 <fn\+0x5f0> 10000003 	b	00000600 <fn2>
 000005f4 <fn\+0x5f4> 00000000 	nop
 	\.\.\.
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
index 717f8ac..fd98c9c 100644
--- a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
+++ b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
@@ -953,3 +953,4 @@ Disassembly of section \.text:
 00000000000005f0 <fn\+0x5f0> 10000003 	b	0000000000000600 <fn2>
 00000000000005f4 <fn\+0x5f4> 00000000 	nop
 	\.\.\.
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/elf-rel23.d b/gas/testsuite/gas/mips/elf-rel23.d
index 6669782..10b53ac 100644
--- a/gas/testsuite/gas/mips/elf-rel23.d
+++ b/gas/testsuite/gas/mips/elf-rel23.d
@@ -17,3 +17,4 @@ Disassembly of section \.text:
 			.*: R_MIPS_SUB	\*ABS\*
 			.*: R_MIPS_LO16	\*ABS\*
 .*:	0384e02d 	daddu	\$28,\$28,\$4
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/elf-rel23.s b/gas/testsuite/gas/mips/elf-rel23.s
index 97f9b3d..535c02a 100644
--- a/gas/testsuite/gas/mips/elf-rel23.s
+++ b/gas/testsuite/gas/mips/elf-rel23.s
@@ -4,3 +4,7 @@
 foo:
 	.cpsetup $4,$5,foo
 	.end	foo
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8
diff --git a/gas/testsuite/gas/mips/elf-rel23a.d b/gas/testsuite/gas/mips/elf-rel23a.d
index 5b252ac..fb8737b 100644
--- a/gas/testsuite/gas/mips/elf-rel23a.d
+++ b/gas/testsuite/gas/mips/elf-rel23a.d
@@ -18,3 +18,4 @@ Disassembly of section \.text:
 			.*: R_MIPS_SUB	\*ABS\*
 			.*: R_MIPS_LO16	\*ABS\*
 .*:	0384e02d 	daddu	\$28,\$28,\$4
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/elf-rel23b.d b/gas/testsuite/gas/mips/elf-rel23b.d
index 7c02f15..88c9897 100644
--- a/gas/testsuite/gas/mips/elf-rel23b.d
+++ b/gas/testsuite/gas/mips/elf-rel23b.d
@@ -13,4 +13,4 @@ Disassembly of section \.text:
 			.*: R_MIPS_HI16	__gnu_local_gp
 .*:	279c0000 	addiu	\$28,\$28,0
 			.*: R_MIPS_LO16	__gnu_local_gp
-.*:	00000000 	nop
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/elf-rel28-n32.d b/gas/testsuite/gas/mips/elf-rel28-n32.d
index 2ba2771..dbca20b 100644
--- a/gas/testsuite/gas/mips/elf-rel28-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel28-n32.d
@@ -93,4 +93,4 @@ Disassembly of section \.text:
 			.*: R_MIPS_TLS_TPREL_LO16	bar
 .*:	fc840000 	sd	a0,0\(a0\)
 			.*: R_MIPS_TLS_GOTTPREL	bar
-	...
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/elf-rel28.s b/gas/testsuite/gas/mips/elf-rel28.s
index ec4fb66..c6dcb71 100644
--- a/gas/testsuite/gas/mips/elf-rel28.s
+++ b/gas/testsuite/gas/mips/elf-rel28.s
@@ -46,3 +46,7 @@ foo:
 	sd	$4,%tprel_lo(bar)($4)
 	sd	$4,%gottprel(bar)($4)
 	.end	foo
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index cc44e62..f2b585c 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -458,7 +458,7 @@ if { [istarget mips*-*-vxworks*] } {
     set ecoff [expr [istarget *-*-ecoff*] || [istarget *-*-ultrix*] || [istarget *-*-irix\[1-4\]*] ]
     set aout [expr [istarget *-*-bsd*] || [istarget *-*-openbsd*] ]
     set addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] || [istarget mips*-*-ecoff]]
-    set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]]
+    set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*] || [istarget mips*-sde-elf*]]
     set no_mips16 [expr !$elf]
     set no_micromips [expr !$elf]
 
diff --git a/gas/testsuite/gas/mips/n32-consec.s b/gas/testsuite/gas/mips/n32-consec.s
index f9b3454..3263159 100644
--- a/gas/testsuite/gas/mips/n32-consec.s
+++ b/gas/testsuite/gas/mips/n32-consec.s
@@ -1,4 +1,13 @@
 .text
 	.long .
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8
+
 .data
 	.long .+4
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8