From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2124) id 2642E385E008; Thu, 30 Nov 2023 15:57:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2642E385E008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Nick Clifton To: bfd-cvs@sourceware.org Subject: [binutils-gdb] MIPS: Set r6 as default arch if vendor is img X-Act-Checkin: binutils-gdb X-Git-Author: YunQiang Su X-Git-Refname: refs/heads/master X-Git-Oldrev: 53302c2d33c26909cc8446819f6677076ba48ca9 X-Git-Newrev: 070961b377b3762c41903253bfacdedd65171ab7 Message-Id: <20231130155719.2642E385E008@sourceware.org> Date: Thu, 30 Nov 2023 15:57:19 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Nov 2023 15:57:19 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D070961b377b3= 762c41903253bfacdedd65171ab7 commit 070961b377b3762c41903253bfacdedd65171ab7 Author: YunQiang Su Date: Fri Nov 24 17:39:55 2023 +0800 MIPS: Set r6 as default arch if vendor is img =20 This behavior is used by downstream toolchain since 2014, and has been in GCC since the same year. =20 We don't support mips64*-img* due to GCC doesn't support it, and we believe that the multilib should be used for this case. Diff: --- bfd/config.bfd | 2 +- gas/configure | 6 ++++++ gas/configure.ac | 6 ++++++ gas/testsuite/gas/mips/mips.exp | 2 +- gas/testsuite/gas/mips/module-defer-warn2.d | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/bfd/config.bfd b/bfd/config.bfd index 08129e6a8cb..8c9637ae2b0 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -1550,7 +1550,7 @@ case "${targ_defvec} ${targ_selvecs}" in esac =20 case "${targ}" in - mipsisa32r6* | mipsisa64r6*) + mipsisa32r6* | mipsisa64r6* | mips*-img-*) targ_cflags=3D"$targ_cflags -DMIPS_DEFAULT_R6=3D1" ;; esac diff --git a/gas/configure b/gas/configure index 6a2f56f928a..ace1a17365f 100755 --- a/gas/configure +++ b/gas/configure @@ -12264,6 +12264,12 @@ _ACEOF use_ef_mips_abi_o32=3D1 ;; esac + # If Vendor is IMG, then MIPSr6 is used + case ${target} in + mips*-img-*) + mips_cpu=3Dmips32r6 + ;; + esac # Decide whether to generate 32-bit or 64-bit code by default. # Used to resolve -march=3Dfrom-abi when an embedded ABI is selected. case ${target} in diff --git a/gas/configure.ac b/gas/configure.ac index d0b4cfb0310..7dac22144d9 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -382,6 +382,12 @@ changequote([,])dnl use_ef_mips_abi_o32=3D1 ;; esac + # If Vendor is IMG, then MIPSr6 is used + case ${target} in + mips*-img-*) + mips_cpu=3Dmips32r6 + ;; + esac # Decide whether to generate 32-bit or 64-bit code by default. # Used to resolve -march=3Dfrom-abi when an embedded ABI is selected. case ${target} in diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.= exp index 777ae6536f0..9238b26800d 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -473,7 +473,7 @@ mips_arch_create mips32r5 32 mips32r3 { fpisa3 fpisa4 f= pisa5 ror } \ mips_arch_create mips32r6 32 mips32r5 { fpisa3 fpisa4 fpisa5 ror } \ { -march=3Dmips32r6 -mtune=3Dmips32r6 --defsym r6=3D} \ { -mmips:isa32r6 } \ - { mipsisa32r6-*-* mipsisa32r6el-*-* } + { mipsisa32r6-*-* mipsisa32r6el-*-* mips*-img-* } mips_arch_create mips64 64 mips5 { mips32 } \ { -march=3Dmips64 -mtune=3Dmips64 } { -mmips:isa64 } \ { mipsisa64-*-* mipsisa64el-*-* } diff --git a/gas/testsuite/gas/mips/module-defer-warn2.d b/gas/testsuite/ga= s/mips/module-defer-warn2.d index 5c2d1d7fa8e..1ff4fefecf7 100644 --- a/gas/testsuite/gas/mips/module-defer-warn2.d +++ b/gas/testsuite/gas/mips/module-defer-warn2.d @@ -1,5 +1,5 @@ #name: .module deferred warnings 2 (pre-R2) #source: module-defer-warn2.s #as: -32 -#skip: mipsisa32r?* mipsisa64r?* +#skip: mipsisa32r?* mipsisa64r?* mips*-img-* #error_output: module-defer-warn2.l