From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Sun, 13 Oct 2019 11:42:15 +0000 (+0000)
Subject: Remove dg-add-options c99_runtime
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=855c21cb9af3e00ac10533f0525b038cf77eaa49;p=gcc.git

Remove dg-add-options c99_runtime

	gcc:
	* doc/sourcebuild.texi (Test Directives, Add Options): Remove
	c99_runtime.

	gcc/testsuite:
	* lib/target-supports.exp (add_options_for_c99_runtime): Remove.
	(check_effective_target_c99_runtime): Remove call to
	add_options_for_c99_runtime.

	* gcc.dg/builtins-18.c: Remove dg-add-options c99_runtime.
	* gcc.dg/builtins-20.c: Likewise.
	* gcc.dg/builtins-53.c: Likewise.
	* gcc.dg/builtins-55.c: Likewise.
	* gcc.dg/builtins-67.c: Likewise.
	* gcc.dg/c99-tgmath-1.c: Likewise.
	* gcc.dg/c99-tgmath-2.c: Likewise.
	* gcc.dg/c99-tgmath-3.c: Likewise.
	* gcc.dg/c99-tgmath-4.c: Likewise.
	* gcc.dg/ipa/inline-8.c: Likewise.
	* gcc.dg/ipa/ipa-icf-5.c: Likewise.
	* gcc.dg/ipa/ipa-icf-7.c: Likewise.
	* gcc.dg/nextafter-2.c: Likewise.
	* gcc.dg/pr42427.c: Likewise.
	* gcc.dg/pr78965.c: Likewise.
	* gcc.dg/single-precision-constant.c: Likewise.
	* gcc.dg/torture/builtin-convert-1.c: Likewise.
	* gcc.dg/torture/builtin-convert-2.c: Likewise.
	* gcc.dg/torture/builtin-convert-3.c: Likewise.
	* gcc.dg/torture/builtin-convert-4.c: Likewise.
	* gcc.dg/torture/builtin-fp-int-inexact.c: Likewise.
	* gcc.dg/torture/builtin-fp-int-inexact-c2x.c: Likewise.
	* gcc.dg/torture/builtin-integral-1.c: Likewise.
	* gcc.dg/torture/builtin-power-1.c: Likewise.
	* gcc.dg/tree-ssa/copy-sign-1.c: Likewise.
	* gcc.dg/tree-ssa/minmax-2.c: Likewise.
	* gcc.dg/tree-ssa/mult-abs-2.c: Likewise.
	* gcc.target/i386/387-builtin-fp-int-inexact.c: Likewise.
	* gcc.target/i386/387-rint-inline-1.c: Likewise.
	* gcc.target/i386/387-rint-inline-2.c: Likewise.
	* gcc.target/i386/conversion.c: Likewise.
	* gcc.target/i386/pr47312.c: Likewise.
	* gcc.target/i386/sse2-builtin-fp-int-inexact.c: Likewise.
	* gcc.target/i386/sse2-rint-inline-1.c: Likewise.
	* gcc.target/i386/sse2-rint-inline-2.c: Likewise.
	* gcc.target/i386/sse4_1-builtin-fp-int-inexact.c: Likewise.
	* gcc.target/i386/sse4_1-rint-inline.c: Likewise.

From-SVN: r276937
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4df0e0dfc3a..44753c8b9bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* doc/sourcebuild.texi (Test Directives, Add Options): Remove
+	c99_runtime.
+
 2019-10-12  Jan Hubicka  <hubicka@ucw.cz>
 
 	* lto-streamer-out.c (collect_block_tree_leafs): Renumber statements
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 56967928de6..42a10cf2243 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -2528,9 +2528,6 @@ instructions, if this is supported by the target; see the
 Add the target-specific flags needed to enable functions to bind
 locally when using pic/PIC passes in the testsuite.
 
