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 --git a/bfd/config.bfd b/bfd/config.bfd
index 78752994456204a3c1184f9bca457f2d966afc29..954837033c8bbbb8ee0d1f9a79415edd9841f2a7 100644 (file)
--- 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 0daa80d5b4cb5e03f4d8f5a8170c23df3dbc3a18..868f4a911a9d261c18afeefb70726e46e56d04af 100755 (executable)
--- 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 2b91f9ec6167325904ca17d540b64cd6a57602d1..03728ffce4de1285696577b933c734bf53d01380 100644 (file)
--- 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