From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from angie.orcam.me.uk (angie.orcam.me.uk [IPv6:2001:4190:8020::34]) by sourceware.org (Postfix) with ESMTP id 93F343850853 for ; Fri, 28 Jul 2023 05:06:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 93F343850853 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=orcam.me.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=orcam.me.uk Received: by angie.orcam.me.uk (Postfix, from userid 500) id 1787592009D; Fri, 28 Jul 2023 07:06:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by angie.orcam.me.uk (Postfix) with ESMTP id 124E492009C; Fri, 28 Jul 2023 06:06:33 +0100 (BST) Date: Fri, 28 Jul 2023 06:06:32 +0100 (BST) From: "Maciej W. Rozycki" To: Nick Clifton cc: YunQiang Su , binutils@sourceware.org Subject: [committed 01/16] Revert "MIPS: support mips*64 as CPU and gnuabi64 as ABI" In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-3488.3 required=5.0 tests=BAYES_00,KAM_ASCII_DIVIDERS,KAM_DMARC_STATUS,KAM_INFOUSMEBIZ,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 ;;