diff options
author | Maciej W. Rozycki <macro@orcam.me.uk> | 2023-06-15 04:45:03 +0100 |
---|---|---|
committer | Maciej W. Rozycki <macro@orcam.me.uk> | 2023-06-15 04:45:03 +0100 |
commit | dbad690493235b523cef23e938ff79916ab00c89 (patch) | |
tree | df563ea5e43ca4c3abadf464e67bc1c48d697ed7 | |
parent | 13527d85aff4cd393a51f96635813eccb6d7d4bb (diff) | |
download | binutils-dbad690493235b523cef23e938ff79916ab00c89.zip binutils-dbad690493235b523cef23e938ff79916ab00c89.tar.gz binutils-dbad690493235b523cef23e938ff79916ab00c89.tar.bz2 |
Revert "MIPS: default r6 if vendor is img"
This reverts commit be0d391f22fe6009c3be907753975a984cbbcc23. It was
applied unapproved.
-rw-r--r-- | bfd/config.bfd | 2 | ||||
-rwxr-xr-x | gas/configure | 8 | ||||
-rw-r--r-- | gas/configure.ac | 8 |
3 files changed, 3 insertions, 15 deletions
diff --git a/bfd/config.bfd b/bfd/config.bfd index 7875299..9548370 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 580022d..868f4a9 100755 --- 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 c1571a4..03728ff 100644 --- 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*) |