diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/testsuite/config/default.exp | 11 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/merge.d | 3 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/mips-elf-flags.exp | 65 |
4 files changed, 61 insertions, 28 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 0e79c0f79c..d9df8f4ebb 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2003-05-06 Alexandre Oliva <aoliva@redhat.com> + + * config/default.exp (gcc_gas_flags): Force ABI to n32 on + mips64-linux. + * ld-elf/merge.d: Xfail on mips64*-linux-gnu*. + * ld-mips-elf/mips-elf-flags.exp (ldemul): Set to o32-compatible + on mips-sgi-irix6*, mips64-linux-gnu and mips64el-linux-gnu. + (good_combination, bad_combination): Use it. + Add -32 or -mabi=o64 wherever the ABI was formerly implied. + 2003-05-06 H.J. Lu <hjl@gnu.org> * ld-elfvers/vers.exp (objdump_versionstuff): Support comment diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp index 7892951bc8..432a1a8d0a 100644 --- a/ld/testsuite/config/default.exp +++ b/ld/testsuite/config/default.exp @@ -60,6 +60,17 @@ if {![file isdirectory tmpdir/gas]} then { } set gcc_gas_flag "-B[pwd]/tmpdir/gas/" +# The mips64-*-linux-gnu compiler defaults to the N32 ABI after +# installed, but to the O32 ABI in the build tree, because of some +# specs-file hacks. Make sure we use an ABI that is compatible with +# the one we expect. +if {[istarget mips64*-*-linux*] && + (![board_info [target_info name] exists multilib_flags] || + ![string match "*-mabi" [board_info [target_info name] multilib_flags]]) + } { + append gcc_gas_flag " -mabi=n32" +} + # load the utility procedures load_lib ld-lib.exp diff --git a/ld/testsuite/ld-elf/merge.d b/ld/testsuite/ld-elf/merge.d index 6331927838..4038cc81a8 100644 --- a/ld/testsuite/ld-elf/merge.d +++ b/ld/testsuite/ld-elf/merge.d @@ -3,7 +3,8 @@ #objdump: -s #xfail: "arc-*-*" "avr-*-*" "cris-*-*" "dlx-*-*" "fr30-*-*" "frv-*-*" #xfail: "hppa*-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*" "mcore-*-*" -#xfail: "mn10*-*-*" "openrisc-*-*" "pj-*-*" "sparc*-*-*" "xtensa-*-*" +#xfail: "mn10*-*-*" "mips64*-*-linux*" "openrisc-*-*" "pj-*-*" "sparc*-*-*" +#xfail: "xtensa-*-*" .*: file format .*elf.* diff --git a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp index 81d94f4ce7..e512eeddb8 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp @@ -18,6 +18,17 @@ if {![istarget mips*-*-*] || ![is_elf_format]} { return } +global ldemul +if {[istarget mips*-*-irix6*]} { + set ldemul "-melf32bmip" +} elseif {[istarget mips*el-*-linux*]} { + set ldemul "-melf32ltsmip" +} elseif {[istarget mips*-*-linux*]} { + set ldemul "-melf32btsmip" +} else { + set ldemul "" +} + # Assemble jr.s using each of the argument lists in ARGLIST. Return the # list of object files on success and an empty list on failure. proc assemble_for_flags {arglist} { @@ -41,7 +52,7 @@ proc assemble_for_flags {arglist} { # the objects can be linked together and that the readelf output # includes each flag named in FLAGS. proc good_combination {arglist flags} { - global ld READELF + global ld ldemul READELF set finalobj "tmpdir/mips-flags.o" set testname "MIPS compatible objects: $arglist" @@ -49,7 +60,7 @@ proc good_combination {arglist flags} { if {$objs == ""} { unresolved $testname - } elseif {![ld_simple_link $ld $finalobj "-r $objs"]} { + } elseif {![ld_simple_link "$ld $ldemul" $finalobj "-r $objs"]} { fail $testname } else { catch "exec $READELF --headers $finalobj" output @@ -80,7 +91,7 @@ proc good_combination {arglist flags} { # Like good_combination, but check that the objects can't be linked # together successfully and that the output includes MESSAGE. proc bad_combination {arglist message} { - global link_output ld + global link_output ld ldemul set finalobj "tmpdir/mips-flags.o" set testname "MIPS incompatible objects: $arglist" @@ -88,7 +99,7 @@ proc bad_combination {arglist message} { if {$objs == ""} { unresolved $testname - } elseif {[ld_simple_link $ld $finalobj "-r $objs"] + } elseif {[ld_simple_link "$ld $ldemul" $finalobj "-r $objs"] || [string first $message $link_output] < 0} { fail $testname } else { @@ -116,31 +127,31 @@ proc regsize_conflict {arglist} { abi_conflict { "-mabi=eabi -mgp32" "-mips4 -mabi=32" } EABI32 O32 abi_conflict { "-mips4 -mabi=o64" "-mips3 -mabi=eabi" } O64 EABI64 -isa_conflict { "-march=vr5500" "-march=sb1" } 5500 sb1 -isa_conflict { "-march=vr5400" "-march=4120" } 5400 4120 -isa_conflict { "-march=r3900" "-march=r6000" } 3900 6000 -isa_conflict { "-march=r4010" "-march=r4650" } 4010 4650 -isa_conflict { "-mips3 -mgp32" "-mips32" } 4000 isa32 -isa_conflict { "-march=sb1 -mgp32" "-mips32r2" } sb1 isa32r2 +isa_conflict { "-march=vr5500 -32" "-march=sb1 -32" } 5500 sb1 +isa_conflict { "-march=vr5400 -32" "-march=4120 -32" } 5400 4120 +isa_conflict { "-march=r3900 -32" "-march=r6000 -32" } 3900 6000 +isa_conflict { "-march=r4010 -32" "-march=r4650 -32" } 4010 4650 +isa_conflict { "-mips3 -mgp32 -32" "-mips32 -32" } 4000 isa32 +isa_conflict { "-march=sb1 -mgp32 -32" "-mips32r2 -32" } sb1 isa32r2 -regsize_conflict { "-mips4 -mgp64" "-mips2" } +regsize_conflict { "-mips4 -mgp64 -mabi=o64" "-mips2 -32" } regsize_conflict { "-mips4 -mabi=o64" "-mips4 -mabi=32" } regsize_conflict { "-mips4 -mabi=eabi -mgp32" "-mips4 -mabi=eabi -mgp64" } -regsize_conflict { "-march=vr5000 -mgp64" "-march=vr5000 -mgp32" } -regsize_conflict { "-mips32" "-mips64" } -regsize_conflict { "-mips32r2" "-mips64" } - -good_combination { "-mips4 -mgp32" "-mips2" } { mips4 32bitmode } -good_combination { "-mips4 -mabi=32" "-mips2" } { mips4 o32 } -good_combination { "-mips2" "-mips4 -mabi=32" } { mips4 o32 } -good_combination { "-mips2" "-mips4 -mabi=eabi -mgp32" } { mips4 eabi32 } -good_combination { "-mips2" "-mips32" "-mips32r2" } { mips32r2 } -good_combination { "-mips1" "-mips32r2" "-mips32" } { mips32r2 } - -good_combination { "-march=vr4100" "-march=vr4120" } { 4120 } -good_combination { "-march=vr5400" "-march=vr5500" "-mips4" } { 5500 } -good_combination { "-mips3" "-mips4" "-march=sb1" "-mips5" } { sb1 } -good_combination { "-mips1" "-march=3900" } { 3900 } +regsize_conflict { "-march=vr5000 -mgp64 -mabi=o64" "-march=vr5000 -mgp32 -32" } +regsize_conflict { "-mips32 -32" "-mips64 -mabi=o64" } +regsize_conflict { "-mips32r2 -32" "-mips64 -mabi=o64" } + +good_combination { "-mips4 -mgp32 -32" "-mips2 -32" } { mips4 o32 } +good_combination { "-mips4 -mabi=32" "-mips2 -32" } { mips4 o32 } +good_combination { "-mips2 -32" "-mips4 -mabi=32" } { mips4 o32 } +good_combination { "-mips2 -mabi=eabi" "-mips4 -mabi=eabi -mgp32" } { mips4 eabi32 } +good_combination { "-mips2 -32" "-mips32 -32" "-mips32r2 -32" } { mips32r2 } +good_combination { "-mips1 -32" "-mips32r2 -32" "-mips32 -32" } { mips32r2 } + +good_combination { "-march=vr4100 -32" "-march=vr4120 -32" } { 4120 } +good_combination { "-march=vr5400 -32" "-march=vr5500 -32" "-mips4 -32" } { 5500 } +good_combination { "-mips3 -32" "-mips4 -32" "-march=sb1 -32" "-mips5 -32" } { sb1 } +good_combination { "-mips1 -32" "-march=3900 -32" } { 3900 } good_combination { "-march=vr4120 -mabi=32" "-mips3 -mabi=32" } { 4120 o32 } -good_combination { "-march=sb1 -mgp32" "-march=4000 -mgp32" } { sb1 32bitmode } +good_combination { "-march=sb1 -mgp32 -32" "-march=4000 -mgp32 -32" } { sb1 o32 } |
