From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Mon, 15 Nov 2010 21:56:51 +0000 (+0000)
Subject: gas/
X-Git-Tag: binutils-2_21~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c4d7bc12c0668be802472ee4b75f7bae1e442f6;p=thirdparty%2Fbinutils-gdb.git

gas/
	* config/tc-mips.c (macro_build): Remove gas_assert from 'o' case.
	Use a restricted gas_assert for 'i' and 'j'.

gas/testsuite/
	* gas/mips/elf-rel28.s, gas/mips/elf-rel28-n32.d,
	gas/mips/elf-rel28-n64.d: New test.
	* gas/mips/mips.exp: Run it.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c18aacaf8bc..872b750d941 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-15  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (macro_build): Remove gas_assert from 'o' case.
+	Use a restricted gas_assert for 'i' and 'j'.
+
 2010-11-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/obj-elf.c (elf_process_stab): Mark parameters as
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 9fa4ccee18a..59d68807f1d 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -3765,20 +3765,16 @@ macro_build (expressionS *ep, const char *name, const char *fmt, ...)
 
 	case 'i':
 	case 'j':
-	case 'o':
 	  macro_read_relocs (&args, r);
 	  gas_assert (*r == BFD_RELOC_GPREL16
-		  || *r == BFD_RELOC_MIPS_LITERAL
-		  || *r == BFD_RELOC_MIPS_HIGHER
-		  || *r == BFD_RELOC_HI16_S
-		  || *r == BFD_RELOC_LO16
-		  || *r == BFD_RELOC_MIPS_GOT16
-		  || *r == BFD_RELOC_MIPS_CALL16
-		  || *r == BFD_RELOC_MIPS_GOT_DISP
-		  || *r == BFD_RELOC_MIPS_GOT_PAGE
-		  || *r == BFD_RELOC_MIPS_GOT_OFST
-		  || *r == BFD_RELOC_MIPS_GOT_LO16
-		  || *r == BFD_RELOC_MIPS_CALL_LO16);
+		      || *r == BFD_RELOC_MIPS_HIGHER
+		      || *r == BFD_RELOC_HI16_S
+		      || *r == BFD_RELOC_LO16
+		      || *r == BFD_RELOC_MIPS_GOT_OFST);
+	  continue;
+
+	case 'o':
+	  macro_read_relocs (&args, r);
 	  continue;
 
 	case 'u':
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 995fd1de31d..eeddf35fbc7 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/elf-rel28.s, gas/mips/elf-rel28-n32.d,
+	gas/mips/elf-rel28-n64.d: New test.
+	* gas/mips/mips.exp: Run it.
+
 2010-11-15  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
 	PR gas/12198
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 3fb500389f4..6e98082c968 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -810,6 +810,11 @@ if { [istarget mips*-*-vxworks*] } {
 
 	run_dump_test_arches "elf-rel27" [mips_arch_list_all]
 
+	if $has_newabi {
+	    run_dump_test "elf-rel28-n32"
+	    run_dump_test "elf-rel28-n64"
+	}
+
 	if { !$no_mips16 } {
 	    run_dump_test "${tmips}mips${el}16-e"
 	    run_dump_test "${tmips}mips${el}16-f"