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

gcc/ChangeLog

+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

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);