[binutils-gdb] MIPS: revert "default r6 if vendor is img"

[binutils-gdb] MIPS: revert "default r6 if vendor is img"

[YunQiang Su]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c3b0a240ea7c5c25f523b950f24a2befa6b6ff61

commit c3b0a240ea7c5c25f523b950f24a2befa6b6ff61
Author: YunQiang Su <yunqiang.su@cipunited.com>
Date:   Thu May 4 09:45:22 2023 +0800

    MIPS: revert "default r6 if vendor is img"
    
    In commit: 9171de358f230b64646bbb525a74e5f8e3dbe0dc,
    The default output is set to r6 if the vendor is img,
    It is ugly and should not be in upstream.
    
    Let's revert it.

Diff:
---
 bfd/config.bfd   | 2 +-
 gas/configure    | 9 ---------
 gas/configure.ac | 9 ---------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 78752994456..954837033c8 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -1537,7 +1537,7 @@ case "${targ_defvec} ${targ_selvecs}" in
 esac
 
 case "${targ}" in
-  mipsisa32r6* | mipsisa64r6* | mips*-img-*)
+  mipsisa32r6* | mipsisa64r6*)
     targ_cflags="$targ_cflags -DMIPS_DEFAULT_R6=1"
     ;;
 esac
diff --git a/gas/configure b/gas/configure
index 0daa80d5b4c..868f4a911a9 100755
--- a/gas/configure
+++ b/gas/configure
@@ -12211,15 +12211,6 @@ _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
diff --git a/gas/configure.ac b/gas/configure.ac
index 2b91f9ec616..03728ffce4d 100644
--- a/gas/configure.ac
+++ b/gas/configure.ac
@@ -380,15 +380,6 @@ 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