aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/testsuite/ChangeLog5
-rw-r--r--gas/testsuite/gas/mips/elf-rel26.d2
-rw-r--r--gas/testsuite/gas/mips/mips16-intermix.d2
-rw-r--r--ld/testsuite/ChangeLog5
-rw-r--r--ld/testsuite/ld-mips-elf/mips-elf.exp35
5 files changed, 33 insertions, 16 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 951ecb5..5540b54 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17 Richard Sandiford <rsandifo@nildram.co.uk>
+
+ * gas/mips/elf-rel26.d: Add -32.
+ * gas/mips/mips16-intermix.d: Likewise.
+
2008-03-13 Nick Clifton <nickc@redhat.com>
PR gas/5895
diff --git a/gas/testsuite/gas/mips/elf-rel26.d b/gas/testsuite/gas/mips/elf-rel26.d
index d176acb..aeb4e16 100644
--- a/gas/testsuite/gas/mips/elf-rel26.d
+++ b/gas/testsuite/gas/mips/elf-rel26.d
@@ -1,4 +1,4 @@
-#as: -mips32 -EL -KPIC
+#as: -mips32 -32 -EL -KPIC
#readelf: --relocs
#name: MIPS ELF reloc 26
diff --git a/gas/testsuite/gas/mips/mips16-intermix.d b/gas/testsuite/gas/mips/mips16-intermix.d
index 9b541ee..e0e07c8 100644
--- a/gas/testsuite/gas/mips/mips16-intermix.d
+++ b/gas/testsuite/gas/mips/mips16-intermix.d
@@ -1,5 +1,5 @@
#objdump: -t
-#as: -mips32r2
+#as: -mips32r2 -32
#name: MIPS16 intermix
.*: +file format .*mips.*
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2f5fab8..fcd3cc9 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-17 Richard Sandiford <rsandifo@nildram.co.uk>
+
+ * ld-mips-elf/mips-elf.exp (o32_as_flags, o32_ld_flags): New variables.
+ (mips16_call_global_test, mips16_intermix_test): Use them.
+
2008-03-16 H.J. Lu <hongjiu.lu@intel.com>
PR ld/5789
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index fb32f5c..404ee2a 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -56,6 +56,13 @@ set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]]
set linux_gnu [expr [istarget mips*-*-linux*]]
set embedded_elf [expr [istarget mips*-*-elf]]
+if { [istarget mips64*-linux-gnu] } {
+ set o32_as_flags "-32 -EB"
+ set o32_ld_flags "-melf32btsmip"
+} else {
+ set o32_as_flags ""
+ set o32_ld_flags ""
+}
# Check MIPS16 markings being passed through link.
run_dump_test "mips16-1"
@@ -264,23 +271,23 @@ if {[istarget mips*-*-linux*]} {
run_ld_link_tests $mips_tls_tests
}
-set mips16_call_global_test {
- {"Global calls from mips16"
- ""
- "-mips32r2" {mips16-call-global-1.s mips16-call-global-2.s mips16-call-global-3.s}
- {{objdump -dr mips16-call-global.d}}
- "mips16-call-global"}
-}
+set mips16_call_global_test [list \
+ [list "Global calls from mips16" \
+ "$o32_ld_flags" \
+ "$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}} \
+ "mips16-call-global"]]
run_ld_link_tests $mips16_call_global_test
-set mips16_intermix_test {
- {"Intermixing mips32 and mips16 functions"
- ""
- "-mips32r2" {mips16-intermix-1.s mips16-intermix-2.s}
- {{objdump -t mips16-intermix.d}}
- "mips16-intermix"}
-}
+set mips16_intermix_test [list \
+ [list "Intermixing mips32 and mips16 functions" \
+ "$o32_ld_flags" \
+ "$o32_as_flags -mips32r2" \
+ {mips16-intermix-1.s mips16-intermix-2.s} \
+ {{objdump -t mips16-intermix.d}} \
+ "mips16-intermix"]]
run_ld_link_tests $mips16_intermix_test