* gas/mips/jal-svr4pic.d: Also use wildcard address matching in

	relocations.
	* gas/mips/mips1@jal-svr4pic.d: Likewise.
	* gas/mips/jal-svr4pic-noreorder.d: Likewise.
	* gas/mips/mips1@jal-svr4pic-noreorder.d: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 9371627..8fff99d 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-09  Maciej W. Rozycki  <macro@codesourcery.com>
 
+       * gas/mips/jal-svr4pic.d: Also use wildcard address matching in
+       relocations.
+       * gas/mips/mips1@jal-svr4pic.d: Likewise.
+       * gas/mips/jal-svr4pic-noreorder.d: Likewise.
+       * gas/mips/mips1@jal-svr4pic-noreorder.d: Likewise.
+
+2010-12-09  Maciej W. Rozycki  <macro@codesourcery.com>
+
        * gas/mips/ldstla-32.d: Update according to a 16-bit constant
        offset optimization.
        * gas/mips/ldstla-32-mips3.d: Likewise.

diff --git a/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d b/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
index 26a4cc1..ba65781 100644 (file)
--- a/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
+++ b/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000     lui     gp,0x0
-[      ]*0: R_MIPS_HI16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_HI16        _gp_disp
 [0-9a-f]+ <[^>]*> 279c0000     addiu   gp,gp,0
-[      ]*4: R_MIPS_LO16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_LO16        _gp_disp
 [0-9a-f]+ <[^>]*> 0399e021     addu    gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000     sw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
@@ -21,23 +21,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*28: R_MIPS_GOT16      .text
+[      ]*[0-9a-f]+: R_MIPS_GOT16       .text
 [0-9a-f]+ <[^>]*> 27390000     addiu   t9,t9,0
-[      ]*2c: R_MIPS_LO16       .text
+[      ]*[0-9a-f]+: R_MIPS_LO16        .text
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*30: R_MIPS_JALR       text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*3c: R_MIPS_CALL16     weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      weak_text_label
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*40: R_MIPS_JALR       weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        weak_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*4c: R_MIPS_CALL16     external_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      external_text_label
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*50: R_MIPS_JALR       external_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        external_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 1000ffe8     b       0+0000 <text_label>

diff --git a/gas/testsuite/gas/mips/jal-svr4pic.d b/gas/testsuite/gas/mips/jal-svr4pic.d
index dceba1e..4b8c988 100644 (file)
--- a/gas/testsuite/gas/mips/jal-svr4pic.d
+++ b/gas/testsuite/gas/mips/jal-svr4pic.d
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000     lui     gp,0x0
-[      ]*0: R_MIPS_HI16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_HI16        _gp_disp
 [0-9a-f]+ <[^>]*> 279c0000     addiu   gp,gp,0
-[      ]*4: R_MIPS_LO16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_LO16        _gp_disp
 [0-9a-f]+ <[^>]*> 0399e021     addu    gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000     sw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
@@ -20,23 +20,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*24: R_MIPS_GOT16      .text
+[      ]*[0-9a-f]+: R_MIPS_GOT16       .text
 [0-9a-f]+ <[^>]*> 27390000     addiu   t9,t9,0
-[      ]*28: R_MIPS_LO16       .text
+[      ]*[0-9a-f]+: R_MIPS_LO16        .text
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*2c: R_MIPS_JALR       text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*38: R_MIPS_CALL16     weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      weak_text_label
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*3c: R_MIPS_JALR       weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        weak_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*48: R_MIPS_CALL16     external_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      external_text_label
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*4c: R_MIPS_JALR       external_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        external_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 1000ffea     b       0+0000 <text_label>
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)

diff --git a/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d b/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
index 4ac9467..253cb86 100644 (file)
--- a/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
+++ b/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000     lui     gp,0x0
-[      ]*0: R_MIPS_HI16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_HI16        _gp_disp
 [0-9a-f]+ <[^>]*> 279c0000     addiu   gp,gp,0
-[      ]*4: R_MIPS_LO16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_LO16        _gp_disp
 [0-9a-f]+ <[^>]*> 0399e021     addu    gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000     sw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
@@ -21,26 +21,26 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*28: R_MIPS_GOT16      .text
+[      ]*[0-9a-f]+: R_MIPS_GOT16       .text
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 27390000     addiu   t9,t9,0
-[      ]*30: R_MIPS_LO16       .text
+[      ]*[0-9a-f]+: R_MIPS_LO16        .text
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*34: R_MIPS_JALR       text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*40: R_MIPS_CALL16     weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      weak_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*48: R_MIPS_JALR       weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        weak_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*54: R_MIPS_CALL16     external_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      external_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*5c: R_MIPS_JALR       external_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        external_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 1000ffe5     b       0+0000 <text_label>

diff --git a/gas/testsuite/gas/mips/mips1@jal-svr4pic.d b/gas/testsuite/gas/mips/mips1@jal-svr4pic.d
index 19f37eb..43067c8 100644 (file)
--- a/gas/testsuite/gas/mips/mips1@jal-svr4pic.d
+++ b/gas/testsuite/gas/mips/mips1@jal-svr4pic.d
@@ -9,9 +9,9 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 3c1c0000     lui     gp,0x0
-[      ]*0: R_MIPS_HI16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_HI16        _gp_disp
 [0-9a-f]+ <[^>]*> 279c0000     addiu   gp,gp,0
-[      ]*4: R_MIPS_LO16        _gp_disp
+[      ]*[0-9a-f]+: R_MIPS_LO16        _gp_disp
 [0-9a-f]+ <[^>]*> 0399e021     addu    gp,gp,t9
 [0-9a-f]+ <[^>]*> afbc0000     sw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
@@ -22,28 +22,28 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*2c: R_MIPS_GOT16      .text
+[      ]*[0-9a-f]+: R_MIPS_GOT16       .text
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 27390000     addiu   t9,t9,0
-[      ]*34: R_MIPS_LO16       .text
+[      ]*[0-9a-f]+: R_MIPS_LO16        .text
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*38: R_MIPS_JALR       text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*48: R_MIPS_CALL16     weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      weak_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*50: R_MIPS_JALR       weak_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        weak_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8f990000     lw      t9,0\(gp\)
-[      ]*60: R_MIPS_CALL16     external_text_label
+[      ]*[0-9a-f]+: R_MIPS_CALL16      external_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 0320f809     jalr    t9
-[      ]*68: R_MIPS_JALR       external_text_label
+[      ]*[0-9a-f]+: R_MIPS_JALR        external_text_label
 [0-9a-f]+ <[^>]*> 00000000     nop
 [0-9a-f]+ <[^>]*> 8fbc0000     lw      gp,0\(sp\)
 [0-9a-f]+ <[^>]*> 1000ffe2     b       0+0000 <text_label>