[PATCH,committed] Infer architecture from ABI for mips-img* and mips-mti*

[Matthew Fortune]

This patch allows the -mabi=n32 and -mabi=64 options to
automatically infer the of a 64-bit architecture in the mips-mti-*
and mips-img-* triplets. The default 64-bit architecture is
mips64r2 for MTI and mips64r6 for IMG.

Thanks,
Matthew

gcc/
        * config.gcc (mips*-mti-elf*, mips*-mti-linux*): Set mips32r2
        and mips64r2 as default 32-bit and 64-bit architectures.
        (mips*-img-elf*, mips*-img-linux*): Set mips32r6 and mips64r6
        as default 32-bit and 64-bit architectures.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240145 
138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog  | 7 +++++++
 gcc/config.gcc | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8527518..9b39906 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2016-09-14  Matthew Fortune  <matthew.fort...@imgtec.com>
+
+       * config.gcc (mips*-mti-elf*, mips*-mti-linux*): Set mips32r2
+       and mips64r2 as default 32-bit and 64-bit architectures.
+       (mips*-img-elf*, mips*-img-linux*): Set mips32r6 and mips64r6
+       as default 32-bit and 64-bit architectures.
+
 2016-09-14  Pat Haugen  <pthau...@us.ibm.com>
 
        * loop-unroll.c (unroll_loop_runtime_iterations): Set probability of 
succ edge.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index e544d76..fc91ba7 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1985,6 +1985,8 @@ mips*-img-linux*)
        extra_options="${extra_options} linux-android.opt"
        tmake_file="${tmake_file} mips/t-img-linux"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=37 MIPS_ABI_DEFAULT=ABI_32"
+       with_arch_32="mips32r6"
+       with_arch_64="mips64r6"
        gnu_ld=yes
        gas=yes
        ;;
@@ -1993,6 +1995,8 @@ mips*-mti-linux*)
        extra_options="${extra_options} linux-android.opt"
        tmake_file="${tmake_file} mips/t-mti-linux"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_32"
+       with_arch_32="mips32r2"
+       with_arch_64="mips64r2"
        gnu_ld=yes
        gas=yes
        ;;
@@ -2047,11 +2051,15 @@ mips*-mti-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/n32-elf.h 
mips/sde.h mips/mti-elf.h"
        tmake_file="mips/t-mti-elf"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_32"
+       with_arch_32="mips32r2"
+       with_arch_64="mips64r2"
        ;;
 mips*-img-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/n32-elf.h 
mips/sde.h mips/mti-elf.h"
        tmake_file="mips/t-img-elf"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=37 MIPS_ABI_DEFAULT=ABI_32"
+       with_arch_32="mips32r6"
+       with_arch_64="mips64r6"
        ;;
 mips*-sde-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/n32-elf.h 
mips/sde.h"
-- 
2.2.1