Use dg-additional-options for -std={gnu99,c99}

2015-06-15  Tom de Vries  <tom@codesourcery.com>

	* testsuite/libgomp.c/collapse-3.c: Use dg-additional-options for
	-std={gnu99,c99}.
	* testsuite/libgomp.c/for-1.c: Same.
	* testsuite/libgomp.c/for-2.c: Same.
	* testsuite/libgomp.c/for-3.c: Same.
	* testsuite/libgomp.c/pr35625.c: Same.
	* testsuite/libgomp.c/pr39154.c: Same.
	* testsuite/libgomp.c/simd-16.c: Same.
	* testsuite/libgomp.c/simd-17.c: Same.

From-SVN: r224479

9 files changed, 20 insertions, 8 deletions

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index a6d667dd04e..bf3ec49cece 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,15 @@
+2015-06-15  Tom de Vries  <tom@codesourcery.com>
+
+	* testsuite/libgomp.c/collapse-3.c: Use dg-additional-options for
+	-std={gnu99,c99}.
+	* testsuite/libgomp.c/for-1.c: Same.
+	* testsuite/libgomp.c/for-2.c: Same.
+	* testsuite/libgomp.c/for-3.c: Same.
+	* testsuite/libgomp.c/pr35625.c: Same.
+	* testsuite/libgomp.c/pr39154.c: Same.
+	* testsuite/libgomp.c/simd-16.c: Same.
+	* testsuite/libgomp.c/simd-17.c: Same.
+
 2015-06-13  Tom de Vries  <tom@codesourcery.com>
 
 	* testsuite/libgomp.c/parloops-exit-first-loop-alt-4.c: New test.
diff --git a/libgomp/testsuite/libgomp.c/collapse-3.c b/libgomp/testsuite/libgomp.c/collapse-3.c
index 4674f83f4b6..53a4fafb577 100644
--- a/libgomp/testsuite/libgomp.c/collapse-3.c
+++ b/libgomp/testsuite/libgomp.c/collapse-3.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -std=gnu99" } */
+/* { dg-additional-options "-std=gnu99" } */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.c/for-1.c b/libgomp/testsuite/libgomp.c/for-1.c
index e702453fb1a..942c8e7b821 100644
--- a/libgomp/testsuite/libgomp.c/for-1.c
+++ b/libgomp/testsuite/libgomp.c/for-1.c
@@ -1,4 +1,4 @@
-/* { dg-options "-std=gnu99 -fopenmp" } */
+/* { dg-additional-options "-std=gnu99" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/for-2.c b/libgomp/testsuite/libgomp.c/for-2.c
index ae810087454..e43fdb3c800 100644
--- a/libgomp/testsuite/libgomp.c/for-2.c
+++ b/libgomp/testsuite/libgomp.c/for-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-std=gnu99 -fopenmp" } */
+/* { dg-additional-options "-std=gnu99" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/for-3.c b/libgomp/testsuite/libgomp.c/for-3.c
index 06cbf4f9de1..f4cd115eefa 100644
--- a/libgomp/testsuite/libgomp.c/for-3.c
+++ b/libgomp/testsuite/libgomp.c/for-3.c
@@ -1,4 +1,4 @@
-/* { dg-options "-std=gnu99 -fopenmp" } */
+/* { dg-additional-options "-std=gnu99" } */
 
 extern void abort ();
 
diff --git a/libgomp/testsuite/libgomp.c/pr35625.c b/libgomp/testsuite/libgomp.c/pr35625.c
index f2978f91164..14c45d4d2b9 100644
--- a/libgomp/testsuite/libgomp.c/pr35625.c
+++ b/libgomp/testsuite/libgomp.c/pr35625.c
@@ -1,6 +1,6 @@
 /* PR libgomp/35625 */
 /* { dg-do run } */
-/* { dg-options "-std=c99" } */
+/* { dg-aditional-options "-std=c99" } */
 
 int
 main (void)
diff --git a/libgomp/testsuite/libgomp.c/pr39154.c b/libgomp/testsuite/libgomp.c/pr39154.c
index 5a4c89e13eb..6f7fccba254 100644
--- a/libgomp/testsuite/libgomp.c/pr39154.c
+++ b/libgomp/testsuite/libgomp.c/pr39154.c
@@ -1,6 +1,6 @@
 /* PR middle-end/39154 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -std=gnu99" } */
+/* { dg-additional-options "-std=gnu99" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/simd-16.c b/libgomp/testsuite/libgomp.c/simd-16.c
index c8c29c744d7..e1998e32733 100644
--- a/libgomp/testsuite/libgomp.c/simd-16.c
+++ b/libgomp/testsuite/libgomp.c/simd-16.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -std=c99" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
+/* { dg-additional-options "-std=c99" } */
 
 int
 main ()
diff --git a/libgomp/testsuite/libgomp.c/simd-17.c b/libgomp/testsuite/libgomp.c/simd-17.c
index 136e6e64ade..b884340e419 100644
--- a/libgomp/testsuite/libgomp.c/simd-17.c
+++ b/libgomp/testsuite/libgomp.c/simd-17.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -std=c99" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
+/* { dg-additional-options "-std=c99" } */
 
 static inline void
 foo (int *b, int *i, int *j, int x)