Revert "[ARM] Fix definition of __ARM_FEATURE_NUMERIC_MAXMIN"

This reverts commit r250206.

2017-07-15  Thomas Preud'homme  <thomas.preudhomme@arm.com>

    Revert:
    2017-07-14  Thomas Preud'homme  <thomas.preudhomme@arm.com>

    gcc
    * config/arm/arm-c.c (arm_cpu_builtins): Define
    __ARM_FEATURE_NUMERIC_MAXMIN solely based on TARGET_VFP5.

From-SVN: r250222

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4cacc6c6fdba31e5f5ea2fd6b1b72a8705a18a87..31bb7de762c3589bce1475c24789b40aa41d0d86 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-07-15  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+       Revert:
+       2017-07-14  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+       * config/arm/arm-c.c (arm_cpu_builtins): Define
+       __ARM_FEATURE_NUMERIC_MAXMIN solely based on TARGET_VFP5.
+
 2017-07-14  Kelvin Nilsen  <kelvin@gcc.gnu.org>
 
        * config/rs6000/rs6000-c.c (altivec_overloaded_builtins): Add

diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
index 6ab50f7ee3320d9b56688dd4c5f1ac80b233e84c..9178937b6d9e0fe5d0948701390c4cf01f4f8c7d 100644 (file)
--- a/gcc/config/arm/arm-c.c
+++ b/gcc/config/arm/arm-c.c
@@ -96,7 +96,7 @@ arm_cpu_builtins (struct cpp_reader* pfile)
                       || TARGET_ARM_ARCH_ISA_THUMB >=2));
 
   def_or_undef_macro (pfile, "__ARM_FEATURE_NUMERIC_MAXMIN",
-                     TARGET_VFP5);
+                     TARGET_ARM_ARCH >= 8 && TARGET_NEON && TARGET_VFP5);
 
   def_or_undef_macro (pfile, "__ARM_FEATURE_SIMD32", TARGET_INT_SIMD);