t-aprofile (MULTILIB_EXCEPTIONS): Rewrite into ...

2016-08-17  Thomas Preud'homme  <thomas.preudhomme@arm.com>

    gcc/
    * config/arm/t-aprofile (MULTILIB_EXCEPTIONS): Rewrite into ...
    (MULTILIB_REQUIRED): This by specifying multilib needing to be built
    rather than those that should not be built.

From-SVN: r239528
This commit is contained in:
Thomas Preud'homme 2016-08-17 11:15:29 +00:00 committed by Thomas Preud'homme
parent abe95ef6bf
commit 03c9d8596f
2 changed files with 25 additions and 25 deletions

View File

@ -1,3 +1,9 @@
2016-08-17 Thomas Preud'homme <thomas.preudhomme@arm.com>
* config/arm/t-aprofile (MULTILIB_EXCEPTIONS): Rewrite into ...
(MULTILIB_REQUIRED): This by specifying multilib needing to be built
rather than those that should not be built.
2016-08-17 Stanislaw Halik <sthalik@misaki.pl>
PR target/66488

View File

@ -49,33 +49,27 @@ MULTILIB_DIRNAMES += fpv3 simdv1 fpv4 simdvfpv4 simdv8
MULTILIB_OPTIONS += mfloat-abi=softfp/mfloat-abi=hard
MULTILIB_DIRNAMES += softfp hard
# We don't build no-float libraries with an FPU.
MULTILIB_EXCEPTIONS += *mfpu=vfpv3-d16
MULTILIB_EXCEPTIONS += *mfpu=neon
MULTILIB_EXCEPTIONS += *mfpu=vfpv4-d16
MULTILIB_EXCEPTIONS += *mfpu=neon-vfpv4
MULTILIB_EXCEPTIONS += *mfpu=neon-fp-armv8
# We don't build libraries requiring an FPU at the CPU/Arch/ISA level.
MULTILIB_EXCEPTIONS += mfloat-abi=*
MULTILIB_EXCEPTIONS += mfpu=*
MULTILIB_EXCEPTIONS += mthumb/mfloat-abi=*
MULTILIB_EXCEPTIONS += mthumb/mfpu=*
MULTILIB_EXCEPTIONS += *march=armv7-a/mfloat-abi=*
MULTILIB_EXCEPTIONS += *march=armv7ve/mfloat-abi=*
MULTILIB_EXCEPTIONS += *march=armv8-a/mfloat-abi=*
# Option combinations to build library with
# Default CPU/Arch (ARM is implicitly included because it uses the default
# multilib)
MULTILIB_REQUIRED += mthumb
# ARMv7-A
MULTILIB_REQUIRED += *march=armv7-a
MULTILIB_REQUIRED += *march=armv7-a/mfpu=vfpv3-d16/mfloat-abi=*
MULTILIB_REQUIRED += *march=armv7-a/mfpu=neon/mfloat-abi=*
# ARMv7VE
MULTILIB_REQUIRED += *march=armv7ve
MULTILIB_REQUIRED += *march=armv7ve/mfpu=vfpv4-d16/mfloat-abi=*
MULTILIB_REQUIRED += *march=armv7ve/mfpu=neon-vfpv4/mfloat-abi=*
# ARMv8-A
MULTILIB_REQUIRED += *march=armv8-a
MULTILIB_REQUIRED += *march=armv8-a/mfpu=neon-fp-armv8/mfloat-abi=*
# Ensure the correct FPU variants apply to the correct base architectures.
MULTILIB_EXCEPTIONS += *march=armv7ve/*mfpu=vfpv3-d16*
MULTILIB_EXCEPTIONS += *march=armv7ve/*mfpu=neon/*
MULTILIB_EXCEPTIONS += *march=armv8-a/*mfpu=vfpv3-d16*
MULTILIB_EXCEPTIONS += *march=armv8-a/*mfpu=neon/*
MULTILIB_EXCEPTIONS += *march=armv7-a/*mfpu=vfpv4-d16*
MULTILIB_EXCEPTIONS += *march=armv7-a/*mfpu=neon-vfpv4*
MULTILIB_EXCEPTIONS += *march=armv8-a/*mfpu=vfpv4-d16*
MULTILIB_EXCEPTIONS += *march=armv8-a/*mfpu=neon-vfpv4*
MULTILIB_EXCEPTIONS += *march=armv7-a/*mfpu=neon-fp-armv8*
MULTILIB_EXCEPTIONS += *march=armv7ve/*mfpu=neon-fp-armv8*
# CPU Matches
MULTILIB_MATCHES += march?armv7-a=mcpu?cortex-a8