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 c18aacaf8bc2836b263d7133098c63bd0c5f5fbf..872b750d941f9151fdf8e2e8d1a2b26d5756289f 100644 (file)
--- 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 9fa4ccee18a82f28d959ab2cb2eb51513f448063..59d68807f1d603115651ec54b26a6edeb4300c81 100644 (file)
--- 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 995fd1de31dd848a6279641d64b1096a24e82534..eeddf35fbc757adc84cf4d630460c5e3045dbf81 100644 (file)
--- 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 3fb500389f4d2bb982451d08b538262e244214b8..6e98082c968c2d4452aa66a6d09c023328d3dd37 100644 (file)
--- 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"