-@item c99_runtime
-Add the target-specific flags needed to access the C99 runtime.
-
 @item float@var{n}
 Add the target-specific flags needed to use the @code{_Float@var{n}} type.
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2f46d4dd857..3117a07942c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,47 @@
+2019-10-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* lib/target-supports.exp (add_options_for_c99_runtime): Remove.
+	(check_effective_target_c99_runtime): Remove call to
+	add_options_for_c99_runtime.
+
+	* gcc.dg/builtins-18.c: Remove dg-add-options c99_runtime.
+	* gcc.dg/builtins-20.c: Likewise.
+	* gcc.dg/builtins-53.c: Likewise.
+	* gcc.dg/builtins-55.c: Likewise.
+	* gcc.dg/builtins-67.c: Likewise.
+	* gcc.dg/c99-tgmath-1.c: Likewise.
+	* gcc.dg/c99-tgmath-2.c: Likewise.
+	* gcc.dg/c99-tgmath-3.c: Likewise.
+	* gcc.dg/c99-tgmath-4.c: Likewise.
+	* gcc.dg/ipa/inline-8.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-5.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-7.c: Likewise.
+	* gcc.dg/nextafter-2.c: Likewise.
+	* gcc.dg/pr42427.c: Likewise.
+	* gcc.dg/pr78965.c: Likewise.
+	* gcc.dg/single-precision-constant.c: Likewise.
+	* gcc.dg/torture/builtin-convert-1.c: Likewise.
+	* gcc.dg/torture/builtin-convert-2.c: Likewise.
+	* gcc.dg/torture/builtin-convert-3.c: Likewise.
+	* gcc.dg/torture/builtin-convert-4.c: Likewise.
+	* gcc.dg/torture/builtin-fp-int-inexact.c: Likewise.
+	* gcc.dg/torture/builtin-fp-int-inexact-c2x.c: Likewise.
+	* gcc.dg/torture/builtin-integral-1.c: Likewise.
+	* gcc.dg/torture/builtin-power-1.c: Likewise.
+	* gcc.dg/tree-ssa/copy-sign-1.c: Likewise.
+	* gcc.dg/tree-ssa/minmax-2.c: Likewise.
+	* gcc.dg/tree-ssa/mult-abs-2.c: Likewise.
+	* gcc.target/i386/387-builtin-fp-int-inexact.c: Likewise.
+	* gcc.target/i386/387-rint-inline-1.c: Likewise.
+	* gcc.target/i386/387-rint-inline-2.c: Likewise.
+	* gcc.target/i386/conversion.c: Likewise.
+	* gcc.target/i386/pr47312.c: Likewise.
+	* gcc.target/i386/sse2-builtin-fp-int-inexact.c: Likewise.
+	* gcc.target/i386/sse2-rint-inline-1.c: Likewise.
+	* gcc.target/i386/sse2-rint-inline-2.c: Likewise.
+	* gcc.target/i386/sse4_1-builtin-fp-int-inexact.c: Likewise.
+	* gcc.target/i386/sse4_1-rint-inline.c: Likewise.
+
 2019-10-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/92063
