Revert "MIPS: default r6 if vendor is img"

This reverts commit be0d391f22fe6009c3be907753975a984cbbcc23.  It was
applied unapproved.

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 580022d858d767e78a151917f87374ec950e792b..868f4a911a9d261c18afeefb70726e46e56d04af 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -12211,12 +12211,6 @@ _ACEOF
            use_e_mips_abi_o32=1
            ;;
        esac
-       # If Vendor is IMG, then MIPSr6 is used
-       case ${target} in
-         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
@@ -12236,7 +12230,7 @@ _ACEOF
          | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
            mips_default_abi=N32_ABI
            ;;
-         mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu | mips*-img-elf)
+         mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu)
            mips_default_abi=O32_ABI
            ;;
          mips64*-openbsd*)

diff --git a/gas/configure.ac b/gas/configure.ac
index c1571a49fbb69be1faaa5daba1db0377faa351b3..03728ffce4de1285696577b933c734bf53d01380 100644 (file)
--- a/gas/configure.ac
+++ b/gas/configure.ac
@@ -380,12 +380,6 @@ changequote([,])dnl
            use_e_mips_abi_o32=1
            ;;
        esac
-       # If Vendor is IMG, then MIPSr6 is used
-       case ${target} in
-         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
@@ -405,7 +399,7 @@ changequote([,])dnl
          | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
            mips_default_abi=N32_ABI
            ;;
-         mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu | mips*-img-elf)
+         mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu)
            mips_default_abi=O32_ABI
            ;;
          mips64*-openbsd*)