* [binutils-gdb] Revert "MIPS: support mips*64 as CPU and gnuabi64 as ABI"
@ 2023-07-28 5:05 Maciej W. Rozycki
0 siblings, 0 replies; only message in thread
From: Maciej W. Rozycki @ 2023-07-28 5:05 UTC (permalink / raw)
To: bfd-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cc66ad2d2a63cec2eaafd7bbc6a9204490816c0b
commit cc66ad2d2a63cec2eaafd7bbc6a9204490816c0b
Author: Maciej W. Rozycki <macro@orcam.me.uk>
Date: Fri Jul 28 06:00:36 2023 +0100
Revert "MIPS: support mips*64 as CPU and gnuabi64 as ABI"
This reverts commit 32f1c80375ebe8ad25d9805ee5889f0006c51e59. It had
two unrelated changes lumped together, one of which changed the meaning
of the `mipsisa64*-*-linux*' target triplets, which was not properly
evaluated.
Diff:
---
bfd/config.bfd | 14 ++------------
binutils/testsuite/binutils-all/mips/mips-note-2-n32.d | 1 -
gas/configure | 5 +----
gas/configure.ac | 5 +----
gold/configure.tgt | 14 --------------
ld/configure.tgt | 12 ++----------
6 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 81ddbcd09c9..54a30ef901f 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -941,21 +941,11 @@ 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"
;;
- mips*64*el-*-linux*-gnuabi64)
- targ_defvec=mips_elf64_trad_le_vec
- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec"
- want64=true
- ;;
- mips*64*-*-linux*-gnuabi64)
- targ_defvec=mips_elf64_trad_be_vec
- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
- want64=true
- ;;
- mips*64*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"
;;
- mips*64*-*-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/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d b/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
index 5e24e7a115e..c2a581858ed 100644
--- a/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
+++ b/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
@@ -1,5 +1,4 @@
#PROG: objcopy
-#as: -n32
#readelf: --notes --wide
#objcopy: --merge-notes
#name: MIPS merge notes section (n32)
diff --git a/gas/configure b/gas/configure
index dbb3425b678..e5023ff727f 100755
--- a/gas/configure
+++ b/gas/configure
@@ -12225,10 +12225,7 @@ _ACEOF
esac
# Decide which ABI to target by default.
case ${target} in
- mips*64*-linux-gnuabi64)
- mips_default_abi=N64_ABI
- ;;
- mips*64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
+ mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
| mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
mips_default_abi=N32_ABI
;;
diff --git a/gas/configure.ac b/gas/configure.ac
index 13adaad6123..e8e8f31f79a 100644
--- a/gas/configure.ac
+++ b/gas/configure.ac
@@ -394,10 +394,7 @@ changequote([,])dnl
esac
# Decide which ABI to target by default.
case ${target} in
- mips*64*-linux-gnuabi64)
- mips_default_abi=N64_ABI
- ;;
- mips*64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
+ mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
| mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
mips_default_abi=N32_ABI
;;
diff --git a/gold/configure.tgt b/gold/configure.tgt
index ef47ce079f1..4b54e08d27f 100644
--- a/gold/configure.tgt
+++ b/gold/configure.tgt
@@ -153,13 +153,6 @@ aarch64*-*)
targ_big_endian=false
targ_extra_big_endian=true
;;
-mips*64*el*-*-*|mips*64*le*-*-*)
- targ_obj=mips
- targ_machine=EM_MIPS_RS3_LE
- targ_size=64
- targ_big_endian=false
- targ_extra_big_endian=true
- ;;
mips*el*-*-*|mips*le*-*-*)
targ_obj=mips
targ_machine=EM_MIPS_RS3_LE
@@ -167,13 +160,6 @@ mips*el*-*-*|mips*le*-*-*)
targ_big_endian=false
targ_extra_big_endian=true
;;
-mips*64*-*-*)
- targ_obj=mips
- targ_machine=EM_MIPS
- targ_size=64
- targ_big_endian=true
- targ_extra_big_endian=false
- ;;
mips*-*-*)
targ_obj=mips
targ_machine=EM_MIPS
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 4a71f679e29..34c9d67c365 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -580,19 +580,11 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
;;
mips*-*-windiss) targ_emul=elf32mipswindiss
;;
-mips*64*el-*-linux-gnuabi64) targ_emul=elf64ltsmip
- targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- targ_extra_libpath=$targ_extra_emuls
- ;;
-mips*64*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
;;
-mips*64*-*-linux-gnuabi64) targ_emul=elf64btsmip
- targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- targ_extra_libpath=$targ_extra_emuls
- ;;
-mips*64*-*-linux-*) targ_emul=elf32btsmipn32
+mips64*-*-linux-*) targ_emul=elf32btsmipn32
targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
targ_extra_libpath=$targ_extra_emuls
;;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-07-28 5:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-28 5:05 [binutils-gdb] Revert "MIPS: support mips*64 as CPU and gnuabi64 as ABI" Maciej W. Rozycki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).