Revert:

	* gcc.dg/builtins-config.h: Ensure we use -std=c99 on solaris2.
	* gcc.dg/torture/builtin-convert-1.c,
	gcc.dg/torture/builtin-convert-2.c,
	gcc.dg/torture/builtin-convert-3.c,
	gcc.dg/torture/builtin-power-1.c: Use -std=c99 on solaris2.
	* gcc.dg/builtins-18.c: Always use link_error(), which is
	prototyped.

	Revert Backport:
	2006-03-21  Eric Botcazou  <ebotcazou@libertysurf.fr>

	* gcc.dg/builtins-config.h (Solaris case): Define HAVE_C99_RUNTIME
	if _STDC_C99 is defined.
	* gcc.dg/builtins-18.c: Pass -std=c99 on Solaris.
	* gcc.dg/builtins-20.c: Likewise.

From-SVN: r117707

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d1fa3199317158700b425e6d13f2ddca1529026e..504341df14e6ffcdf217bced023521d1832b6076 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2006-10-13  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       Revert:
+       
+       * gcc.dg/builtins-config.h: Ensure we use -std=c99 on solaris2.
+       * gcc.dg/torture/builtin-convert-1.c,
+       gcc.dg/torture/builtin-convert-2.c,
+       gcc.dg/torture/builtin-convert-3.c,
+       gcc.dg/torture/builtin-power-1.c: Use -std=c99 on solaris2.
+       * gcc.dg/builtins-18.c: Always use link_error(), which is
+       prototyped.
+
+       Revert Backport:
+       2006-03-21  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * gcc.dg/builtins-config.h (Solaris case): Define HAVE_C99_RUNTIME
+       if _STDC_C99 is defined.
+       * gcc.dg/builtins-18.c: Pass -std=c99 on Solaris.
+       * gcc.dg/builtins-20.c: Likewise.
+
 2006-10-11  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR C++/28302

diff --git a/gcc/testsuite/gcc.dg/builtins-18.c b/gcc/testsuite/gcc.dg/builtins-18.c
index 3a3872d1805199fb454031d60b023ba2d016cb18..a47de8b609eedee82beac0c9dc0047e6f83d3c4a 100644 (file)
--- 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-options "-O2 -ffast-math -std=c99" { target *-*-solaris2* } } */
 
 #include "builtins-config.h"
 
@@ -33,9 +32,9 @@ main (void)
   if (__builtin_cabsf (fc) != 5.0F)
     link_error ();
   if (cabsf (3.0F + 4.0iF) != 5.0F)
-    link_error ();
+    link_failure ();
   if (__builtin_cabsf (3.0F + 4.0iF) != 5.0F)
-    link_error ();
+    link_failure ();
 #endif
 
   /* Test doubles.  */
@@ -44,9 +43,9 @@ main (void)
   if (__builtin_cabs (dc) != 5.0)
     link_error ();
   if (cabs (3.0 + 4.0i) != 5.0)
-    link_error ();
+    link_failure ();
   if (__builtin_cabs (3.0 + 4.0i) != 5.0)
-    link_error ();
+    link_failure ();
 
 #ifdef HAVE_C99_RUNTIME
   /* Test long doubles.  */
@@ -55,9 +54,9 @@ main (void)
   if (__builtin_cabsl (ldc) != 5.0L)
     link_error ();
   if (cabsl (3.0L + 4.0iL) != 5.0L)
-    link_error ();
+    link_failure ();
   if (__builtin_cabsl (3.0L + 4.0iL) != 5.0L)
-    link_error ();
+    link_failure ();
 #endif
 
   return 0;

diff --git a/gcc/testsuite/gcc.dg/builtins-20.c b/gcc/testsuite/gcc.dg/builtins-20.c
index a41e00e40bcd8ef2c08ff2956de5af654b4ae42f..fb7dd95c84b970167fc05d6b73f2c901c13b7bda 100644 (file)
--- 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-options "-O2 -ffast-math -std=c99" { target *-*-solaris2* } } */
 
 #include "builtins-config.h"
 

diff --git a/gcc/testsuite/gcc.dg/builtins-config.h b/gcc/testsuite/gcc.dg/builtins-config.h
index 873e638c9a18f079e307f45a60b05ecee71e4b6b..05afc5ee567fc24ab35331d94f1c505265ba7ed3 100644 (file)
--- a/gcc/testsuite/gcc.dg/builtins-config.h
+++ b/gcc/testsuite/gcc.dg/builtins-config.h
@@ -11,15 +11,8 @@
 
 #if defined(__hppa) && defined(__hpux)
 /* PA HP-UX doesn't have the entire C99 runtime.  */
-#elif defined(__sun) && __STDC_VERSION__ - 0 < 199901L
-/* Solaris up to 9 doesn't have the entire C99 runtime.
-   Solaris 10 defines _STDC_C99 if __STDC_VERSION__ is >= 199901L.
-   But, if you're including this file, you probably want to test the
-   newer behaviour, so: */
-#error forgot to set -std=c99.
-#elif defined(__sun) && ! defined (_STDC_C99)
-/* Solaris up to 9 doesn't have the entire C99 runtime.
-   Solaris 10 defines _STDC_C99 if __STDC_VERSION__ is >= 199901L.  */
+#elif defined(__sun)
+/* Solaris doesn't have the entire C99 runtime.  */
 #elif defined(__sgi)
 /* Irix6 doesn't have the entire C99 runtime.  */
 #elif defined(__FreeBSD__) && (__FreeBSD__ < 5)

diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c
index 5e77c49e81ccd4038317f9f8ecd48e628d247129..ac671590d2043256e7a292f29d56d0763a443630 100644 (file)
--- 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-options "-ffast-math -std=c99" { target *-*-solaris2* } } */
 
 #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 03175f4a68d3b8b402978518ad580b1c01275aba..68fc071eb7dd8b8720584e4ace191da20f557fc8 100644 (file)
--- 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-options "-ffast-math -std=c99" { target *-*-solaris2* } } */
 
 #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 0773a01c9b7fae6b5aa08585e0e2ed53c814877b..9901ceccf819eebb8723a456371ee1b910a7bebb 100644 (file)
--- 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-options "-ffast-math -std=c99" { target *-*-solaris2* } } */
 
 #include "../builtins-config.h"
 

diff --git a/gcc/testsuite/gcc.dg/torture/builtin-power-1.c b/gcc/testsuite/gcc.dg/torture/builtin-power-1.c
index ede5d9c60d87f2e7aba32652f3d5e93bfa21e458..7cdc00c23fb0eb40db2dad89f7073037822013cc 100644 (file)
--- 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-options "-ffast-math -std=c99" { target *-*-solaris2* } } */
 
 #include "../builtins-config.h"