2007-03-22 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/21_strings/headers/cstdlib/functions_std.cc: Without
	C99 support, _GLIBCXX_USE_WCHAR_T not defined, so
	dg-require-c-std.
	* testsuite/tr1/6_containers/headers/functional/synopsis.cc: Same.
	* testsuite/27_io/headers/iostream/synopsis.cc: Same.
	* testsuite/27_io/headers/streambuf/types_std.cc: Same.
	* testsuite/27_io/headers/sstream/types_std.cc: Same.
	* testsuite/27_io/headers/ostream/types_std.cc: Same.
	* testsuite/27_io/headers/istream/types_std.cc: Same.
	* testsuite/27_io/headers/iostream/types_std.cc: Same.
	* testsuite/27_io/headers/fstream/types_std.cc: Same.
	* testsuite/21_strings/headers/string/types_std.cc: Same.
	* testsuite/21_strings/headers/cwctype/functions_std.cc: Same.
	* testsuite/21_strings/headers/cwctype/types_std.cc: Same.
	* testsuite/21_strings/headers/cwchar/functions_std.cc: Same.
	* testsuite/21_strings/headers/cwchar/types_std.cc: Same.

	* include/Makefile.am (c_compatibility_headers): Add fenv.h.
	* include/Makefile.in: Regenerate.
	* configure.host: Update comment.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123130 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a01ad6762139c888c5b7e5ba171faa7b4ec29fd4..fea34d7b5a1a9689ce028d2a4e927d1fc5c6c7e5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,28 @@
