diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-09-06 14:37:40 +0200 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2016-09-07 22:09:03 +0200 |
| commit | 430ac51a896311655eaf4e9f96458497db09ad55 (patch) | |
| tree | 262e975e583be54b16c1de9d813968c940208c5d | |
| parent | 4825254bc87d4915a510c0d83dff86c0433fd947 (diff) | |
gcc/
Backport from trunk r239528.
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.
Change-Id: I1f44a5d7ea4d48b0a73ad8f31eeaf5a97b6a7449
| -rw-r--r-- | gcc/config/arm/t-aprofile | 48 |
1 files changed, 21 insertions, 27 deletions
diff --git a/gcc/config/arm/t-aprofile b/gcc/config/arm/t-aprofile index 0d91006d4ef..90305e1206e 100644 --- a/gcc/config/arm/t-aprofile +++ b/gcc/config/arm/t-aprofile @@ -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=* - -# 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* + +# 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=* + # CPU Matches MULTILIB_MATCHES += march?armv7-a=mcpu?cortex-a8 |