gas/testsuite/

	* gas/mips/mips16-dwarf2-n32.d: Expect odd addresses.

ld/testsuite/
	* ld-mips-elf/eh-frame1-n32.d: Change "the section \.eh_frame"
	to "the \.eh_frame section".
	* ld-mips-elf/eh-frame1-n64.d: Likewise.
	* ld-mips-elf/eh-frame2-n32.d: Likewise.
	* ld-mips-elf/eh-frame2-n64.d: Likewise.
	* ld-mips-elf/eh-frame3.d: Likewise.
	* ld-mips-elf/eh-frame4.d: Likewise.
	* ld-mips-elf/elf-rel-got-n32.d: Expect bals.
	* ld-mips-elf/elf-rel-xgot-n32.d: Likewise.
	* ld-mips-elf/mips-elf.exp: Force the MIPS16 PIC tests to use -mips1.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7e4052b..3d737c2 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * gas/mips/mips16-dwarf2-n32.d: Expect odd addresses.
+
 2009-09-11  Hans-Peter Nilsson  <hp@bitrange.com>
 
        PR gas/10623

diff --git a/gas/testsuite/gas/mips/mips16-dwarf2-n32.d b/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
index e95325d..4e033e5 100644 (file)
--- a/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
+++ b/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
@@ -16,15 +16,15 @@ Relocation section '\.rela\.debug_line' at offset .* contains 1 entries:
 
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
+  Extended opcode 2: set Address to 0x1
   Copy
