2000-05-10 Benjamin Kosnik <bkoz@redhat.com>

* bits/std_cmath.h: Tweaks. * math/mathconf.h: Tweaks and fixes for HP-UX 11. (sqrtf): Define away iff !builtin and !in <math.h>. (sinf): Same. (cosf): Same. (fabsf): Same. At some point this directory should be converted to c++, the autoconf tests should be run by the c++ compiler (not c), and <cmath> should be used instead of math.h. Move declaration of nan() here. * math/complex-stub.h (cabsl): Remove nan() declaration. Finish up FreeBSD4.0 support. * config/bsd/ctype.cc: Scope out toupper, tolower calls. * config/generic/ctype.cc: And here. * testsuite/21_strings/char_traits.cc (test02): Guard with _GLIBCPP_USE_WCHAR_T. via Phil Edwards <pme@sourceware.cygnus.com> * bits/std_cctype.h: Remove _GLIBCPP_USE_NAMESPACES. * acconfig.h: And here. * acinclude.m4: Same. * testsuite/27_io/istream.cc: And here. * testsuite/27_io/ostream.cc: And here. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33835 138bc75d-0d04-0410-961f-82ee72b054a4
author: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> 2000-05-11 02:40:34 +0000
committer: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> 2000-05-11 02:40:34 +0000
commit: 67b61273f0fd4b24c38485817bdec8cf9d076fcc (patch)
tree: e18ea6c352406e1c18bb32df73f14f884e4db083 /libstdc++-v3
parent: 63e33f9adac985516f4508f1c61346db15a2db18 (diff)
download: gcc-67b61273f0fd4b24c38485817bdec8cf9d076fcc.tar.gz
12 files changed, 265 insertions, 283 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9d6b1eeb0ae..309e506949f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,11 +1,30 @@
 2000-05-10  Benjamin Kosnik  <bkoz@redhat.com>
 
+	* bits/std_cmath.h: Tweaks.
+	* math/mathconf.h: Tweaks and fixes for HP-UX 11.
+	(sqrtf): Define away iff !builtin and !in <math.h>. 
+	(sinf): Same.
+	(cosf): Same.
+	(fabsf): Same.
+	At some point this directory should be converted to c++, the
+	autoconf tests should be run by the c++ compiler (not c), and
+	<cmath> should be used instead of math.h.
+	Move declaration of nan() here.
+	* math/complex-stub.h (cabsl): Remove nan() declaration.
+
 	Finish up FreeBSD4.0 support.
 	* config/bsd/ctype.cc: Scope out toupper, tolower calls.
 	* config/generic/ctype.cc: And here.
 	* testsuite/21_strings/char_traits.cc (test02): Guard with
 	_GLIBCPP_USE_WCHAR_T.
 
+	via Phil Edwards  <pme@sourceware.cygnus.com>
+	* bits/std_cctype.h: Remove _GLIBCPP_USE_NAMESPACES.
+	* acconfig.h: And here.
+	* acinclude.m4: Same.
+	* testsuite/27_io/istream.cc: And here.
+	* testsuite/27_io/ostream.cc: And here.
+
 2000-05-09  Benjamin Kosnik  <bkoz@gnu.org>
 
 	* acinclude.m4 (GLIBCPP_CHECK_CPU): Change powerpc bits to
diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h
index b7ef8c05016..be98cc196c1 100644
--- a/libstdc++-v3/acconfig.h
+++ b/libstdc++-v3/acconfig.h
@@ -1,12 +1,5 @@
 // acconfig.h symbols and macros for libstdc++ v3 -*- C++ -*-
 
-// If using the namespace std, you need this. Eventually this should
-// not be an option. In the meantime, and as things like std_ctype.h
-// need to be hacked out, give people the option. If this is set to 1,
-// CXXFLAGS should include -fhonor-std. If this is undefined, CXXFLAGS
-// should include -fno-honor-std.
-#undef _GLIBCPP_USE_NAMESPACES
-
 // Include support for 'long long' and 'unsigned long long'.
 #undef _GLIBCPP_USE_LONG_LONG
 
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index a8a9adaf5ce..fc86165973b 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -664,7 +664,7 @@ dnl Run through flags (either default or command-line) and set things.
 if test -n "$enable_cxx_flags"; then
     for f in $enable_cxx_flags; do
         case "$f" in
-            -fhonor-std)  AC_DEFINE(_GLIBCPP_USE_NAMESPACES) ;;
+            -fhonor-std)  ;;
             -*)  ;;
             *)   # and we're trying to pass /what/ exactly?
                  AC_MSG_ERROR([compiler flags start with a -]) ;;
@@ -680,7 +680,7 @@ dnl
 dnl Check for certain special build configurations.
 dnl
 dnl GLIBCPP_ENABLE_NAMESPACES