+2007-03-22  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * testsuite/21_strings/headers/cstdlib/functions_std.cc: Without
+       C99 support, _GLIBCXX_USE_WCHAR_T not defined, so
+       dg-require-c-std.
+       * testsuite/tr1/6_containers/headers/functional/synopsis.cc: Same.
+       * testsuite/27_io/headers/iostream/synopsis.cc: Same.
+       * testsuite/27_io/headers/streambuf/types_std.cc: Same.
+       * testsuite/27_io/headers/sstream/types_std.cc: Same.
+       * testsuite/27_io/headers/ostream/types_std.cc: Same.
+       * testsuite/27_io/headers/istream/types_std.cc: Same.
+       * testsuite/27_io/headers/iostream/types_std.cc: Same.
+       * testsuite/27_io/headers/fstream/types_std.cc: Same.
+       * testsuite/21_strings/headers/string/types_std.cc: Same.
+       * testsuite/21_strings/headers/cwctype/functions_std.cc: Same.
+       * testsuite/21_strings/headers/cwctype/types_std.cc: Same.
+       * testsuite/21_strings/headers/cwchar/functions_std.cc: Same.
+       * testsuite/21_strings/headers/cwchar/types_std.cc: Same.
+       
+       * include/Makefile.am (c_compatibility_headers): Add fenv.h.
+       * include/Makefile.in: Regenerate.
+       * configure.host: Update comment.
+
+       * include/tr1/cfenv: Use include_next.
+
 2007-03-19  Paolo Carlini  <pcarlini@suse.de>
 
        * include/tr1/tuple (get(_Tuple_impl<>&, get(const _Tuple_impl<>&):

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 4a0b4dbcbf75f8f091a0d98d3cad4d037574d948..6fe4140be79ed3b37b2c988d652ebceab4fd4b1f 100644 (file)
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -22,7 +22,7 @@
 #
 #   os_include_dir         OS-specific directory, defaults to os/generic.
 #
-#   c_model                the "C" header model, defaults to c_std.
+#   c_model                the "C" header model, defaults to c_global.
 #
 #   c_compatibility        if "C" compatibility headers are necessary,
 #                          defaults to no.

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index e3ca800a27e3bca66fc42dc3581cb7a406dba6e1..9e34d7447c3f152b1df595569dc985f8078d4401 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -635,6 +635,7 @@ endif
 if GLIBCXX_C_HEADERS_C_GLOBAL
 c_compatibility_headers = \
        ${c_compatibility_srcdir}/complex.h \
+       ${c_compatibility_srcdir}/fenv.h \
        ${c_compatibility_srcdir}/tgmath.h 
 endif
 

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 02de25c272fde410ca587cb4e00db621d5083059..83533330d5c239b38d6d1d7e6e192b6d15ceb27b 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -860,6 +860,7 @@ c_compatibility_srcdir = ${glibcxx_srcdir}/include/c_compatibility
 c_compatibility_builddir = .
 @GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@c_compatibility_headers = \
 @GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@      ${c_compatibility_srcdir}/complex.h \
+@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@      ${c_compatibility_srcdir}/fenv.h \
 @GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@      ${c_compatibility_srcdir}/tgmath.h 
 
 @GLIBCXX_C_HEADERS_C_STD_TRUE@c_compatibility_headers = 

diff --git a/libstdc++-v3/include/tr1/cfenv b/libstdc++-v3/include/tr1/cfenv
index a468526ab9ce59f9846c6959f511101919a12eb7..dc9fff8600a53f6357cf6ac6a2dbae11838252a1 100644 (file)
--- a/libstdc++-v3/include/tr1/cfenv
+++ b/libstdc++-v3/include/tr1/cfenv
@@ -38,7 +38,7 @@
 
 #if _GLIBCXX_USE_C99_FENV_TR1
 
-#include <fenv.h>
+#include_next <fenv.h>
 
 #undef feclearexcept
 #undef fegetexceptflag

diff --git a/libstdc++-v3/testsuite/21_strings/headers/cstdlib/functions_std.cc b/libstdc++-v3/testsuite/21_strings/headers/cstdlib/functions_std.cc
index 4840dfdf78f32aa2a9410518edee7f0bae1df16d..ce87fe9aa0e400e8ce43ea700e3bc147c8e932b9 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/cstdlib/functions_std.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/cstdlib/functions_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwchar/functions_std.cc b/libstdc++-v3/testsuite/21_strings/headers/cwchar/functions_std.cc
index 377cbdcd6edc793a67baa9254a9f1061330b6022..52ab9133b4192cdb5f03f60b6be07bb496a48426 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/cwchar/functions_std.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/cwchar/functions_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwchar/types_std.cc b/libstdc++-v3/testsuite/21_strings/headers/cwchar/types_std.cc
index f7cd6a7608ebb3d27fffa9c0d2a3fadf8123254a..b09d50ad13116b53f045d2e0db4f22b6aae87b8a 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/cwchar/types_std.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/cwchar/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwctype/functions_std.cc b/libstdc++-v3/testsuite/21_strings/headers/cwctype/functions_std.cc
index 88871fa07ce2fbc88e2da347a6b7a79cf501aadd..a8a56d2121f523fc7400f47b6ce5a95dd828aa00 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/cwctype/functions_std.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/cwctype/functions_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwctype/types_std.cc b/libstdc++-v3/testsuite/21_strings/headers/cwctype/types_std.cc
index f8a48cfa96f1978013dabc99abf62ee4b3b08d28..6ba3ea04d877de3ef8b494007f3a2ba4c2d7a64b 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/cwctype/types_std.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/cwctype/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/21_strings/headers/string/types_std.cc b/libstdc++-v3/testsuite/21_strings/headers/string/types_std.cc
index 40731c40946c01f81ccf902423086863e1f35d17..a9a718fcb9f8ce118d9320ac47367e8cfe9b62c5 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/headers/string/types_std.cc
+++ b/libstdc++-v3/testsuite/21_strings/headers/string/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/27_io/headers/fstream/types_std.cc b/libstdc++-v3/testsuite/27_io/headers/fstream/types_std.cc
index 9707680a9d59ac217c24721d3d45675bb2f99b42..392f3ada2359c6e0996dff388c901181a64eb87b 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/fstream/types_std.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/fstream/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/27_io/headers/iostream/synopsis.cc b/libstdc++-v3/testsuite/27_io/headers/iostream/synopsis.cc
index b2f0e2f02f7fc2822d7d97afb23930af4d58ca89..2e559ed4b5106abc56191731c3dacf58cc51788b 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/iostream/synopsis.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/iostream/synopsis.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/27_io/headers/iostream/types_std.cc b/libstdc++-v3/testsuite/27_io/headers/iostream/types_std.cc
index 881b52ba0c59e312204d747401b09b2dcaa8d893..731964554a1c202ceb606685c0fd34d0f536782b 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/iostream/types_std.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/iostream/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/27_io/headers/istream/types_std.cc b/libstdc++-v3/testsuite/27_io/headers/istream/types_std.cc
index 16f9680ce23b63317203470dd6156985941ef7af..265de49bbafb907d1fafd89c3ea3ea50797562f6 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/istream/types_std.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/istream/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/27_io/headers/ostream/types_std.cc b/libstdc++-v3/testsuite/27_io/headers/ostream/types_std.cc
index 973b2a00e81edaf4d9c7c0f657d9ccb2f808b19d..78e5a4d7adf48c246ad05adc9084606001078a8a 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/ostream/types_std.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/ostream/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/27_io/headers/sstream/types_std.cc b/libstdc++-v3/testsuite/27_io/headers/sstream/types_std.cc
index c6ebcbbb9ef2b934f43c642f42e95490db0ddbc3..19298e3eea13eb547afb97b470b26accf9fd2182 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/sstream/types_std.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/sstream/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/27_io/headers/streambuf/types_std.cc b/libstdc++-v3/testsuite/27_io/headers/streambuf/types_std.cc
index ca112544b6ff04e2585f9812edd9369f3ece22e6..3f4fdd59514026d7ff2d243b2640dba22a0a54d6 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/streambuf/types_std.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/streambuf/types_std.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // Copyright (C) 2007 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index a8e8a31d9557015aaf499fc7213c22c3f906182a..3c1cd5d5286661efa5fd845e1bcef8b66f4295d0 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -579,6 +579,7 @@ proc check_v3_target_fileio { } {
     return $et_fileio_saved
 }
 
+# Eventually we want C90/C99 determining and switching from this.
 proc check_v3_target_c_std { } {
     global et_c_std_saved
     global et_c_std_target_name
@@ -606,15 +607,19 @@ proc check_v3_target_c_std { } {
 
        # Set up, compile, and execute a C++ test program that tries to use
        # C99 functionality.
+        # For math bits, could use check_effective_target_c99_math.
        set src fileio[pid].cc
        set exe fileio[pid].x
 
        set f [open $src "w"]
        puts $f "#include <tr1/cmath>"
+       puts $f "#include <cstdlib>"
        puts $f "int main ()"
        puts $f "{"
        puts $f "  float f = 45.55;"
        puts $f "  int i = std::tr1::isnan(f);"
+       puts $f "  "
+       puts $f "  using std::wctomb;"
        puts $f "  return 0;"
        puts $f "}" 
        close $f

diff --git a/libstdc++-v3/testsuite/tr1/6_containers/headers/functional/synopsis.cc b/libstdc++-v3/testsuite/tr1/6_containers/headers/functional/synopsis.cc
index 682593c295aa5ec5663af13f33cdcb49dfce24fc..c4e2e9c3160eb537a10104a6524d3fc2902eddbf 100644 (file)
--- a/libstdc++-v3/testsuite/tr1/6_containers/headers/functional/synopsis.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/headers/functional/synopsis.cc
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-require-c-std "" }
 
 // 2007-02-04  Benjamin Kosnik  <bkoz@redhat.com>
 //