diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/configure.tgt | 4 | ||||
| -rw-r--r-- | ld/testsuite/config/default.exp | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/ld/configure.tgt b/ld/configure.tgt index 44079ae..f937f78 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -592,7 +592,7 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks ;; mips*-*-windiss) targ_emul=elf32mipswindiss ;; -mips*64*el-*-linux-gnuabi64) +mips64*el-*-linux-gnuabi64) targ_emul=elf64ltsmip targ_extra_emuls="elf64btsmip elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip" targ_extra_libpath=$targ_extra_emuls @@ -601,7 +601,7 @@ mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" targ_extra_libpath=$targ_extra_emuls ;; -mips*64*-*-linux-gnuabi64) +mips64*-*-linux-gnuabi64) targ_emul=elf64btsmip targ_extra_emuls="elf64ltsmip elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip" targ_extra_libpath=$targ_extra_emuls diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp index d60f629..8374920 100644 --- a/ld/testsuite/config/default.exp +++ b/ld/testsuite/config/default.exp @@ -177,16 +177,11 @@ if {! [info exists env(CCC_OVERRIDE_OPTIONS)]} { # 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. -# mips*64*-*linux-gnuabi64 compiler defaults to N64 ABI. -if {([istarget mips64*-*-linux*] || [istarget mips*64*-*-linux-gnuabi64]) && +if {[istarget mips64*-*-linux*] && (![board_info [target_info name] exists multilib_flags] || ![string match "*-mabi" [board_info [target_info name] multilib_flags]]) } { - if { [istarget *-*-gnuabi64] } { - append gcc_B_opt " -mabi=64" - } else { - append gcc_B_opt " -mabi=n32" - } + append gcc_B_opt " -mabi=n32" } if { [istarget rx-*-*] } { |