-dnl --enable-namespaces sets '-fhonor-std' and defines _GLIBCPP_USE_NAMESPACES
+dnl --enable-namespaces sets '-fhonor-std' and 
 dnl --disable-namespaces sets '-fno-honor-std' (the macro should be
 dnl     undefined by default in whatever.h.in).
 dnl  +  Eventually, this will go away.
@@ -702,7 +702,6 @@ enable_namespaces=GLIBCPP_ENABLE_NAMESPACES_DEFAULT)dnl
 dnl Option parsed, now set things appropriately
 case "$enable_namespaces" in
     yes)  NAMESPACES='-fhonor-std'
-          AC_DEFINE(_GLIBCPP_USE_NAMESPACES)
           ;;
     no)   NAMESPACES='-fno-honor-std'
           ;;
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 45c7328eec7..c5258815a6a 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -676,7 +676,7 @@ dnl Run through flags (either default or command-line) and set things.
 if test -n "$enable_cxx_flags"; then
     for f in $enable_cxx_flags; do
         case "$f" in
-            -fhonor-std)  AC_DEFINE(_GLIBCPP_USE_NAMESPACES) ;;
+            -fhonor-std)  ;;
             -*)  ;;
             *)   # and we're trying to pass /what/ exactly?
                  AC_MSG_ERROR([compiler flags start with a -]) ;;
@@ -692,7 +692,7 @@ dnl
 dnl Check for certain special build configurations.
 dnl
 dnl GLIBCPP_ENABLE_NAMESPACES
-dnl --enable-namespaces sets '-fhonor-std' and defines _GLIBCPP_USE_NAMESPACES
+dnl --enable-namespaces sets '-fhonor-std' and 
 dnl --disable-namespaces sets '-fno-honor-std' (the macro should be
 dnl     undefined by default in whatever.h.in).
 dnl  +  Eventually, this will go away.
@@ -714,7 +714,6 @@ enable_namespaces=GLIBCPP_ENABLE_NAMESPACES_DEFAULT)dnl
 dnl Option parsed, now set things appropriately
 case "$enable_namespaces" in
     yes)  NAMESPACES='-fhonor-std'
-          AC_DEFINE(_GLIBCPP_USE_NAMESPACES)
           ;;
     no)   NAMESPACES='-fno-honor-std'
           ;;
