* gas/mips/elf-rel6.d, gas/mips/elf-rel6.s: Extend testcase.

	* gas/mips/elf-rel6.d-n32.d, gas/mips/elf-rel6-n64.d: New files.
	* gas/mips/mips.exp: Run new testcases.

6 files changed, 52 insertions, 2 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index dc51d97..c8f4a2f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,11 @@
 2006-06-14  Thiemo Seufer  <ths@mips.com>
+            Maciej W. Rozycki  <macro@mips.com>
+
+	* gas/mips/elf-rel6.d, gas/mips/elf-rel6.s: Extend testcase.
+	* gas/mips/elf-rel6.d-n32.d, gas/mips/elf-rel6-n64.d: New files.
+	* gas/mips/mips.exp: Run new testcases.
+
+2006-06-14  Thiemo Seufer  <ths@mips.com>
 
 	* gas/mips/mips16e-jrc.d, gas/mips/mips16e-save.d,
 	gas/mips/mips32-dsp.d, gas/mips/mips32-mt.d: Explicitly specify
diff --git a/gas/testsuite/gas/mips/elf-rel6-n32.d b/gas/testsuite/gas/mips/elf-rel6-n32.d
new file mode 100644
index 0000000..258fcf6
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf-rel6-n32.d
@@ -0,0 +1,16 @@
+#objdump: -dr --prefix-addresses
+#name: MIPS ELF reloc 6 n32
+#as: -mabi=n32 -march=mips64
+#source: elf-rel6.s
+
+.*: +file format elf.*mips.*
+
+Disassembly of section \.text:
+0+00 <.*> lb	v0,0\(v1\)
+			0: R_MIPS16_GPREL	bar
+0+04 <.*> lb	v0,0\(v1\)
+			4: R_MIPS16_GPREL	bar\+0x1
+0+08 <.*> lb	v0,0\(v1\)
+			8: R_MIPS16_GPREL	bar\+0x1234
+0+0c <[^>]*> nop
+0+0e <[^>]*> nop
diff --git a/gas/testsuite/gas/mips/elf-rel6-n64.d b/gas/testsuite/gas/mips/elf-rel6-n64.d
new file mode 100644
index 0000000..d65b10a
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf-rel6-n64.d
@@ -0,0 +1,22 @@
+#objdump: -dr --prefix-addresses
+#name: MIPS ELF reloc 6 n64
+#as: -mabi=64 -march=mips64
+#source: elf-rel6.s
+
+.*: +file format elf.*mips.*
+
+Disassembly of section \.text:
+0+00 <.*> lb	v0,0\(v1\)
+			0: R_MIPS16_GPREL	bar
+			0: R_MIPS_NONE	\*ABS\*
+			0: R_MIPS_NONE	\*ABS\*
+0+04 <.*> lb	v0,0\(v1\)
+			4: R_MIPS16_GPREL	bar\+0x1
+			4: R_MIPS_NONE	\*ABS\*\+0x1
+			4: R_MIPS_NONE	\*ABS\*\+0x1
+0+08 <.*> lb	v0,0\(v1\)
+			8: R_MIPS16_GPREL	bar\+0x1234
+			8: R_MIPS_NONE	\*ABS\*\+0x1234
+			8: R_MIPS_NONE	\*ABS\*\+0x1234
+0+0c <[^>]*> nop
+0+0e <[^>]*> nop
diff --git a/gas/testsuite/gas/mips/elf-rel6.d b/gas/testsuite/gas/mips/elf-rel6.d
index 85efe9d..cea8d7f 100644
--- a/gas/testsuite/gas/mips/elf-rel6.d
+++ b/gas/testsuite/gas/mips/elf-rel6.d
@@ -9,7 +9,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+08 <.*> lb	v0,4660\(v1\)
+			8: R_MIPS16_GPREL	bar
 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 6735d75..34c3a84 100644
--- a/gas/testsuite/gas/mips/elf-rel6.s
+++ b/gas/testsuite/gas/mips/elf-rel6.s
@@ -13,6 +13,7 @@ bar:	.byte	3
 f:
 	lb	$2,%gprel(bar)($3)
 	lb	$2,%gprel(bar+1)($3)
+	lb	$2,%gprel(bar+0x1234)($3)
 	.end	f
 
 # align section end to 16-byte boundary for easier testing on multiple targets
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 6141f00..538ef4d 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -651,6 +651,10 @@ if { [istarget mips*-*-vxworks*] } {
 	}
 	run_dump_test "elf-rel5"
 	run_dump_test "elf-rel6"
+	if $has_newabi {
+	    run_dump_test "elf-rel6-n32"
+	    run_dump_test "elf-rel6-n64"
+	}
 	run_dump_test "elf-rel7"
 	run_dump_test "elf-rel8"
 	run_dump_test "elf-rel9"