From: Steve Ellcey Date: Thu, 8 Aug 2013 20:35:28 +0000 (+0000) Subject: mti-linux.h (SYSROOT_SUFFIX_SPEC): Add nan2008. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3719e31a1508b1d101d574fc20ff55817e287f3;p=gcc.git mti-linux.h (SYSROOT_SUFFIX_SPEC): Add nan2008. 2013-08-08 Steve Ellcey * config/mips/mti-linux.h (SYSROOT_SUFFIX_SPEC): Add nan2008. * config/mips/t-mti-elf (MULTILIB_OPTIONS): Make mips16 and micromips incompatible. Add nan2008. (MULTILIB_DIRNAMES): Add nan2008. (MULTILIB_EXCEPTIONS): Remove mips16/micromips entry. * config/mips/t-mti-linux (MULTILIB_OPTIONS): Make mips16 and micromips incompatible. Add nan2008. (MULTILIB_DIRNAMES): Add nan2008. (MULTILIB_EXCEPTIONS): Remove mips16/micromips entry. From-SVN: r201610 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8b4d41ffb01..e902d6ed435 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2013-08-08 Steve Ellcey + + * config/mips/mti-linux.h (SYSROOT_SUFFIX_SPEC): Add nan2008. + * config/mips/t-mti-elf (MULTILIB_OPTIONS): Make mips16 and + micromips incompatible. Add nan2008. + (MULTILIB_DIRNAMES): Add nan2008. + (MULTILIB_EXCEPTIONS): Remove mips16/micromips entry. + * config/mips/t-mti-linux (MULTILIB_OPTIONS): Make mips16 + and micromips incompatible. Add nan2008. + (MULTILIB_DIRNAMES): Add nan2008. + (MULTILIB_EXCEPTIONS): Remove mips16/micromips entry. + 2013-08-08 Richard Sandiford PR rtl-optimization/58079 diff --git a/gcc/config/mips/mti-linux.h b/gcc/config/mips/mti-linux.h index 45bc0b88107..96dcac4dfb3 100644 --- a/gcc/config/mips/mti-linux.h +++ b/gcc/config/mips/mti-linux.h @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see /* This target is a multilib target, specify the sysroot paths. */ #undef SYSROOT_SUFFIX_SPEC #define SYSROOT_SUFFIX_SPEC \ - "%{mips32:/mips32}%{mips64:/mips64}%{mips64r2:/mips64r2}%{mips16:/mips16}%{mmicromips:/micromips}%{mabi=64:/64}%{mel|EL:/el}%{msoft-float:/sof}" + "%{mips32:/mips32}%{mips64:/mips64}%{mips64r2:/mips64r2}%{mips16:/mips16}%{mmicromips:/micromips}%{mabi=64:/64}%{mel|EL:/el}%{msoft-float:/sof}%{mnan=2008:/nan2008}" #undef DRIVER_SELF_SPECS #define DRIVER_SELF_SPECS \ diff --git a/gcc/config/mips/t-mti-elf b/gcc/config/mips/t-mti-elf index bce8f063452..4aec70cb807 100644 --- a/gcc/config/mips/t-mti-elf +++ b/gcc/config/mips/t-mti-elf @@ -19,8 +19,8 @@ # The default build is mips32r2, hard-float big-endian. Add mips32, # soft-float, and little-endian variations. -MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16 mmicromips mabi=64 EL msoft-float -MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof +MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16/mmicromips mabi=64 EL msoft-float/mnan=2008 +MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof nan2008 MULTILIB_MATCHES = EL=mel EB=meb # The 64 bit ABI is not supported on the mips32 architecture. @@ -36,9 +36,7 @@ MULTILIB_EXCEPTIONS += mabi=64* MULTILIB_EXCEPTIONS += *mips64*/*mips16* MULTILIB_EXCEPTIONS += *mips16/mabi=64* -# We only want micromips for mips32r2 architecture and we do not want -# it used in conjunction with -mips16. -MULTILIB_EXCEPTIONS += *mips16/mmicromips* +# We only want micromips for mips32r2 architecture. MULTILIB_EXCEPTIONS += *mips64*/mmicromips* MULTILIB_EXCEPTIONS += *mips32/mmicromips* MULTILIB_EXCEPTIONS += *mmicromips/mabi=64* diff --git a/gcc/config/mips/t-mti-linux b/gcc/config/mips/t-mti-linux index bce8f063452..4aec70cb807 100644 --- a/gcc/config/mips/t-mti-linux +++ b/gcc/config/mips/t-mti-linux @@ -19,8 +19,8 @@ # The default build is mips32r2, hard-float big-endian. Add mips32, # soft-float, and little-endian variations. -MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16 mmicromips mabi=64 EL msoft-float -MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof +MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16/mmicromips mabi=64 EL msoft-float/mnan=2008 +MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof nan2008 MULTILIB_MATCHES = EL=mel EB=meb # The 64 bit ABI is not supported on the mips32 architecture. @@ -36,9 +36,7 @@ MULTILIB_EXCEPTIONS += mabi=64* MULTILIB_EXCEPTIONS += *mips64*/*mips16* MULTILIB_EXCEPTIONS += *mips16/mabi=64* -# We only want micromips for mips32r2 architecture and we do not want -# it used in conjunction with -mips16. -MULTILIB_EXCEPTIONS += *mips16/mmicromips* +# We only want micromips for mips32r2 architecture. MULTILIB_EXCEPTIONS += *mips64*/mmicromips* MULTILIB_EXCEPTIONS += *mips32/mmicromips* MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*