From 29e1d31b2cf2720fad010f1079b679c5edfb206f Mon Sep 17 00:00:00 2001 From: Mantas Mikaitis Date: Thu, 5 Feb 2015 16:58:58 +0000 Subject: [PATCH] [ARM] __ARM_FP & __ARM_NEON_FP defined when -march=armv7-m gcc/: * config/arm/arm.h (TARGET_NEON_FP): Removed conditional definition, define to zero if !TARGET_NEON. (TARGET_CPU_CPP_BUILTINS): Added second condition before defining __ARM_FP macro. gcc/testsuite/: * gcc.target/arm/macro_defs0.c: New test. * gcc.target/arm/macro_defs1.c: New test. * gcc.target/arm/macro_defs2.c: New test. From-SVN: r220456 --- gcc/ChangeLog | 7 +++++++ gcc/config/arm/arm.h | 12 ++++++------ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.target/arm/macro_defs0.c | 12 ++++++++++++ gcc/testsuite/gcc.target/arm/macro_defs1.c | 8 ++++++++ gcc/testsuite/gcc.target/arm/macro_defs2.c | 14 ++++++++++++++ 6 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.target/arm/macro_defs0.c create mode 100644 gcc/testsuite/gcc.target/arm/macro_defs1.c create mode 100644 gcc/testsuite/gcc.target/arm/macro_defs2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c293971f537..1805759c721 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-02-04 Mantas Mikaitis + + * config/arm/arm.h (TARGET_NEON_FP): Removed conditional definition, + define to zero if !TARGET_NEON. + (TARGET_CPU_CPP_BUILTINS): Added second condition before defining + __ARM_FP macro. + 2015-02-04 Jan Hubicka Trevor Saunders diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 831d6e17d1f..297dfe1ae67 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -2360,17 +2360,17 @@ extern int making_const_table; point types. Where bit 1 indicates 16-bit support, bit 2 indicates 32-bit support, bit 3 indicates 64-bit support. */ #define TARGET_ARM_FP \ - (TARGET_VFP_SINGLE ? 4 \ - : (TARGET_VFP_DOUBLE ? (TARGET_FP16 ? 14 : 12) : 0)) + (!TARGET_SOFT_FLOAT ? (TARGET_VFP_SINGLE ? 4 \ + : (TARGET_VFP_DOUBLE ? (TARGET_FP16 ? 14 : 12) : 0)) \ + : 0) /* Set as a bit mask indicating the available widths of floating point types for hardware NEON floating point. This is the same as TARGET_ARM_FP without the 64-bit bit set. */ -#ifdef TARGET_NEON -#define TARGET_NEON_FP \ - (TARGET_ARM_FP & (0xff ^ 0x08)) -#endif +#define TARGET_NEON_FP \ + (TARGET_NEON ? (TARGET_ARM_FP & (0xff ^ 0x08)) \ + : 0) /* The maximum number of parallel loads or stores we support in an ldm/stm instruction. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b7be54e7bc3..d8adce2f1b3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-02-05 Mantas Mikaitis + + * gcc.target/arm/macro_defs0.c: New test. + * gcc.target/arm/macro_defs1.c: New test. + * gcc.target/arm/macro_defs2.c: New test. + 2015-02-05 Uros Bizjak PR rtl-optimization/64905 diff --git a/gcc/testsuite/gcc.target/arm/macro_defs0.c b/gcc/testsuite/gcc.target/arm/macro_defs0.c new file mode 100644 index 00000000000..945eec30786 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/macro_defs0.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-march=*" } { "-march=armv7-m" } } */ +/* { dg-skip-if "avoid conflicting multilib options" { target *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ +/* { dg-options "-march=armv7-m -mcpu=cortex-m3 -mfloat-abi=soft -mthumb" } */ + +#ifdef __ARM_FP +#error __ARM_FP should not be defined +#endif + +#ifdef __ARM_NEON_FP +#error __ARM_NEON_FP should not be defined +#endif diff --git a/gcc/testsuite/gcc.target/arm/macro_defs1.c b/gcc/testsuite/gcc.target/arm/macro_defs1.c new file mode 100644 index 00000000000..d5423c72126 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/macro_defs1.c @@ -0,0 +1,8 @@ +/* { dg-do compile } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-march=*" } { "-march=armv6-m" } } */ +/* { dg-options "-march=armv6-m -mthumb" } */ + +#ifdef __ARM_NEON_FP +#error __ARM_NEON_FP should not be defined +#endif + diff --git a/gcc/testsuite/gcc.target/arm/macro_defs2.c b/gcc/testsuite/gcc.target/arm/macro_defs2.c new file mode 100644 index 00000000000..9a960423562 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/macro_defs2.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-march=armv7ve -mcpu=cortex-a15 -mfpu=neon-vfpv4" } */ +/* { dg-add-options arm_neon } */ +/* { dg-require-effective-target arm_neon_ok } */ + +#ifndef __ARM_NEON_FP +#error __ARM_NEON_FP is not defined but should be +#endif + +#ifndef __ARM_FP +#error __ARM_FP is not defined but should be +#endif + + -- 2.30.2