OK.
-eric
On Fri, Aug 8, 2014 at 1:07 PM, Steve Ellcey <sell...@mips.com> wrote:
> Here is another MIPS patch. This removes the fp64 multilib from the
> mips-mti-* targets. With the new fpxx we no longer want special fp64
> multilibs in the mti targets. Since it doesn't affect any other targets
> hopefully there is no objection to checking this in.
>
> Tested on mips-mti-linux-gnu and mips-mti-elf targets.
>
> OK to checkin?
>
> Steve Ellcey
> sell...@mips.com
>
>
>
> 2014-08-08 Steve Ellcey <sell...@mips.com>
>
> * config/mips/t-mti-elf (MULTILIB_OPTIONS): Remove fp64 multilib.
> (MULTILIB_DIRNAMES): Ditto.
> * config/mips/t-mti-elf (MULTILIB_OPTIONS): Ditto.
> * config/mips/t-mti-elf (MULTILIB_EXCEPTIONS): Ditto.
> * config/mips/t-mti-linux (MULTILIB_OPTIONS): Ditto.
> * config/mips/t-mti-linux (MULTILIB_DIRNAMES): Ditto.
> * config/mips/t-mti-linux (MULTILIB_EXCEPTIONS): Ditto.
> * config/mips/mti-linux.h (SYSROOT_SUFFIX_SPEC): Ditto.
>
> diff --git a/gcc/config/mips/mti-linux.h b/gcc/config/mips/mti-linux.h
> index db9896b..318e981 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}%{mfp64:/fp64}%{mnan=2008:/nan2008}"
> +
> "%{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 cd0a967..487a015 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/mfp64 mnan=2008
> -MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof fp64
> nan2008
> +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 mips32r2=mips32r3 mips32r2=mips32r5
> mips64r2=mips64r3 mips64r2=mips64r5
>
> # The 64 bit ABI is not supported on the mips32 architecture.
> @@ -43,8 +43,3 @@ MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*
>
> # We do not want nan2008 libraries for soft-float.
> MULTILIB_EXCEPTIONS += *msoft-float*/*mnan=2008*
> -
> -# -mfp64 libraries are only built for mips32r2 and not in mips16 mode.
> -MULTILIB_EXCEPTIONS += *mips32/*mfp64*
> -MULTILIB_EXCEPTIONS += *mips64*/*mfp64*
> -MULTILIB_EXCEPTIONS += *mips16*/*mfp64*
> diff --git a/gcc/config/mips/t-mti-linux b/gcc/config/mips/t-mti-linux
> index cd0a967..487a015 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/mfp64 mnan=2008
> -MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof fp64
> nan2008
> +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 mips32r2=mips32r3 mips32r2=mips32r5
> mips64r2=mips64r3 mips64r2=mips64r5
>
> # The 64 bit ABI is not supported on the mips32 architecture.
> @@ -43,8 +43,3 @@ MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*
>
> # We do not want nan2008 libraries for soft-float.
> MULTILIB_EXCEPTIONS += *msoft-float*/*mnan=2008*
> -
> -# -mfp64 libraries are only built for mips32r2 and not in mips16 mode.
> -MULTILIB_EXCEPTIONS += *mips32/*mfp64*
> -MULTILIB_EXCEPTIONS += *mips64*/*mfp64*
> -MULTILIB_EXCEPTIONS += *mips16*/*mfp64*
