From: Uros Bizjak <uros@gcc.gnu.org>
Date: Tue, 30 Aug 2011 17:52:29 +0000 (+0200)
Subject: i386.c (ix86_valid_target_attribute_inner_p): Handle FMA option.
X-Git-Tag: releases/gcc-4.7.0~4089
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c683a53ae1ce9f41e96074a1695d5f3c8a03d8d8;p=thirdparty%2Fgcc.git

i386.c (ix86_valid_target_attribute_inner_p): Handle FMA option.

	* config/i386/i386.c (ix86_valid_target_attribute_inner_p):
	Handle FMA option.

testsuite/ChangeLog:

	* gcc.target/i386/fma-compile.c: Escape [ and ] in scan strings.

From-SVN: r178337
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 911c9ec8c3c7..da9fec0088d1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.c (ix86_valid_target_attribute_inner_p):
+	Handle FMA option.
+
 2011-08-30  Andrew Stubbs  <ams@codesourcery.com>
 
 	* config/arm/arm.c (optimal_immediate_sequence_1): Make b1, b2,
@@ -67,7 +72,7 @@
 
 	* coverage.c (coverage_init): Check flag_branch_probabilities instead of
 	flag_profile_use.
-	
+
 2011-08-29  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	* config/rs6000/rs6000.opt (-msave-toc-indirect): Change default
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 504f013088ea..d0e1be5df4a3 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -4076,6 +4076,7 @@ ix86_valid_target_attribute_inner_p (tree args, char *p_strings[],
     IX86_ATTR_ISA ("sse4a",	OPT_msse4a),
     IX86_ATTR_ISA ("ssse3",	OPT_mssse3),
     IX86_ATTR_ISA ("fma4",	OPT_mfma4),
+    IX86_ATTR_ISA ("fma",	OPT_mfma),
     IX86_ATTR_ISA ("xop",	OPT_mxop),
     IX86_ATTR_ISA ("lwp",	OPT_mlwp),
     IX86_ATTR_ISA ("fsgsbase",	OPT_mfsgsbase),
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a1771f7d261..a8fbdd6de86c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-30  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/fma-compile.c: Escape [ and ] in scan strings.
+
 2011-08-30  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/specs/aggr3.ads: New test.
@@ -60,9 +64,10 @@
 
 2011-08-30  Christian Bruel  <christian.bruel@st.com>
 
-	* g++.dg/bprob/bprob.exp (feedback_options): Set -fbranch-probabilities.
+	* g++.dg/bprob/bprob.exp (feedback_options): Set
+	-fbranch-probabilities.
 	* gcc.misc-tests/bprob.exp (feedback_options): Likewise.
-	
+
 2011-08-29  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50224
@@ -1097,7 +1102,7 @@
 	* gcc.dg/pr49860.c: New.
 
 2011-08-06  Nicola Pero  <nicola.pero@meta-innovation.com>
-	
+
 	PR libobjc/49882
 	* objc.dg/gnu-api-2-class.m (main): Test class_getSuperclass()
 	with classes that are in construction.
diff --git a/gcc/testsuite/gcc.target/i386/fma-compile.c b/gcc/testsuite/gcc.target/i386/fma-compile.c
index 6d5daa55c27a..0445f7bc0ad5 100644
--- a/gcc/testsuite/gcc.target/i386/fma-compile.c
+++ b/gcc/testsuite/gcc.target/i386/fma-compile.c
@@ -199,23 +199,23 @@ check_mm256_fmsubadd_ps (__m256 a, __m256 b, __m256 c)
 }
 
 
-/* { dg-final { scan-assembler-times "vfmadd[^s]..ps" 2 } } */
-/* { dg-final { scan-assembler-times "vfmsub[^s]..ps" 2 } } */
+/* { dg-final { scan-assembler-times "vfmadd\[^s\]..ps" 2 } } */
+/* { dg-final { scan-assembler-times "vfmsub\[^s\]..ps" 2 } } */
 /* { dg-final { scan-assembler-times "vfnmadd...ps" 2 } } */
 /* { dg-final { scan-assembler-times "vfnmsub...ps" 2 } } */
 /* { dg-final { scan-assembler-times "vfmaddsub...ps" 2 } } */
 /* { dg-final { scan-assembler-times "vfmsubadd...ps" 2 } } */
-/* { dg-final { scan-assembler-times "vfmadd[^s]..pd" 2 } } */
-/* { dg-final { scan-assembler-times "vfmsub[^s]..pd" 2 } } */
+/* { dg-final { scan-assembler-times "vfmadd\[^s\]..pd" 2 } } */
+/* { dg-final { scan-assembler-times "vfmsub\[^s\]..pd" 2 } } */
 /* { dg-final { scan-assembler-times "vfnmadd...pd" 2 } } */
 /* { dg-final { scan-assembler-times "vfnmsub...pd" 2 } } */
 /* { dg-final { scan-assembler-times "vfmaddsub...pd" 2 } } */
 /* { dg-final { scan-assembler-times "vfmsubadd...pd" 2 } } */
-/* { dg-final { scan-assembler-times "vfmadd[^s]..ss" 1 } } */
-/* { dg-final { scan-assembler-times "vfmsub[^s]..ss" 1 } } */
+/* { dg-final { scan-assembler-times "vfmadd\[^s\]..ss" 1 } } */
+/* { dg-final { scan-assembler-times "vfmsub\[^s\]..ss" 1 } } */
 /* { dg-final { scan-assembler-times "vfnmadd...ss" 1 } } */
 /* { dg-final { scan-assembler-times "vfnmsub...ss" 1 } } */
-/* { dg-final { scan-assembler-times "vfmadd[^s]..sd" 1 } } */
-/* { dg-final { scan-assembler-times "vfmsub[^s]..sd" 1 } } */
+/* { dg-final { scan-assembler-times "vfmadd\[^s\]..sd" 1 } } */
+/* { dg-final { scan-assembler-times "vfmsub\[^s\]..sd" 1 } } */
 /* { dg-final { scan-assembler-times "vfnmadd...sd" 1 } } */
 /* { dg-final { scan-assembler-times "vfnmsub...sd" 1 } } */