config.gcc (mips*-*-linux*): If 'enabled_targets' is 'all'...

2011-07-11  Arthur Loiret  <aloiret@debian.org>
            Matthias Klose <doko@debian.org>

        * config.gcc (mips*-*-linux*): If 'enabled_targets' is 'all', build
        a tri-arch compiler defaulting to 32-bit (ABI o32). In this case:
        (tm_file): Add mips/linux64.h.
        (tmake_file): Add mips/t-linux64.
        (tm_defines): Add MIPS_ABI_DEFAULT=ABI_32.
        * config/mips/linux64.h (DRIVER_SELF_SPECS): Use MULTILIB_ABI_DEFAULT
        instead of hardcoded mabi=n32.
        * config/mips/t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if
        tm_defines contains MIPS_ABI_DEFAULT ABI_32, to follow the glibc
        convention.

Co-Authored-By: Matthias Klose <doko@debian.org>
From-SVN: r176145

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0418d46cf000bcd57207c58c66427ec77ccb54f..59e1fde440e7ffe8e1fbf251499a2ad7710b2d43 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2011-07-11  Arthur Loiret  <aloiret@debian.org>
+           Matthias Klose <doko@debian.org>
+
+       * config.gcc (mips*-*-linux*): If 'enabled_targets' is 'all', build
+       a tri-arch compiler defaulting to 32-bit (ABI o32). In this case:
+       (tm_file): Add mips/linux64.h.
+       (tmake_file): Add mips/t-linux64.
+       (tm_defines): Add MIPS_ABI_DEFAULT=ABI_32.
+       * config/mips/linux64.h (DRIVER_SELF_SPECS): Use MULTILIB_ABI_DEFAULT
+       instead of hardcoded mabi=n32.
+       * config/mips/t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if
+       tm_defines contains MIPS_ABI_DEFAULT ABI_32, to follow the glibc
+       convention.
+
 2011-07-11  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * passes.c (init_optimization_passes): Add invariant motion pass

diff --git a/gcc/config.gcc b/gcc/config.gcc
index c190fa74cf96f0f599cd65b47e9908dc897db3a4..e51a44a8a7816d8e50523286ef81257ac025b7b4 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1862,6 +1862,11 @@ mips64*-*-linux* | mipsisa64*-*-linux*)
 mips*-*-linux*)                                # Linux MIPS, either endian.
         tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/linux.h"
        tmake_file="${tmake_file} mips/t-libgcc-mips16"
+       if test x$enable_targets = xall; then
+               tm_file="${tm_file} mips/linux64.h"
+               tmake_file="${tmake_file} mips/t-linux64"
+               tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32"
+       fi
        case ${target} in
         mipsisa32r2*)
                tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"

diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
index cde17c5dfb7c59074e782241d331eafbbd62359e..cfdae5a1e61a2be0dd9016b041a28cb1a19b8161 100644 (file)
--- a/gcc/config/mips/linux64.h
+++ b/gcc/config/mips/linux64.h
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
   BASE_DRIVER_SELF_SPECS, \
   LINUX_DRIVER_SELF_SPECS \
   " %{!EB:%{!EL:%(endian_spec)}}" \
-  " %{!mabi=*: -mabi=n32}"
+  " %{!mabi=*: -" MULTILIB_ABI_DEFAULT "}"
 
 #undef LIB_SPEC
 #define LIB_SPEC "\

diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
index 66ea51a92dc7286fc471675a318773710d5c0fcc..326e6465afed3e8c7123930dccef6e7e514fc62c 100644 (file)
--- a/gcc/config/mips/t-linux64
+++ b/gcc/config/mips/t-linux64
@@ -17,7 +17,11 @@
 # <http://www.gnu.org/licenses/>.
 
 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+ifneq ($(filter MIPS_ABI_DEFAULT=ABI_32,$(tm_defines)),)
+MULTILIB_DIRNAMES = n32 . 64
+else
 MULTILIB_DIRNAMES = n32 32 64
+endif
 MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
 
 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o