From 697380b39c640912f84ebde3f2e2933d8650f8e3 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 7 May 2003 05:08:02 +0000 Subject: * 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. --- ld/testsuite/config/default.exp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'ld/testsuite/config/default.exp') diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp index 7892951..432a1a8 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 -- cgit v1.1