[AArch64] Fix TARGET_FLOAT and TARGET_SIMD macros.

	* config/aarch64/aarch64.h (TARGET_SIMD): Take AARCH64_ISA_SIMD
	into account.
	(TARGET_FLOAT): Take AARCH64_ISA_FP into account.

From-SVN: r210004

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c70a8ea4dfbefbc38e84436b5a3b93b41eff77af..fe509cb4e0267cb1aa04a376f85990ab23780a2e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-02  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       * config/aarch64/aarch64.h (TARGET_SIMD): Take AARCH64_ISA_SIMD
+       into account.
+       (TARGET_FLOAT): Take AARCH64_ISA_FP into account.
+
 2014-04-30  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        Back port from mainline

diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index c3efd2a887f574467589db74e4e7399ec285697d..19ac5ebc4fb5610936231e73ca54ea656c37937c 100644 (file)
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
@@ -73,9 +73,9 @@
 #define WORDS_BIG_ENDIAN (BYTES_BIG_ENDIAN)
 
 /* AdvSIMD is supported in the default configuration, unless disabled by
-   -mgeneral-regs-only.  */
-#define TARGET_SIMD !TARGET_GENERAL_REGS_ONLY
-#define TARGET_FLOAT !TARGET_GENERAL_REGS_ONLY
+   -mgeneral-regs-only or the +nosimd extension.  */
+#define TARGET_SIMD (!TARGET_GENERAL_REGS_ONLY && AARCH64_ISA_SIMD)
+#define TARGET_FLOAT (!TARGET_GENERAL_REGS_ONLY && AARCH64_ISA_FP)
 
 #define UNITS_PER_WORD         8