-  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 2
-  Special opcode .*: advance Address by 2 to 0x4 and Line by 1 to 3
-  Special opcode .*: advance Address by 4 to 0x8 and Line by 1 to 4
-  Special opcode .*: advance Address by 2 to 0xa and Line by 1 to 5
-  Special opcode .*: advance Address by 4 to 0xe and Line by 1 to 6
-  Special opcode .*: advance Address by 4 to 0x12 and Line by 1 to 7
-  Advance PC by 2286 to 0x900
-  Special opcode .*: advance Address by 0 to 0x900 and Line by 1 to 8
-  Advance PC by 15 to 0x90f
+  Special opcode .*: advance Address by 2 to 0x3 and Line by 1 to 2
+  Special opcode .*: advance Address by 2 to 0x5 and Line by 1 to 3
+  Special opcode .*: advance Address by 4 to 0x9 and Line by 1 to 4
+  Special opcode .*: advance Address by 2 to 0xb and Line by 1 to 5
+  Special opcode .*: advance Address by 4 to 0xf and Line by 1 to 6
+  Special opcode .*: advance Address by 4 to 0x13 and Line by 1 to 7
+  Advance PC by 2286 to 0x901
+  Special opcode .*: advance Address by 0 to 0x901 and Line by 1 to 8
+  Advance PC by 15 to 0x910
   Extended opcode 1: End of Sequence

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 72615c1..313c91c 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * ld-mips-elf/eh-frame1-n32.d: Change "the section \.eh_frame"
+       to "the \.eh_frame section".
+       * ld-mips-elf/eh-frame1-n64.d: Likewise.
+       * ld-mips-elf/eh-frame2-n32.d: Likewise.
+       * ld-mips-elf/eh-frame2-n64.d: Likewise.
+       * ld-mips-elf/eh-frame3.d: Likewise.
+       * ld-mips-elf/eh-frame4.d: Likewise.
+       * ld-mips-elf/elf-rel-got-n32.d: Expect bals.
+       * ld-mips-elf/elf-rel-xgot-n32.d: Likewise.
+       * ld-mips-elf/mips-elf.exp: Force the MIPS16 PIC tests to use -mips1.
+
 2009-09-11  Jie Zhang  <jie.zhang@analog.com>
 
        * ld-elf/warn2.d: `Foo' appears in section 3 when target

diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
index 6adb355..e718379 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
@@ -17,7 +17,7 @@ Relocation section '\.rel\.dyn' .*:
 0003008b  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 000300d0  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 0003010e  [0-9a-f]+ R_MIPS_REL32      00000000   foo
-Contents of the section \.eh_frame:
+Contents of the \.eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1

diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
index 1512b4a..2913106 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
@@ -33,7 +33,7 @@ Relocation section '\.rel\.dyn' .*:
 000000030192  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-Contents of the section \.eh_frame:
+Contents of the \.eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1

diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
index d831d26..e029420 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
@@ -17,7 +17,7 @@ Relocation section '\.rel\.dyn' .*:
 0003008b  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 000300cc  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 0003010a  [0-9a-f]+ R_MIPS_REL32      00000000   foo
-Contents of the section \.eh_frame:
+Contents of the \.eh_frame section:
 
 00000000 00000010 00000000 CIE
   Version:               1

diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
index 8e741f3..a03476e 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
@@ -33,7 +33,7 @@ Relocation section '\.rel\.dyn' .*:
 00000003018a  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-Contents of the section \.eh_frame:
+Contents of the \.eh_frame section:
 
 00000000 00000014 00000000 CIE
   Version:               1

diff --git a/ld/testsuite/ld-mips-elf/eh-frame3.d b/ld/testsuite/ld-mips-elf/eh-frame3.d
index 80f13d9..0328eb8 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame3.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame3.d
@@ -9,7 +9,7 @@
 # combination of 32-bit objects and 64-bit FDE addresses.
 #
 
-Contents of the section \.eh_frame:
+Contents of the \.eh_frame section:
 
 00000000 0000000c 00000000 CIE
   Version:               1

diff --git a/ld/testsuite/ld-mips-elf/eh-frame4.d b/ld/testsuite/ld-mips-elf/eh-frame4.d
index c4b7e5c..effb457 100644 (file)
--- a/ld/testsuite/ld-mips-elf/eh-frame4.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame4.d
@@ -8,7 +8,7 @@
 # This test is for the semi-official ILP32 variation of EABI64.
 #
 
-Contents of the section \.eh_frame:
+Contents of the \.eh_frame section:
 
 00000000 0000000c 00000000 CIE
   Version:               1

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
index d1619d5..09332f3 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
@@ -127,10 +127,10 @@ Disassembly of section \.text:
 10000260:      8f99805c        lw      t9,-32676\(gp\)
 10000264:      8f998030        lw      t9,-32720\(gp\)
 10000268:      8f99805c        lw      t9,-32676\(gp\)
-1000026c:      0320f809        jalr    t9
+1000026c:      0411ff90        bal     100000b0 <fn>
 10000270:      00000000        nop
 10000274:      8f998030        lw      t9,-32720\(gp\)
-10000278:      0320f809        jalr    t9
+10000278:      0411ff8d        bal     100000b0 <fn>
 1000027c:      00000000        nop
 10000280:      8f858068        lw      a1,-32664\(gp\)
 10000284:      8f858068        lw      a1,-32664\(gp\)
@@ -243,10 +243,10 @@ Disassembly of section \.text:
 10000430:      8f998060        lw      t9,-32672\(gp\)
 10000434:      8f998048        lw      t9,-32696\(gp\)
 10000438:      8f998060        lw      t9,-32672\(gp\)
-1000043c:      0320f809        jalr    t9
+1000043c:      0411001d        bal     100004b4 <fn2>
 10000440:      00000000        nop
 10000444:      8f998048        lw      t9,-32696\(gp\)
-10000448:      0320f809        jalr    t9
+10000448:      0411001a        bal     100004b4 <fn2>
 1000044c:      00000000        nop
 10000450:      1000ff17        b       100000b0 <fn>
 10000454:      8f858064        lw      a1,-32668\(gp\)

diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
index 097ec33..ce17a5f 100644 (file)
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
@@ -183,11 +183,11 @@ Disassembly of section \.text:
 10000340:      3c190000        lui     t9,0x0
 10000344:      033cc821        addu    t9,t9,gp
 10000348:      8f39802c        lw      t9,-32724\(t9\)
-1000034c:      0320f809        jalr    t9
+1000034c:      0411ff58        bal     100000b0 <fn>
 10000350:      00000000        nop
 10000354:      8f998020        lw      t9,-32736\(gp\)
 10000358:      273900b0        addiu   t9,t9,176
-1000035c:      0320f809        jalr    t9
+1000035c:      0411ff54        bal     100000b0 <fn>
 10000360:      00000000        nop
 10000364:      3c050000        lui     a1,0x0
 10000368:      00bc2821        addu    a1,a1,gp
@@ -356,11 +356,11 @@ Disassembly of section \.text:
 100005f4:      3c190000        lui     t9,0x0
 100005f8:      033cc821        addu    t9,t9,gp
 100005fc:      8f398030        lw      t9,-32720\(t9\)
-10000600:      0320f809        jalr    t9
+10000600:      0411002b        bal     100006b0 <fn2>
 10000604:      00000000        nop
 10000608:      8f998020        lw      t9,-32736\(gp\)
 1000060c:      273906b0        addiu   t9,t9,1712
-10000610:      0320f809        jalr    t9
+10000610:      04110027        bal     100006b0 <fn2>
 10000614:      00000000        nop
 10000618:      3c050000        lui     a1,0x0
 1000061c:      00bc2821        addu    a1,a1,gp

diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 45b9b96..bd06d20 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -61,18 +61,21 @@ if { $linux_gnu } {
     run_ld_link_tests [list \
        [list "Dummy shared library for MIPS16 PIC test 1" \
              "-shared -melf32btsmip" \
-             "-EB -32" { mips16-pic-1-dummy.s } \
+             "-EB -32 -mips1" \
+             { mips16-pic-1-dummy.s } \
              {} \
              "mips16-pic-1-dummy.so"] \
        [list "MIPS16 PIC test 1" \
              "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-1-dummy.so" \
-             "-EB -32 -I $srcdir/$subdir" { mips16-pic-1a.s mips16-pic-1b.s } \
+             "-EB -32 -mips1 -I $srcdir/$subdir" \
+             { mips16-pic-1a.s mips16-pic-1b.s } \
              { { objdump { -dr -j.text } mips16-pic-1.dd }
                { readelf -A mips16-pic-1.gd } } \
              "mips16-pic-1"] \
        [list "MIPS16 PIC test 2" \
              "-melf32btsmip -T mips16-pic-1.ld -shared" \
-             "-EB -32 -I $srcdir/$subdir" { mips16-pic-2a.s mips16-pic-2b.s } \
+             "-EB -32 -mips1 -I $srcdir/$subdir" \
+             { mips16-pic-2a.s mips16-pic-2b.s } \
              { { objdump { -dr -j.text } mips16-pic-2.dd } \
                { readelf -A mips16-pic-2.gd } \
                { readelf --symbols mips16-pic-2.nd } \
@@ -81,21 +84,24 @@ if { $linux_gnu } {
             "mips16-pic-2"] \
        [list "MIPS16 PIC test 3" \
              "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-1-dummy.so" \
-             "-EB -32 -I $srcdir/$subdir" { mips16-pic-3a.s mips16-pic-3b.s } \
+             "-EB -32 -mips1 -I $srcdir/$subdir" \
+             { mips16-pic-3a.s mips16-pic-3b.s } \
              { { objdump -dr mips16-pic-3.dd } \
                { readelf --relocs mips16-pic-3.rd } \
                { readelf -A mips16-pic-3.gd } } \
              "mips16-pic-3"] \
        [list "MIPS16 PIC test 4 (shared library)" \
              "-shared -melf32btsmip -T mips16-pic-1.ld --version-script mips16-pic-4.ver" \
-             "-EB -32" { mips16-pic-4a.s mips16-pic-4b.s } \
+             "-EB -32 -mips1" \
+             { mips16-pic-4a.s mips16-pic-4b.s } \
              { { objdump -dr mips16-pic-4a.dd } \
                { readelf --symbols mips16-pic-4a.nd } \
                { readelf -A mips16-pic-4a.gd } } \
              "mips16-pic-4.so"] \
        [list "MIPS16 PIC test 4 (executable)" \
              "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-4.so" \
-             "-EB -32" { mips16-pic-4c.s } \
+             "-EB -32 -mips1" \
+             { mips16-pic-4c.s } \
              { { objdump -dr mips16-pic-4b.dd } } \
              "mips16-pic-4"]]
 }