config.gcc (mips*-*-linux*): Combine 32 and 64 bit cases.

2014-10-30  Steve Ellcey  <sellcey@imgtec.com>

	* config.gcc (mips*-*-linux*): Combine 32 and 64 bit cases.

From-SVN: r216944

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb70ce47e9ad25b2a9b877eb18a2a8f03f4a21f1..9313d350797873d7950a996db54892060579d908 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-30  Steve Ellcey  <sellcey@imgtec.com>
+
+       * config.gcc (mips*-*-linux*): Combine 32 and 64 bit cases.
+
 2014-10-30  Richard Biener  <rguenther@suse.de>
 
        * genmatch.c: Remove <map>, <utility> and <string> includes.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 137373ff552b1f04a087738a89e75b8606c60f79..10b0a6ec1280bf2d67feaf9eb9572c87b0aaf030 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1947,41 +1947,44 @@ mips*-mti-linux*)
        gnu_ld=yes
        gas=yes
        ;;
-mips64*-*-linux* | mipsisa64*-*-linux*)
+mips*-*-linux*)                                # Linux MIPS, either endian.
        tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
        extra_options="${extra_options} linux-android.opt"
-       tmake_file="${tmake_file} mips/t-linux64"
-       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
        case ${target} in
+               mipsisa32r2*)
+                       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
+                       ;;
+               mipsisa32*)
+                       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
+                       ;;
                mips64el-st-linux-gnu)
+                       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
                        tm_file="${tm_file} mips/st.h"
                        tmake_file="${tmake_file} mips/t-st"
+                       enable_mips_multilibs="yes"
                        ;;
                mips64octeon*-*-linux*)
+                       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
                        tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
                        target_cpu_default=MASK_SOFT_FLOAT_ABI
+                       enable_mips_multilibs="yes"
                        ;;
                mipsisa64r2*-*-linux*)
+                       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
                        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
+                       enable_mips_multilibs="yes"
+                       ;;
+               mips64*-*-linux* | mipsisa64*-*-linux*)
+                       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
+                       enable_mips_multilibs="yes"
                        ;;
        esac
-       gnu_ld=yes
-       gas=yes
-       ;;
-mips*-*-linux*)                                # Linux MIPS, either endian.
-       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h"
-       extra_options="${extra_options} linux-android.opt"
        if test x$enable_targets = xall; then
+               enable_mips_multilibs="yes"
+       fi
+       if test x$enable_mips_multilibs = xyes; then
                tmake_file="${tmake_file} mips/t-linux64"
        fi
-       tm_file="${tm_file} mips/linux-common.h"
-       case ${target} in
-        mipsisa32r2*)
-               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
-                ;;
-        mipsisa32*)
-               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
-        esac
        ;;
 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"