ld/testsuite/

	* ld-mips-elf/mips-elf.exp (mips16_call_global_test): Use the
	no-shared-1.ld linker script.
	* ld-mips-elf/mips16-call-global-1.s: Add alignment directive.
	* ld-mips-elf/mips16-call-global-2.s: Likewise.
	* ld-mips-elf/mips16-call-global-3.s: Likewise.
	* ld-mips-elf/mips16-call-global.d: Use 50000 as the base address.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 24b0c3c..c90a26e 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2012-05-13  Richard Sandiford  <rdsandiford@googlemail.com>
 
+       * ld-mips-elf/mips-elf.exp (mips16_call_global_test): Use the
+       no-shared-1.ld linker script.
+       * ld-mips-elf/mips16-call-global-1.s: Add alignment directive.
+       * ld-mips-elf/mips16-call-global-2.s: Likewise.
+       * ld-mips-elf/mips16-call-global-3.s: Likewise.
+       * ld-mips-elf/mips16-call-global.d: Use 50000 as the base address.
+
+2012-05-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
        * ld-mips-elf/attr-gnu-4-00.d: Remove assembler options and emulator
        linker option.
        * ld-mips-elf/attr-gnu-4-01.d, ld-mips-elf/attr-gnu-4-02.d,

diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index ce448cf..ffcb9c4 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -503,7 +503,7 @@ if {[istarget mips*-*-linux*]} {
 
 set mips16_call_global_test [list \
     [list "Global calls from mips16" \
-        "$o32_ld_flags" \
+        "$o32_ld_flags -T no-shared-1.ld" \
         "$o32_as_flags -mips32r2" \
         {mips16-call-global-1.s mips16-call-global-2.s mips16-call-global-3.s} \
         {{objdump -dr mips16-call-global.d}} \

diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global-1.s b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s
index 1e60bcc..4c6d0a4 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips16-call-global-1.s
+++ b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s
@@ -2,6 +2,7 @@
 
        .globl  __start
        .ent    __start
+       .align  4
 __start:
        .frame  $sp,24,$31
        save    24,$31

diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global-2.s b/ld/testsuite/ld-mips-elf/mips16-call-global-2.s
index 2843fcd..7f9bbf0 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips16-call-global-2.s
+++ b/ld/testsuite/ld-mips-elf/mips16-call-global-2.s
@@ -3,6 +3,7 @@
        .globl  x
        .ent    x
        .type   x,@function
+       .align  4
 x:
        jr      $31
        .end    x

diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global-3.s b/ld/testsuite/ld-mips-elf/mips16-call-global-3.s
index 5113c5d..1606e3c 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips16-call-global-3.s
+++ b/ld/testsuite/ld-mips-elf/mips16-call-global-3.s
@@ -3,6 +3,7 @@
        .globl  y
        .ent    y
        .type   y,@function
+       .align  4
 y:
        jr      $31
        .end    y

diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global.d b/ld/testsuite/ld-mips-elf/mips16-call-global.d
index 390d84c..573c219 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips16-call-global.d
+++ b/ld/testsuite/ld-mips-elf/mips16-call-global.d
@@ -3,37 +3,37 @@
 
 Disassembly of section .text:
 
-.*0090 <__start>:
-.*0090:        64c3            save    24,ra
-.*0092:        1a00 002e       jal     .*00b8 <x\+0x8>
-.*0096:        6500            nop
-.*0098:        1e00 0032       jalx    .*00c8 <z>
-.*009c:        6500            nop
-.*009e:        6443            restore 24,ra
-.*00a0:        e8a0            jrc     ra
-.*00a2:        6500            nop
-.*00a4:        6500            nop
-.*00a6:        6500            nop
-.*00a8:        6500            nop
-.*00aa:        6500            nop
-.*00ac:        6500            nop
-.*00ae:        6500            nop
+0*50000 <__start>:
+ *50000:       64c3            save    24,ra
+ *50002:       1820 400a       jal     50028 <x\+0x8>
+ *50006:       6500            nop
+ *50008:       1c20 400e       jalx    50038 <z>
+ *5000c:       6500            nop
+ *5000e:       6443            restore 24,ra
+ *50010:       e8a0            jrc     ra
+ *50012:       6500            nop
+ *50014:       6500            nop
+ *50016:       6500            nop
+ *50018:       6500            nop
+ *5001a:       6500            nop
+ *5001c:       6500            nop
+ *5001e:       6500            nop
 
-.*00b0 <x>:
-.*00b0:        e8a0            jrc     ra
-.*00b2:        6500            nop
-.*00b4:        6500            nop
-.*00b6:        6500            nop
-.*00b8:        6500            nop
-.*00ba:        6500            nop
-.*00bc:        6500            nop
-.*00be:        6500            nop
+0*50020 <x>:
+ *50020:       e8a0            jrc     ra
+ *50022:       6500            nop
+ *50024:       6500            nop
+ *50026:       6500            nop
+ *50028:       6500            nop
+ *5002a:       6500            nop
+ *5002c:       6500            nop
+ *5002e:       6500            nop
 
-.*00c0 <y>:
-.*00c0:        03e00008        jr      ra
-.*00c4:        00000000        nop
+0*50030 <y>:
+ *50030:       03e00008        jr      ra
+ *50034:       00000000        nop
 
-.*00c8 <z>:
-.*00c8:        03e00008        jr      ra
-.*00cc:        00000000        nop
+0*50038 <z>:
+ *50038:       03e00008        jr      ra
+ *5003c:       00000000        nop
        \.\.\.