From: "Maciej W. Rozycki" <macro@orcam.me.uk>
To: Nick Clifton <nickc@redhat.com>
Cc: YunQiang Su <yunqiang.su@cipunited.com>, binutils@sourceware.org
Subject: [committed 01/16] Revert "MIPS: support mips*64 as CPU and gnuabi64 as ABI"
Date: Fri, 28 Jul 2023 06:06:32 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.2.21.2307271526040.10240@angie.orcam.me.uk> (raw)
In-Reply-To: <alpine.DEB.2.21.2307271457290.10240@angie.orcam.me.uk>
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.
---
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(-)
binutils-32f1c80375eb-rev.diff
Index: binutils-gdb/bfd/config.bfd
===================================================================
--- binutils-gdb.orig/bfd/config.bfd
+++ binutils-gdb/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"
;;
Index: binutils-gdb/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
===================================================================
--- binutils-gdb.orig/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
+++ binutils-gdb/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)
Index: binutils-gdb/gas/configure
===================================================================
--- binutils-gdb.orig/gas/configure
+++ binutils-gdb/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
;;
Index: binutils-gdb/gas/configure.ac
===================================================================
--- binutils-gdb.orig/gas/configure.ac
+++ binutils-gdb/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
;;
Index: binutils-gdb/gold/configure.tgt
===================================================================
--- binutils-gdb.orig/gold/configure.tgt
+++ binutils-gdb/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
Index: binutils-gdb/ld/configure.tgt
===================================================================
--- binutils-gdb.orig/ld/configure.tgt
+++ binutils-gdb/ld/configure.tgt
@@ -580,19 +580,11 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvx
;;
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
;;
next prev parent reply other threads:[~2023-07-28 5:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 5:06 [committed 00/16] MIPS: Revert the change of `mipsisa64*-*-linux*' semantics Maciej W. Rozycki
2023-07-28 5:06 ` Maciej W. Rozycki [this message]
2023-07-28 5:06 ` [committed 02/16] MIPS/LD: Include n64 `.interp' with INITIAL_READONLY_SECTIONS Maciej W. Rozycki
2023-07-28 5:06 ` [committed 03/16] MIPS/GAS/testsuite: Disable compact EH #7 tests with OpenBSD targets Maciej W. Rozycki
2023-07-28 5:06 ` [committed 04/16] MIPS/LD/testsuite: Fix unaligned JALX failures " Maciej W. Rozycki
2023-07-28 5:06 ` [committed 05/16] MIPS/LD/testsuite: Fix JALR relaxation test failure with IRIX 6 Maciej W. Rozycki
2023-07-28 5:06 ` [committed 06/16] MIPS/LD/testsuite: Fix `attr-gnu-4-10' failures with IRIX targets Maciej W. Rozycki
2023-07-28 5:07 ` [committed 07/16] MIPS/LD/testsuite: Fix `attr-gnu-4-10' failures with OpenBSD targets Maciej W. Rozycki
2023-07-28 5:07 ` [committed 08/16] MIPS/LD/testsuite: Run `got-dump-1' for o32/n32 ABIs Maciej W. Rozycki
2023-07-28 5:07 ` [committed 09/16] MIPS/GAS/testsuite: Force o32 for tests expecting 32-bit addressing Maciej W. Rozycki
2023-07-28 5:07 ` [committed 10/16] MIPS/LD/testsuite: Fix MIPS16 interlinking test n64 regressions Maciej W. Rozycki
2023-07-28 5:07 ` [committed 11/16] MIPS/LD/testsuite: Fix MIPS16 interlinking test IRIX 6 regressions Maciej W. Rozycki
2023-07-28 5:07 ` [committed 12/16] testsuite: Also discard the `.MIPS.options' section Maciej W. Rozycki
2023-07-28 5:07 ` [committed 13/16] MIPS/testsuite: Handle 64-bit addresses Maciej W. Rozycki
2023-07-28 5:07 ` [committed 14/16] testsuite: Handle composed R_MIPS_NONE relocations Maciej W. Rozycki
2023-07-28 5:07 ` [committed 15/16] MIPS/GAS/testsuite: Fix n64 compact EH failures Maciej W. Rozycki
2023-07-28 5:07 ` [committed 16/16] MIPS: Support `-gnuabi64' target triplet suffix for 64-bit Linux targets Maciej W. Rozycki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.2307271526040.10240@angie.orcam.me.uk \
--to=macro@orcam.me.uk \
--cc=binutils@sourceware.org \
--cc=nickc@redhat.com \
--cc=yunqiang.su@cipunited.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).