From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 164E93858D1E for ; Tue, 18 Apr 2023 13:07:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 164E93858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 90B3E168F; Tue, 18 Apr 2023 06:08:14 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C9A3A3F5A1; Tue, 18 Apr 2023 06:07:29 -0700 (PDT) From: Richard Sandiford To: YunQiang Su Mail-Followup-To: YunQiang Su ,binutils@sourceware.org, syq@debian.org, macro@orcam.me.uk, xry111@xry111.site, jiaxun.yang@flygoat.com, richard.sandiford@arm.com Cc: binutils@sourceware.org, syq@debian.org, macro@orcam.me.uk, xry111@xry111.site, jiaxun.yang@flygoat.com Subject: Re: [PATCH v3] MIPS: the default output fellows triple References: <20230403110635.23391-1-yunqiang.su@cipunited.com> <20230414072046.1639896-1-yunqiang.su@cipunited.com> Date: Tue, 18 Apr 2023 14:07:28 +0100 In-Reply-To: <20230414072046.1639896-1-yunqiang.su@cipunited.com> (YunQiang Su's message of "Fri, 14 Apr 2023 15:20:46 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-31.0 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: YunQiang Su writes: > PR 25494. > > 1. as fellows the isa level in triple of target > > as xx.s > 2. ld fellows the isa level in triple of target > > ld -r -b binary xx.dat -o xx.o > > These rules include: > 1. *-gnuabi64: will use N64 ABI by default > 2. *-img-* (vendor): will use MIPS r6 by default > 3. mipsisa32r6*/mipsisa64r6*: will use MIPS r6 by default Sorry to be awkward, but could you split this into two patches: one that handles gnuabi64 and one that does the r6 thing? Thanks, Richard > --- > bfd/config.bfd | 21 +++++++++++++++++-- > bfd/elfxx-mips.c | 10 +++++++-- > .../binutils-all/mips/mips-note-2-n32.d | 1 + > gas/configure | 14 ++++++++++++- > gas/configure.ac | 14 ++++++++++++- > gold/configure.tgt | 14 +++++++++++++ > ld/configure.tgt | 12 +++++++++-- > 7 files changed, 78 insertions(+), 8 deletions(-) > > diff --git a/bfd/config.bfd b/bfd/config.bfd > index 7af481048db..a57105097a8 100644 > --- a/bfd/config.bfd > +++ b/bfd/config.bfd > @@ -941,11 +941,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*) > + 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*) > 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*) > + mips*64*-*-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" > ;; > @@ -1525,3 +1535,10 @@ case "${targ_defvec} ${targ_selvecs}" in > targ_archs="$targ_archs bfd_iamcu_arch" > ;; > esac > + > +case "${targ}" in > + mipsisa32r6* | mipsisa64r6* | mips*-img-*) > + targ_cflags="$targ_cflags -DMIPS_DEFAULT_R6=1" > + ;; > +esac > + > diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c > index 13a89953293..336c32b48ec 100644 > --- a/bfd/elfxx-mips.c > +++ b/bfd/elfxx-mips.c > @@ -12327,9 +12327,15 @@ mips_set_isa_flags (bfd *abfd) > { > default: > if (ABI_N32_P (abfd) || ABI_64_P (abfd)) > - val = E_MIPS_ARCH_3; > +#ifdef MIPS_DEFAULT_R6 > + val = E_MIPS_ARCH_64R6; > else > - val = E_MIPS_ARCH_1; > + val = E_MIPS_ARCH_32R6; > +#else > + val = E_MIPS_ARCH_3; > + else > + val = E_MIPS_ARCH_1; > +#endif > break; > > case bfd_mach_mips3000: > 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 c2a581858ed..5e24e7a115e 100644 > --- a/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d > +++ b/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d > @@ -1,4 +1,5 @@ > #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 b56836998ef..0daa80d5b4c 100755 > --- a/gas/configure > +++ b/gas/configure > @@ -12211,6 +12211,15 @@ _ACEOF > use_e_mips_abi_o32=1 > ;; > esac > + # If Vendor is IMG, then MIPSr6 is used > + case ${target} in > + mips*64*-img-*) > + mips_cpu=mips64r6 > + ;; > + mips*-img-*) > + mips_cpu=mips32r6 > + ;; > + esac > # Decide whether to generate 32-bit or 64-bit code by default. > # Used to resolve -march=from-abi when an embedded ABI is selected. > case ${target} in > @@ -12223,7 +12232,10 @@ _ACEOF > esac > # Decide which ABI to target by default. > case ${target} in > - mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ > + mips*64*-linux-gnuabi64) > + mips_default_abi=N64_ABI > + ;; > + mips*64*-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 6a68fd7c4e6..2b91f9ec616 100644 > --- a/gas/configure.ac > +++ b/gas/configure.ac > @@ -380,6 +380,15 @@ changequote([,])dnl > use_e_mips_abi_o32=1 > ;; > esac > + # If Vendor is IMG, then MIPSr6 is used > + case ${target} in > + mips*64*-img-*) > + mips_cpu=mips64r6 > + ;; > + mips*-img-*) > + mips_cpu=mips32r6 > + ;; > + esac > # Decide whether to generate 32-bit or 64-bit code by default. > # Used to resolve -march=from-abi when an embedded ABI is selected. > case ${target} in > @@ -392,7 +401,10 @@ changequote([,])dnl > esac > # Decide which ABI to target by default. > case ${target} in > - mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ > + mips*64*-linux-gnuabi64) > + mips_default_abi=N64_ABI > + ;; > + mips*64*-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 4b54e08d27f..ef47ce079f1 100644 > --- a/gold/configure.tgt > +++ b/gold/configure.tgt > @@ -153,6 +153,13 @@ 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 > @@ -160,6 +167,13 @@ 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 34c9d67c365..4a71f679e29 100644 > --- a/ld/configure.tgt > +++ b/ld/configure.tgt > @@ -580,11 +580,19 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks > ;; > mips*-*-windiss) targ_emul=elf32mipswindiss > ;; > -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 > +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 > targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" > targ_extra_libpath=$targ_extra_emuls > ;; > -mips64*-*-linux-*) targ_emul=elf32btsmipn32 > +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 > targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" > targ_extra_libpath=$targ_extra_emuls > ;;