diff --git a/gcc/testsuite/gcc.dg/builtins-18.c b/gcc/testsuite/gcc.dg/builtins-18.c
index 9afaca23ada..4501cc14bce 100644
--- a/gcc/testsuite/gcc.dg/builtins-18.c
+++ b/gcc/testsuite/gcc.dg/builtins-18.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-20.c b/gcc/testsuite/gcc.dg/builtins-20.c
index 2b634286583..8f864f62495 100644
--- a/gcc/testsuite/gcc.dg/builtins-20.c
+++ b/gcc/testsuite/gcc.dg/builtins-20.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-53.c b/gcc/testsuite/gcc.dg/builtins-53.c
index 9a50bf5ad3c..e01908c26a7 100644
--- a/gcc/testsuite/gcc.dg/builtins-53.c
+++ b/gcc/testsuite/gcc.dg/builtins-53.c
@@ -10,7 +10,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-55.c b/gcc/testsuite/gcc.dg/builtins-55.c
index 0db7976a480..76786fb6b80 100644
--- a/gcc/testsuite/gcc.dg/builtins-55.c
+++ b/gcc/testsuite/gcc.dg/builtins-55.c
@@ -1,6 +1,5 @@
 /* { dg-do link } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-67.c b/gcc/testsuite/gcc.dg/builtins-67.c
index 0992fe1597f..36b7886b16a 100644
--- a/gcc/testsuite/gcc.dg/builtins-67.c
+++ b/gcc/testsuite/gcc.dg/builtins-67.c
@@ -2,7 +2,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math -lm" }  */
-/* { dg-add-options c99_runtime } */
 /* Bionic doesn't have rintl */
 /* { dg-require-effective-target non_bionic } */
 
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-1.c b/gcc/testsuite/gcc.dg/c99-tgmath-1.c
index cfa02a91d33..cfcba8369d5 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-1.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-1.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do preprocess { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that tgmath defines the macros it's supposed to. */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-2.c b/gcc/testsuite/gcc.dg/c99-tgmath-2.c
index 1a1153cc6ea..7b0cfa4c6dd 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-2.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-2.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that invoking type-generic sin on a float invokes sinf. */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-3.c b/gcc/testsuite/gcc.dg/c99-tgmath-3.c
index a595cf68559..8ed8b30f8ab 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-3.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-3.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that invoking type-generic exp on a complex invokes cexp. */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-4.c b/gcc/testsuite/gcc.dg/c99-tgmath-4.c
index c05a1c59ebc..f66bcdffaea 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-4.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-4.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that invoking type-generic pow on complex float invokes cpowf. */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-8.c b/gcc/testsuite/gcc.dg/ipa/inline-8.c
index df4a64deff9..388283ca213 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-8.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-8.c
@@ -3,7 +3,6 @@
 /* { dg-do run } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2"  } */
-/* { dg-add-options c99_runtime } */
 #include <math.h>
 extern int isnanf (float);
 /* Can't be inlined because isnanf will be optimized out.  */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
index 40d71740f65..1125bbd80c5 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
@@ -1,6 +1,5 @@
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-O2 -fdump-ipa-icf-optimized"  } */
-/* { dg-add-options c99_runtime } */
 
 #include <complex.h>
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
index 87a6d261b3b..d498b10255b 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
@@ -1,6 +1,5 @@
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-O2 -fdump-ipa-icf-optimized"  } */
-/* { dg-add-options c99_runtime } */
 
 #include <complex.h>
 
diff --git a/gcc/testsuite/gcc.dg/nextafter-2.c b/gcc/testsuite/gcc.dg/nextafter-2.c
index 0bde721b338..e51ae94be0c 100644
--- a/gcc/testsuite/gcc.dg/nextafter-2.c
+++ b/gcc/testsuite/gcc.dg/nextafter-2.c
@@ -3,7 +3,6 @@
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2 -fno-builtin" } */
 /* { dg-add-options ieee } */
-/* { dg-add-options c99_runtime } */
 
 #include <stdlib.h>
 
diff --git a/gcc/testsuite/gcc.dg/pr42427.c b/gcc/testsuite/gcc.dg/pr42427.c
index cb290fea3f1..b5a51cc3221 100644
--- a/gcc/testsuite/gcc.dg/pr42427.c
+++ b/gcc/testsuite/gcc.dg/pr42427.c
@@ -1,6 +1,5 @@
 /* { dg-do assemble { target c99_runtime } } */
 /* { dg-options "-O2 -fexceptions -fnon-call-exceptions -fpeel-loops" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target exceptions } */
 
diff --git a/gcc/testsuite/gcc.dg/pr78965.c b/gcc/testsuite/gcc.dg/pr78965.c
index 9ae1ad4a56c..43da70b29e1 100644
--- a/gcc/testsuite/gcc.dg/pr78965.c
+++ b/gcc/testsuite/gcc.dg/pr78965.c
@@ -1,7 +1,6 @@
 /* PR tree-optimization/78965 */
 /* { dg-do run { target c99_runtime } } */
 /* { dg-options "-O2" } */
-/* { dg-add-options c99_runtime } */
 
 int
 main ()
diff --git a/gcc/testsuite/gcc.dg/single-precision-constant.c b/gcc/testsuite/gcc.dg/single-precision-constant.c
index ffd893d93ad..f1a9dc846a9 100644
--- a/gcc/testsuite/gcc.dg/single-precision-constant.c
+++ b/gcc/testsuite/gcc.dg/single-precision-constant.c
@@ -4,7 +4,6 @@
 
 /* { dg-do run } */
 /* { dg-options "-fsingle-precision-constant" } */
-/* { dg-add-options c99_runtime } */
 
 #include <math.h>
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c
index eecd2b3d275..31aadffe9f2 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target c99_runtime } */
 
 #include "../builtins-config.h"
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c
index 167ecddcb9a..385098619af 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "../builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c
index 2034b4190cf..520871f421b 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "../builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
index acf89cef843..f201f156613 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
@@ -7,7 +7,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-ftrapping-math -fdump-tree-original" } */
-/* { dg-add-options c99_runtime } */
 
 #include "../builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
