diff options
20 files changed, 48 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a01ad676213..fea34d7b5a1 100644 --- 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 4a0b4dbcbf7..6fe4140be79 100644 --- 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 e3ca800a27e..9e34d7447c3 100644 --- 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 02de25c272f..83533330d5c 100644 --- 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 a468526ab9c..dc9fff8600a 100644 --- 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 4840dfdf78f..ce87fe9aa0e 100644 --- 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 377cbdcd6ed..52ab9133b41 100644 --- 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 f7cd6a7608e..b09d50ad131 100644 --- 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 88871fa07ce..a8a56d2121f 100644 --- 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 f8a48cfa96f..6ba3ea04d87 100644 --- 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 40731c40946..a9a718fcb9f 100644 --- 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 9707680a9d5..392f3ada235 100644 --- 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 b2f0e2f02f7..2e559ed4b51 100644 --- 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 881b52ba0c5..731964554a1 100644 --- 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 16f9680ce23..265de49bbaf 100644 --- 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 973b2a00e81..78e5a4d7adf 100644 --- 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 c6ebcbbb9ef..19298e3eea1 100644 --- 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 ca112544b6f..3f4fdd59514 100644 --- 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 a8e8a31d955..3c1cd5d5286 100644 --- 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 682593c295a..c4e2e9c3160 100644 --- 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> // |