From c1a5464809157389427af984ef5d7983500195f0 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 29 Aug 2023 16:12:12 +0100 Subject: [PATCH] Revert "MIPS: Use 64-bit a ABI by default for `mipsisa64*-*-linux*' targets" This reverts commit 025e84f93566c8ced594ef48ddee1dec7e5b4cdd. It was applied unapproved. --- bfd/config.bfd | 8 ++++---- gas/configure | 6 +++--- gas/configure.ac | 6 +++--- gold/configure.tgt | 4 ++-- ld/configure.tgt | 10 ++++------ 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/bfd/config.bfd b/bfd/config.bfd index 55fd02e787c..08129e6a8cb 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -956,21 +956,21 @@ case "${targ}" in targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; - mips64*el-*-linux*-gnuabi64 | mipsisa64*el-*-linux*-gnuabi64) + mips64*el-*-linux*-gnuabi64) targ_defvec=mips_elf64_trad_le_vec targ_selvecs="mips_elf64_trad_be_vec mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec" want64=true ;; - mips64*el-*-linux* | mipsisa64*el-*-linux*) + mips64*el-*-linux*) targ_defvec=mips_elf32_ntrad_le_vec targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec" ;; - mips64*-*-linux*-gnuabi64 | mipsisa64*-*-linux*-gnuabi64) + mips64*-*-linux*-gnuabi64) targ_defvec=mips_elf64_trad_be_vec targ_selvecs="mips_elf64_trad_le_vec mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec" want64=true ;; - mips64*-*-linux* | mipsisa64*-*-linux*) + mips64*-*-linux*) targ_defvec=mips_elf32_ntrad_be_vec targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" ;; diff --git a/gas/configure b/gas/configure index 1827e38690e..3c80fe5741a 100755 --- a/gas/configure +++ b/gas/configure @@ -12256,11 +12256,11 @@ _ACEOF esac # Decide which ABI to target by default. case ${target} in - mips64*-openbsd* | mips64*-linux-gnuabi64 | mipsisa64*-linux-gnuabi64) + mips64*-openbsd* | mips64*-linux-gnuabi64) mips_default_abi=N64_ABI ;; - mips64*-linux* | mipsisa64*-linux* | mips-sgi-irix6* \ - | mips64*-freebsd* | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) + mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ + | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) mips_default_abi=N32_ABI ;; mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu) diff --git a/gas/configure.ac b/gas/configure.ac index ecfab6bf510..3a04c39d344 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -394,11 +394,11 @@ changequote([,])dnl esac # Decide which ABI to target by default. case ${target} in - mips64*-openbsd* | mips64*-linux-gnuabi64 | mipsisa64*-linux-gnuabi64) + mips64*-openbsd* | mips64*-linux-gnuabi64) mips_default_abi=N64_ABI ;; - mips64*-linux* | mipsisa64*-linux* | mips-sgi-irix6* \ - | mips64*-freebsd* | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) + mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ + | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) mips_default_abi=N32_ABI ;; mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu) diff --git a/gold/configure.tgt b/gold/configure.tgt index 99a5fcc91ee..e2e131bbd84 100644 --- a/gold/configure.tgt +++ b/gold/configure.tgt @@ -153,7 +153,7 @@ aarch64*-*) targ_big_endian=false targ_extra_big_endian=true ;; -mips64*el-*-* | mipsisa64*el-linux*) +mips64*el-*-*) targ_obj=mips targ_machine=EM_MIPS targ_size=64 @@ -169,7 +169,7 @@ mips*el-*-*) targ_big_endian=false targ_extra_big_endian=true ;; -mips64*-*-* | mipsisa64*-linux*) +mips64*-*-*) targ_obj=mips targ_machine=EM_MIPS targ_size=64 diff --git a/ld/configure.tgt b/ld/configure.tgt index 34d20e05bc9..ff0aaaae257 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -586,23 +586,21 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks ;; mips*-*-windiss) targ_emul=elf32mipswindiss ;; -mips64*el-*-linux-gnuabi64 | mipsisa64*el-*-linux-gnuabi64) +mips64*el-*-linux-gnuabi64) targ_emul=elf64ltsmip targ_extra_emuls="elf64btsmip elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip" targ_extra_libpath=$targ_extra_emuls ;; -mips64*el-*-linux-* | mipsisa64*el-*-linux-*) - targ_emul=elf32ltsmipn32 +mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" targ_extra_libpath=$targ_extra_emuls ;; -mips64*-*-linux-gnuabi64 | mipsisa64*-*-linux-gnuabi64) +mips64*-*-linux-gnuabi64) targ_emul=elf64btsmip targ_extra_emuls="elf64ltsmip elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip" targ_extra_libpath=$targ_extra_emuls ;; -mips64*-*-linux-* | mipsisa64*-*-linux-*) - targ_emul=elf32btsmipn32 +mips64*-*-linux-*) targ_emul=elf32btsmipn32 targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" targ_extra_libpath=$targ_extra_emuls ;; -- 2.30.2