index 039cb5392fe..739a78cb6fb 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
@@ -1,7 +1,6 @@
 /* Test C2X enables -fno-fp-int-builtin-inexact.  */
 /* { dg-do run } */
 /* { dg-options "-std=c2x" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 
 #include "builtin-fp-int-inexact.c"
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c
index 80458fa6274..b192d38a730 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact.  */
 /* { dg-do run } */
 /* { dg-options "-fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c b/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c
index 74d4ab047c6..f6ac248620d 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c
@@ -10,7 +10,6 @@
    that various math functions are marked const/pure and can be
    folded.  */
 /* { dg-options "-ffinite-math-only -fno-math-errno" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-skip-if "" { *-*-* } { "-O0" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-power-1.c b/gcc/testsuite/gcc.dg/torture/builtin-power-1.c
index 9e7c25adb3d..e422b0c187c 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-power-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-power-1.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-skip-if "PR44214" { *-*-* } { "-O0" } { "" } } */
 
 #include "../builtins-config.h"
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c b/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c
index de3e7b242ce..c36112a6567 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2 -ffast-math -fdump-tree-gimple" } */
-/* { dg-add-options c99_runtime } */
 float f(float x)
 {
   return (x > 0.f ? -1.f : 1.f);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c
index 87ff94cef1f..8990c188e05 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O -fstrict-overflow -fdump-tree-optimized" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target c99_runtime } */
 
 static int max(int a,int b){return (a<b)?b:a;}
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c b/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c
index d74ba2fe630..a41f1baf256 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2 -ffast-math -fdump-tree-gimple" } */
-/* { dg-add-options c99_runtime } */
 
 float f(float x)
 {
diff --git a/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c b/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c
index 752b487825e..89983c3e4a4 100644
--- a/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact for 387.  */
 /* { dg-do run } */
 /* { dg-options "-O2 -mfancy-math-387 -mfpmath=387 -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 
 #include "../../gcc.dg/torture/builtin-fp-int-inexact.c"
diff --git a/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c b/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c
index 522edff611a..06906d6932d 100644
--- a/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c
+++ b/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c
@@ -2,7 +2,6 @@
    should be expanded when spurious "inexact" allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -mfancy-math-387 -mfpmath=387 -ffp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 
 #define TEST(FN, TYPE)				\
   do						\
diff --git a/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c b/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c
index be765a7a39f..4cb82193916 100644
--- a/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c
+++ b/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c
@@ -2,7 +2,6 @@
    should be expanded even when spurious "inexact" not allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -mfancy-math-387 -mfpmath=387 -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 
 #define TEST(FN, TYPE)				\
   do						\
diff --git a/gcc/testsuite/gcc.target/i386/conversion.c b/gcc/testsuite/gcc.target/i386/conversion.c
index c1718f02736..bc7121119ba 100644
--- a/gcc/testsuite/gcc.target/i386/conversion.c
+++ b/gcc/testsuite/gcc.target/i386/conversion.c
@@ -2,7 +2,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" }  */
-/* { dg-add-options c99_runtime } */
 
 #include "../../gcc.dg/builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/pr47312.c b/gcc/testsuite/gcc.target/i386/pr47312.c
index 03769a1cf81..ec4b51cb921 100644
--- a/gcc/testsuite/gcc.target/i386/pr47312.c
+++ b/gcc/testsuite/gcc.target/i386/pr47312.c
@@ -4,7 +4,6 @@
 /* { dg-require-effective-target xop } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O -flto -mno-sse3 -mxop" } */
-/* { dg-add-options c99_runtime } */
 
 extern double fma (double, double, double);
 extern float fmaf (float, float, float);
diff --git a/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c b/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c
index 10015972049..2226e6a231b 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact for SSE 2.  */
 /* { dg-do run } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 /* { dg-require-effective-target sse2 } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c
index 06baed2046a..23c979771cc 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c
@@ -2,7 +2,6 @@
    should be expanded when spurious "inexact" allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse -ffp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target sse2 } */
 
 #define TEST(FN, TYPE)				\
diff --git a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c
index 3ebf7a7af69..28968259dc4 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c
@@ -2,7 +2,6 @@
    should be expanded even when spurious "inexact" not allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target sse2 } */
 
 #define TEST(FN, TYPE)				\
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c b/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c
index 4c9244d0544..c1c8a19d4db 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact for SSE 4.1.  */
 /* { dg-do run } */
 /* { dg-options "-O2 -msse4.1 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 /* { dg-require-effective-target sse4 } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c b/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c
index 6d60da33cb7..995c14cefa1 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c
@@ -2,7 +2,6 @@
    when spurious "inexact" not allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -msse4.1 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target sse4 } */
 
 #define TEST(FN, TYPE)				\
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index f8a235d5c87..6f224fa8141 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -7478,18 +7478,6 @@ proc check_effective_target_fd_truncate { } {
     return [check_runtime chsize $prog]
 }
 
-# Add to FLAGS all the target-specific flags needed to access the c99 runtime.
-
-proc add_options_for_c99_runtime { flags } {
-    if { [istarget *-*-solaris2*] } {
-	return "$flags -std=c99"
-    }
-    if { [istarget powerpc-*-darwin*] } {
-	return "$flags -mmacosx-version-min=10.3"
-    }
-    return $flags
-}
-
 # Add to FLAGS all the target-specific flags needed to enable
 # full IEEE compliance mode.
 
@@ -7571,8 +7559,7 @@ proc check_effective_target_c99_runtime { } {
 	    #error !HAVE_C99_RUNTIME
 	    #endif
 	}
-	check_no_compiler_messages_nocache c99_runtime assembly \
-	    $contents [add_options_for_c99_runtime ""]
+	check_no_compiler_messages_nocache c99_runtime assembly $contents
     }]
 }