diff --git a/libstdc++-v3/bits/std_cctype.h b/libstdc++-v3/bits/std_cctype.h
index b3ce7d99305..4e106c58747 100644
--- a/libstdc++-v3/bits/std_cctype.h
+++ b/libstdc++-v3/bits/std_cctype.h
@@ -1,6 +1,6 @@
 // -*- C++ -*- forwarding header.
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -56,7 +56,7 @@ namespace std
 # undef toupper
   inline int 
   toupper(int __c) { return _S_toupper_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   toupper(int __c) { return ::toupper(__c); }
 #endif
@@ -67,7 +67,7 @@ namespace std
 # undef tolower
   inline int 
   tolower(int __c) { return _S_tolower_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   tolower(int __c) { return ::tolower(__c); }
 #endif
@@ -78,7 +78,7 @@ namespace std
 # undef isspace
   inline int 
   isspace(int __c) { return _S_isspace_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isspace(int __c) { return ::isspace(__c); }
 #endif
@@ -89,7 +89,7 @@ namespace std
 # undef isprint
   inline int 
   isprint(int __c) { return _S_isprint_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isprint(int __c) { return ::isprint(__c); }
 #endif
@@ -100,7 +100,7 @@ namespace std
 # undef iscntrl
   inline int 
   iscntrl(int __c) { return _S_iscntrl_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   iscntrl(int __c) { return ::iscntrl(__c); }
 #endif
@@ -111,7 +111,7 @@ namespace std
 # undef isupper
   inline int 
   isupper(int __c) { return _S_isupper_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isupper(int __c) { return ::isupper(__c); }
 #endif
@@ -122,7 +122,7 @@ namespace std
 # undef islower
   inline int 
   islower(int __c) { return _S_islower_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   islower(int __c) { return ::islower(__c); }
 #endif
@@ -133,7 +133,7 @@ namespace std
 # undef isalpha
   inline int 
   isalpha(int __c) { return _S_isalpha_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isalpha(int __c) { return ::isalpha(__c); }
 #endif
@@ -144,7 +144,7 @@ namespace std
 # undef isdigit
   inline int 
   isdigit(int __c) { return _S_isdigit_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isdigit(int __c) { return ::isdigit(__c); }
 #endif
@@ -155,7 +155,7 @@ namespace std
 # undef ispunct
   inline int 
   ispunct(int __c) { return _S_ispunct_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   ispunct(int __c) { return ::ispunct(__c); }
 #endif
@@ -166,7 +166,7 @@ namespace std
 # undef isxdigit
   inline int 
   isxdigit(int __c) { return _S_isxdigit_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isxdigit(int __c) { return ::isxdigit(__c); }
 #endif
@@ -177,7 +177,7 @@ namespace std
 # undef isalnum
   inline int 
   isalnum(int __c) { return _S_isalnum_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isalnum(int __c) { return ::isalnum(__c); }
 #endif
@@ -188,7 +188,7 @@ namespace std
 # undef isgraph
   inline int 
   isgraph(int __c) { return _S_isgraph_helper(__c); }
-#elif _GLIBCPP_USE_NAMESPACES 
+#else
   inline int 
   isgraph(int __c) { return ::isgraph(__c); }
 #endif
diff --git a/libstdc++-v3/bits/std_cmath.h b/libstdc++-v3/bits/std_cmath.h
index 04b018ff043..3b53bb101e2 100644
--- a/libstdc++-v3/bits/std_cmath.h
+++ b/libstdc++-v3/bits/std_cmath.h
@@ -42,203 +42,203 @@
 
 namespace std {
 
-    inline long
-    abs(long __l) { return ::labs(__l); }
+  inline long
+  abs(long __l) { return ::labs(__l); }
 
-    inline ldiv_t
-    div(long __a, long __b) { return ::ldiv(__a, __b); }
+  inline ldiv_t
+  div(long __a, long __b) { return ::ldiv(__a, __b); }
 
-    // double
-    inline double
-    abs(double __x) { return ::fabs(__x); }
+  // double
+  inline double
+  abs(double __x) { return ::fabs(__x); }
 
-    double
-    pow(double, int);
+  double
+  pow(double, int);
 
-    // float
-    inline float
-    ceil(float __x) { return ::ceil(static_cast<double>(__x)); }
+  // float
+  inline float
+  ceil(float __x) { return ::ceil(static_cast<double>(__x)); }
 
-    inline float
-    floor(float __x) { return ::floor(static_cast<double>(__x)); }
+  inline float
+  floor(float __x) { return ::floor(static_cast<double>(__x)); }
 
-    inline float
-    fmod(float __x, float __y) 
-    { return ::fmod(static_cast<double>(__x), static_cast<double>(__y)); }
+  inline float
+  fmod(float __x, float __y) 
+  { return ::fmod(static_cast<double>(__x), static_cast<double>(__y)); }
 
-    inline float
-    frexp(float __x, int* __p) 
-    { return ::frexp(static_cast<double>(__x), __p); }
+  inline float
+  frexp(float __x, int* __p) 
+  { return ::frexp(static_cast<double>(__x), __p); }
 
-    inline float
-    ldexp(float __x, int __i) 
-    { return ::ldexp(static_cast<double>(__x), __i); }
+  inline float
+  ldexp(float __x, int __i) 
+  { return ::ldexp(static_cast<double>(__x), __i); }
 
-    inline float
-    pow(float __x, float __y) 
-    { return ::pow(static_cast<double>(__x), static_cast<double>(__y)); }
+  inline float
+  pow(float __x, float __y) 
+  { return ::pow(static_cast<double>(__x), static_cast<double>(__y)); }
 
-    float
-    pow(float, int); 
+  float
+  pow(float, int); 
 
 #if _GLIBCPP_HAVE_ABSF
-    inline float
-    abs(float __x) { return ::absf(__x); }
+  inline float
+  abs(float __x) { return ::absf(__x); }
 #else
-    inline float
-    abs(float __x) { return ::fabs(static_cast<double>(__x)); }
+  inline float
+  abs(float __x) { return ::fabs(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_ACOSF
-    inline float
-    acos(float __x) { return ::acosf(__x); }
+  inline float
+  acos(float __x) { return ::acosf(__x); }
 #else
-    inline float
-    acos(float __x) { return ::acos(static_cast<double>(__x)); }
+  inline float
+  acos(float __x) { return ::acos(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_ASINF
-    inline float
-    asin(float __x) { return ::asinf(__x); }
+  inline float
+  asin(float __x) { return ::asinf(__x); }
 #else
-    inline float
-    asin(float __x) { return ::asin(static_cast<double>(__x)); }
+  inline float
+  asin(float __x) { return ::asin(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_ATANF
-    inline float
-    atan(float __x) { return ::atanf(__x); }
+  inline float
+  atan(float __x) { return ::atanf(__x); }
 #else
-    inline float
-    atan(float __x) { return ::atan(static_cast<double>(__x)); }
+  inline float
+  atan(float __x) { return ::atan(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_ATAN2F
-    inline float
-    atan2(float __x, float __y) { return ::atan2f(__x, __y); }
+  inline float
+  atan2(float __x, float __y) { return ::atan2f(__x, __y); }
 #else
-    inline float
-    atan2(float __x, float __y) 
-    { return ::atan2(static_cast<double>(__x), static_cast<double>(__y)); }
+  inline float
+  atan2(float __x, float __y) 
+  { return ::atan2(static_cast<double>(__x), static_cast<double>(__y)); }
 #endif
 
 #if _GLIBCPP_HAVE_TANF
-    inline float
-    tan(float __x) { return ::tanf(__x); }
+  inline float
+  tan(float __x) { return ::tanf(__x); }
 #else
-    inline float
-    tan(float __x) { return ::tan(static_cast<double>(__x)); }
+  inline float
+  tan(float __x) { return ::tan(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_SINHF
-    inline float
-    sinh(float __x) { return ::sinhf(__x); }
+  inline float
+  sinh(float __x) { return ::sinhf(__x); }
 #else
-    inline float
-    sinh(float __x) { return ::sinh(static_cast<double>(__x)); }
+  inline float
+  sinh(float __x) { return ::sinh(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_TANHF
-    inline float
-    tanh(float __x) { return ::tanhf(__x); }
+  inline float
+  tanh(float __x) { return ::tanhf(__x); }
 #else
-    inline float
-    tanh(float __x) { return ::tanh(static_cast<double>(__x)); }
+  inline float
+  tanh(float __x) { return ::tanh(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_COSHF
-    inline float
-    cosh(float __x) { return ::coshf(__x); }
+  inline float
+  cosh(float __x) { return ::coshf(__x); }
 #else
-    inline float
-    cosh(float __x) { return ::cosh(static_cast<double>(__x)); }
+  inline float
+  cosh(float __x) { return ::cosh(static_cast<double>(__x)); }
 #endif
  
 #if _GLIBCPP_HAVE_EXPF
-    inline float
-    exp(float __x) { return ::expf(__x); }
+  inline float
+  exp(float __x) { return ::expf(__x); }
 #else
-    inline float
-    exp(float __x) { return ::exp(static_cast<double>(__x)); }
+  inline float
+  exp(float __x) { return ::exp(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_LOGF
-    inline float
-    log(float __x) { return ::logf(__x); }
+  inline float
+  log(float __x) { return ::logf(__x); }
 #else
-    inline float
-    log(float __x) { return ::log(static_cast<double>(__x)); }
+  inline float
+  log(float __x) { return ::log(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_LOG10F
-    inline float
-    log10(float __x) { return ::log10f(__x); }
+  inline float
+  log10(float __x) { return ::log10f(__x); }
 #else
-    inline float
-    log10(float __x) { return ::log10(static_cast<double>(__x)); }
+  inline float
+  log10(float __x) { return ::log10(static_cast<double>(__x)); }
 #endif
 
 #if _GLIBCPP_HAVE_MODFF
-    inline float
-    modf(float __x, float* __p) { return ::modff(__x, __p); }
+  inline float
+  modf(float __x, float* __p) { return ::modff(__x, __p); }
 #else
-    inline float
-    modf(float __x, float* __p) 
-    {
-      double __tmp;
-      double __res = ::modf(static_cast<double>(__x), &__tmp);
-      *__p = static_cast<float> (__tmp);
-      return __res;
-    }
+  inline float
+  modf(float __x, float* __p) 
+  {
+    double __tmp;
+    double __res = ::modf(static_cast<double>(__x), &__tmp);
+    *__p = static_cast<float> (__tmp);
+    return __res;
+  }
 #endif
 
 #if GLIBCPP_HAS_BUILTIN_SINF
-    inline float
-    sin(float __x) { return __builtin_sinf(__x); }
+  inline float
+  sin(float __x) { return __builtin_sinf(__x); }
 #elif _GLIBCPP_HAVE_SINF
-    inline float
-    sin(float __x) { return ::sinf(__x); }
+  inline float
+  sin(float __x) { return ::sinf(__x); }
 #else
-    inline float
-    sin(float __x) { return ::sin(static_cast<double>(__x)); }
+  inline float
+  sin(float __x) { return ::sin(static_cast<double>(__x)); }
 #endif
 
 #if GLIBCPP_HAS_BUILTIN_COSF
-    inline float
-    cos(float __x) { return __builtin_cosf(__x); }
+  inline float
+  cos(float __x) { return __builtin_cosf(__x); }
 #elif _GLIBCPP_HAVE_COSF
-    inline float
-    cos(float __x) { return ::cosf(__x); }
+  inline float
+  cos(float __x) { return ::cosf(__x); }
 #else
-    inline float
-    cos(float __x) { return ::cos(static_cast<double>(__x)); }
+  inline float
+  cos(float __x) { return ::cos(static_cast<double>(__x)); }
 #endif
 
 #if GLIBCPP_HAS_BUILTIN_FABSF
-    inline float
-    fabs(float __x) { return __builtin_fabsf(__x); }
+  inline float
+  fabs(float __x) { return __builtin_fabsf(__x); }
 #elif _GLIBCPP_HAVE_FABSF
-    inline float
-    fabs(float __x) { return ::fabsf(__x); }
+  inline float
+  fabs(float __x) { return ::fabsf(__x); }
 #else
-    inline float
-    fabs(float __x) { return ::fabs(static_cast<double>(__x)); }
+  inline float
+  fabs(float __x) { return ::fabs(static_cast<double>(__x)); }
 #endif
 
 #if GLIBCPP_HAS_BUILTIN_SQRTF
-    inline float
-    sqrt(float __x) { return __builtin_sqrtf(__x); }
+  inline float
+  sqrt(float __x) { return __builtin_sqrtf(__x); }
 #elif _GLIBCPP_HAVE_SQRTF
-    inline float
-    sqrt(float __x) { return ::sqrtf(__x); }
+  inline float
+  sqrt(float __x) { return ::sqrtf(__x); }
 #else
-    inline float
-    sqrt(float __x) { return ::fabs(static_cast<double>(__x)); }
+  inline float
+  sqrt(float __x) { return ::fabs(static_cast<double>(__x)); }
 #endif
 
-    // XXX long double
-    long double
-    pow(long double, int);
+  // XXX long double
+  long double
+  pow(long double, int);
 
 } // std
 
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index 0ec8927f564..b657fdf306f 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -3,13 +3,6 @@
 /* Define if you have a working `mmap' system call.  */
 #undef HAVE_MMAP
 
-// If using the namespace std, you need this. Eventually this should
-// not be an option. In the meantime, and as things like std_ctype.h
-// need to be hacked out, give people the option. If this is set to 1,
-// CXXFLAGS should include -fhonor-std. If this is undefined, CXXFLAGS
-// should include -fno-honor-std.
-#undef _GLIBCPP_USE_NAMESPACES
-
 // Include support for 'long long' and 'unsigned long long'.
 #undef _GLIBCPP_USE_LONG_LONG
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index e93f4b2f749..f4d49447f86 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2468,10 +2468,7 @@ fi
 if test -n "$enable_cxx_flags"; then
     for f in $enable_cxx_flags; do
         case "$f" in
-            -fhonor-std)  cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_NAMESPACES 1
-EOF
- ;;
+            -fhonor-std)  ;;
             -*)  ;;
             *)   # and we're trying to pass /what/ exactly?
                  { echo "configure: error: compiler flags start with a -" 1>&2; exit 1; } ;;
@@ -2608,17 +2605,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2612: checking for $ac_hdr" >&5
+echo "configure:2609: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2617 "configure"
+#line 2614 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2648,7 +2645,7 @@ done
   
   
   echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6
-echo "configure:2652: checking for GNU C++ __complex__ support" >&5
+echo "configure:2649: checking for GNU C++ __complex__ support" >&5
   if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2662,7 +2659,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 2666 "configure"
+#line 2663 "configure"
 #include "confdefs.h"
 struct dcomplex { __complex__ double x; }; \
 		    dcomplex f(const dcomplex& x) { return dcomplex(x); }
@@ -2671,7 +2668,7 @@ int main() {
 		     dcomplex x; f(x); 
 ; return 0; }
 EOF
-if { (eval echo configure:2675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_complex=ok
 else
@@ -2703,7 +2700,7 @@ EOF
   
   
   echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6
-echo "configure:2707: checking for GNU C++ __complex__ float support" >&5
+echo "configure:2704: checking for GNU C++ __complex__ float support" >&5
   if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2736,14 +2733,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
       };
 EOB
     cat > conftest.$ac_ext <<EOF
-#line 2740 "configure"
+#line 2737 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_float_complex=ok
 else
@@ -2774,16 +2771,16 @@ EOF
 
   
     echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6
-echo "configure:2778: checking for __builtin_sinf" >&5
+echo "configure:2775: checking for __builtin_sinf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2780 "configure"
+#line 2777 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_sinf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinf=yes
 else
@@ -2802,16 +2799,16 @@ EOF
   fi
 
   echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6
-echo "configure:2806: checking for __builtin_cosf" >&5
+echo "configure:2803: checking for __builtin_cosf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2808 "configure"
+#line 2805 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_cosf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosf=yes
 else
@@ -2830,16 +2827,16 @@ EOF
   fi
 
   echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6
-echo "configure:2834: checking for __builtin_fabsf" >&5
+echo "configure:2831: checking for __builtin_fabsf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2836 "configure"
+#line 2833 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_fabsf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabsf=yes
 else
@@ -2858,16 +2855,16 @@ EOF
   fi
 
   echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6
-echo "configure:2862: checking for __builtin_sqrtf" >&5
+echo "configure:2859: checking for __builtin_sqrtf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2864 "configure"
+#line 2861 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 float foo(void) { __builtin_sqrtf(0.0); }
 ; return 0; }
 EOF
-if { (eval echo configure:2871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrtf=yes
 else
@@ -2887,7 +2884,7 @@ EOF
 
   
   echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:2891: checking for sin in -lm" >&5
+echo "configure:2888: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2895,7 +2892,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2899 "configure"
+#line 2896 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2906,7 +2903,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2933,17 +2930,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2937: checking for $ac_hdr" >&5
+echo "configure:2934: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2942 "configure"
+#line 2939 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2975,12 +2972,12 @@ done
   carg cargf nan hypot hypotf atan2f expf copysignf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2979: checking for $ac_func" >&5
+echo "configure:2976: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2984 "configure"
+#line 2981 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3003,7 +3000,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3032,12 +3029,12 @@ done
 
       USE_LONG_DOUBLE=no
   echo $ac_n "checking for copysignl""... $ac_c" 1>&6
-echo "configure:3036: checking for copysignl" >&5
+echo "configure:3033: checking for copysignl" >&5
 if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3041 "configure"
+#line 3038 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char copysignl(); below.  */
@@ -3060,7 +3057,7 @@ copysignl();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_copysignl=yes"
 else
@@ -3079,12 +3076,12 @@ if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then
   csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3083: checking for $ac_func" >&5
+echo "configure:3080: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3088 "configure"
+#line 3085 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3107,7 +3104,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3145,12 +3142,12 @@ fi
   fpclass qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3149: checking for $ac_func" >&5
+echo "configure:3146: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3154 "configure"
+#line 3151 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3173,7 +3170,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3208,12 +3205,12 @@ _strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _finitef _qfinite \
 _fpclass _qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3212: checking for $ac_func" >&5
+echo "configure:3209: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3217 "configure"
+#line 3214 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3236,7 +3233,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3266,17 +3263,17 @@ LIBS="$save_LIBS"
   
   ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:3270: checking for wchar.h" >&5
+echo "configure:3267: checking for wchar.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3275 "configure"
+#line 3272 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3294,16 +3291,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
     echo $ac_n "checking for native mbstate_t""... $ac_c" 1>&6
-echo "configure:3298: checking for native mbstate_t" >&5
+echo "configure:3295: checking for native mbstate_t" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3300 "configure"
+#line 3297 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 mbstate_t teststate;
 ; return 0; }
 EOF
-if { (eval echo configure:3307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_native_mbstatet=yes
 else
@@ -3322,16 +3319,16 @@ EOF
   fi
   
       echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6
-echo "configure:3326: checking for WCHAR_MIN and WCHAR_MAX" >&5
+echo "configure:3323: checking for WCHAR_MIN and WCHAR_MAX" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3328 "configure"
+#line 3325 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 int i = WCHAR_MIN; int j = WCHAR_MAX;
 ; return 0; }
 EOF
-if { (eval echo configure:3335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_wchar_minmax=yes
 else
@@ -3352,9 +3349,9 @@ EOF
   # Test wchar.h for WEOF, which is what we use to determine whether
   # to specialize for wchar_t or not.
   echo $ac_n "checking for WEOF""... $ac_c" 1>&6
-echo "configure:3356: checking for WEOF" >&5
+echo "configure:3353: checking for WEOF" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3358 "configure"
+#line 3355 "configure"
 #include "confdefs.h"
 
     #include <wchar.h>
@@ -3363,7 +3360,7 @@ int main() {
 wint_t i = WEOF;
 ; return 0; }
 EOF
-if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_weof=yes
 else
@@ -3378,12 +3375,12 @@ rm -f conftest*
     for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3382: checking for $ac_func" >&5
+echo "configure:3379: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3387 "configure"
+#line 3384 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3406,7 +3403,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3435,7 +3432,7 @@ done
   
 
   echo $ac_n "checking for wide character support""... $ac_c" 1>&6
-echo "configure:3439: checking for wide character support" >&5
+echo "configure:3436: checking for wide character support" >&5
   if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then
     libinst_wstring_la="libinst-wstring.la"
     cat >> confdefs.h <<\EOF
@@ -3463,17 +3460,17 @@ fi
   
   ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
-echo "configure:3467: checking for ctype.h" >&5
+echo "configure:3464: checking for ctype.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3472 "configure"
+#line 3469 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3494,9 +3491,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
         ctype_default=yes
 
         echo $ac_n "checking <ctype> for gnu-linux ""... $ac_c" 1>&6
-echo "configure:3498: checking <ctype> for gnu-linux " >&5
+echo "configure:3495: checking <ctype> for gnu-linux " >&5
     cat > conftest.$ac_ext <<EOF
-#line 3500 "configure"
+#line 3497 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3507,7 +3504,7 @@ int
 	+ __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_linux=yes
@@ -3525,9 +3522,9 @@ rm -f conftest*
     fi
 
         echo $ac_n "checking <ctype> for bsd ""... $ac_c" 1>&6
-echo "configure:3529: checking <ctype> for bsd " >&5
+echo "configure:3526: checking <ctype> for bsd " >&5
     cat > conftest.$ac_ext <<EOF
-#line 3531 "configure"
+#line 3528 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3537,7 +3534,7 @@ int
 	+ _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;}
 ; return 0; }
 EOF
-if { (eval echo configure:3541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_bsd=yes
@@ -3556,9 +3553,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for solaris 2.6,7,8 ""... $ac_c" 1>&6
-echo "configure:3560: checking <ctype> for solaris 2.6,7,8 " >&5
+echo "configure:3557: checking <ctype> for solaris 2.6,7,8 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 3562 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3569,7 +3566,7 @@ int
 	+ __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris=yes
@@ -3584,7 +3581,7 @@ rm -f conftest*
 
     if test $ctype_solaris = "yes"; then
       echo $ac_n "checking   for version""... $ac_c" 1>&6
-echo "configure:3588: checking   for version" >&5
+echo "configure:3585: checking   for version" >&5
       ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -3593,14 +3590,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
  
       cat > conftest.$ac_ext <<EOF
-#line 3597 "configure"
+#line 3594 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
 typedef long* __to_type; __to_type const& _M_toupper = __trans_upper;
 ; return 0; }
 EOF
-if { (eval echo configure:3604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
       ctype_solaris26=yes
@@ -3632,9 +3629,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for solaris 2.5.1 ""... $ac_c" 1>&6
-echo "configure:3636: checking <ctype> for solaris 2.5.1 " >&5
+echo "configure:3633: checking <ctype> for solaris 2.5.1 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 3638 "configure"
+#line 3635 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3644,7 +3641,7 @@ int
 	+ __ctype[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris25=yes
@@ -3664,9 +3661,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6
-echo "configure:3668: checking <ctype> for aix " >&5
+echo "configure:3665: checking <ctype> for aix " >&5
     cat > conftest.$ac_ext <<EOF
-#line 3670 "configure"
+#line 3667 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3677,7 +3674,7 @@ int
 	+ _VALC('a') + _IS('c', 0);}
 ; return 0; }
 EOF
-if { (eval echo configure:3681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_aix=yes
@@ -3697,9 +3694,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6
-echo "configure:3701: checking <ctype> for newlib " >&5
+echo "configure:3698: checking <ctype> for newlib " >&5
     cat > conftest.$ac_ext <<EOF
-#line 3703 "configure"
+#line 3700 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -3709,7 +3706,7 @@ int
 	+ _ctype_[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:3713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_newlib=yes
@@ -3743,17 +3740,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3747: checking for $ac_hdr" >&5
+echo "configure:3744: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3752 "configure"
+#line 3749 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3782,12 +3779,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3786: checking for $ac_func" >&5
+echo "configure:3783: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3791 "configure"
+#line 3788 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3810,7 +3807,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3835,7 +3832,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3839: checking for working mmap" >&5
+echo "configure:3836: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3843,7 +3840,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3847 "configure"
+#line 3844 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3983,7 +3980,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4046,19 +4043,19 @@ fi
 
 if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4050: checking for LC_MESSAGES" >&5
+echo "configure:4047: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4055 "configure"
+#line 4052 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_val_LC_MESSAGES=yes
 else
diff --git a/libstdc++-v3/math/complex-stub.h b/libstdc++-v3/math/complex-stub.h
index afc7ef68f65..5028b2a6cd5 100644
--- a/libstdc++-v3/math/complex-stub.h
+++ b/libstdc++-v3/math/complex-stub.h
@@ -1,5 +1,5 @@
 
-/* Copyright (C) 1997-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
 
    This file is part of the GNU ISO C++ Library.  This library is free
    software; you can redistribute it and/or modify it under the
@@ -82,7 +82,5 @@ double cabs (__complex__ double x);
 float cabsf (__complex__ float x);
 long double cabsl (__complex__ long double x);
 
-double nan (void);
-
 #endif
 
diff --git a/libstdc++-v3/math/mathconf.h b/libstdc++-v3/math/mathconf.h
index 53312dce0e5..dfc59edff17 100644
--- a/libstdc++-v3/math/mathconf.h
+++ b/libstdc++-v3/math/mathconf.h
@@ -1,6 +1,6 @@
 /* Configuration data for libmath subpart of libstdc++. */
 
-/* Copyright (C) 1997-1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
 
    This file is part of the GNU ISO C++ Library.  This library is free
    software; you can redistribute it and/or modify it under the
@@ -74,6 +74,11 @@ typedef int Int32_t __attribute ((mode (SI)));
 # include <nan.h>
 #endif
 
+#ifndef NAN
+# define NAN (nan())
+double nan (void);
+#endif
+
 #ifdef _GLIBCPP_HAVE_IEEEFP_H
 # include <ieeefp.h>
 #endif
@@ -117,10 +122,6 @@ typedef int Int32_t __attribute ((mode (SI)));
 # endif
 #endif
 
-#ifndef NAN
-# define NAN (nan())
-#endif
-
 #ifndef M_PI
 # define M_PI 3.14159265358979323846
 #endif
@@ -327,15 +328,10 @@ do {                                                            \
 
 
 /* Replacement for non-existing float functions.  */
-#ifndef _GLIBCPP_HAVE_FABSF
-# ifdef __GNUC__
-/* gcc has fabsf as a builtin command.  */
-extern float fabsf (float);
-# else
-#  define fabsf(x) fabs (x)
-# endif
+#if !defined(_GLIBCPP_HAVE_FABSF) && !defined(_GLIBCPP_HAS_BUILTIN_FABSF)
+# define fabsf(x) fabs (x)
 #endif
-#ifndef _GLIBCPP_HAVE_COSF
+#if !defined(_GLIBCPP_HAVE_COSF) && !defined(_GLIBCPP_HAS_BUILTIN_COSF)
 # define cosf(x) cos (x)
 #endif
 #ifndef _GLIBCPP_HAVE_COSHF
@@ -353,13 +349,13 @@ extern float fabsf (float);
 #ifndef _GLIBCPP_HAVE_POWF
 # define powf(x, y) pow (x, y)
 #endif
-#ifndef _GLIBCPP_HAVE_SINF
+#if !defined(_GLIBCPP_HAVE_SINF) && !defined(_GLIBCPP_HAS_BUILTIN_SINF)
 # define sinf(x) sin (x)
 #endif
 #ifndef _GLIBCPP_HAVE_SINHF
 # define sinhf(x) sinh (x)
 #endif
-#ifndef _GLIBCPP_HAVE_SQRTF
+#if !defined(_GLIBCPP_HAVE_SQRTF) && !defined(_GLIBCPP_HAS_BUILTIN_SQRTF)
 # define sqrtf(x) sqrt (x)
 #endif
 #ifndef _GLIBCPP_HAVE_TANF
@@ -375,7 +371,3 @@ extern float fabsf (float);
 #ifdef __cplusplus
 }
 #endif
-
-
-
-
diff --git a/libstdc++-v3/testsuite/27_io/istream.cc b/libstdc++-v3/testsuite/27_io/istream.cc
index ea07f2e502c..0eaa3e0bb8d 100644
--- a/libstdc++-v3/testsuite/27_io/istream.cc
+++ b/libstdc++-v3/testsuite/27_io/istream.cc
@@ -1,6 +1,6 @@
 // 1999-09-20 bkoz
 
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -30,20 +30,16 @@
 // 27.6.1.1 basic_istream
 // NB: This file is for testing istream with NO OTHER INCLUDES.
 
-// XXX only if using namespaces, as without leads to duplicate symbols
-#if _GLIBCPP_USE_NAMESPACES 
 #include <istream>
-#include <bits/basic_ios.tcc> // XXX Hack, in a perfect world this not needed.
-#include <locale> // XXX As above, needed for ctype/num_get use_facets(...)
-#include <bits/locale_facets.tcc> // XXX
 
 namespace test {
  
+#if 0
+  // XXX Should work, but doesn't.
   using namespace std;
   typedef short type_t;
   template class basic_istream<type_t, char_traits<type_t> >;
 
-#if 0
   template
     const ctype<type_t>& 
     use_facet<ctype<type_t> >(const locale&);
@@ -55,7 +51,6 @@ namespace test {
 #endif
 
 } // test
-#endif
 
 int main() {
   return 0;
diff --git a/libstdc++-v3/testsuite/27_io/ostream.cc b/libstdc++-v3/testsuite/27_io/ostream.cc
index 32699254257..33cc3587644 100644
--- a/libstdc++-v3/testsuite/27_io/ostream.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream.cc
@@ -1,6 +1,6 @@
 // 1999-09-20 bkoz
 
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -30,21 +30,18 @@
 // 27.6.2.1 basic_ostream
 // NB: This file is for testing ostream with NO OTHER INCLUDES.
 
-// XXX only if using namespaces, as without leads to duplicate symbols
-#if _GLIBCPP_USE_NAMESPACES 
 #include <ostream>
-#include <bits/basic_ios.tcc> // XXX Hack, in a perfect world this not needed.
-#include <locale> // XXX As above, needed for ctype/num_get use_facets(...)
-#include <bits/locale_facets.tcc>
 
 namespace test {
  
+#if 0
+  // XXX Should work, but doesn't.
   using namespace std;
   typedef short type_t;
   template class basic_ostream<type_t, char_traits<type_t> >;
+#endif
 
 } // test
-#endif
 
 int main() {
   return 0;
author	bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>	2000-05-11 02:40:34 +0000
committer	bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>	2000-05-11 02:40:34 +0000
commit	67b61273f0fd4b24c38485817bdec8cf9d076fcc (patch)
tree	e18ea6c352406e1c18bb32df73f14f884e4db083 /libstdc++-v3
parent	63e33f9adac985516f4508f1c61346db15a2db18 (diff)
download	gcc-67b61273f0fd4b24c38485817bdec8cf9d076fcc.tar.gz