diff options
| author | Thomas Preud'homme <thomas.preudhomme@arm.com> | 2016-08-17 11:15:29 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <thopre01@gcc.gnu.org> | 2016-08-17 11:15:29 +0000 |
| commit | 03c9d8596f91e600383089ecabdea6bc206ab14c (patch) | |
| tree | 136d7fdaaf5dd98c96ec3fbc297fb3f38534a457 /gcc | |
| parent | abe95ef6bf44f5e1991b6ad15cd704248b000a27 (diff) | |
| download | gcc-03c9d8596f91e600383089ecabdea6bc206ab14c.zip gcc-03c9d8596f91e600383089ecabdea6bc206ab14c.tar.gz gcc-03c9d8596f91e600383089ecabdea6bc206ab14c.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/arm/t-aprofile | 48 |
2 files changed, 27 insertions, 27 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a699411..01ad7e2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/config/arm/t-aprofile b/gcc/config/arm/t-aprofile index 1b34b54..17efacc 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 |