2004-06-09 Benjamin Kosnik <bkoz@redhat.com>

	* crossconfig.m4: Remove signbit, signbitf, signbitl.
	* linkage.m4: Comment LIBMATHOBJS, tweak others.  AC_DEFINES for
	builtin math functions instead of AC_DEFINE_UNQUOTED.
	* configure: Regenerate.


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

4 files changed, 88 insertions, 202 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3d14a1d405b..e2855479540 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-09  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* crossconfig.m4: Remove signbit, signbitf, signbitl.	
+	* linkage.m4: Comment LIBMATHOBJS, tweak others.  AC_DEFINES for
+	builtin math functions instead of AC_DEFINE_UNQUOTED.
+	* configure: Regenerate.
+	
 2004-06-08  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* docs/doxygen/filter.sed: Rename _GLIBCXX_STD to std.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 34d73e6af8a..c2f20097ce6 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -25461,7 +25461,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_abs_link" >&6
     if test x$glibcxx_cv_func___builtin_abs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_abs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -25608,7 +25609,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsf_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -25755,7 +25757,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_fabs_link" >&6
     if test x$glibcxx_cv_func___builtin_fabs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -25902,7 +25905,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsl_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26049,7 +26053,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_labs_link" >&6
     if test x$glibcxx_cv_func___builtin_labs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_labs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26197,7 +26202,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtf_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26344,7 +26350,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrt_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrt_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrt | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26491,7 +26498,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtl_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26639,7 +26647,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sinf_link" >&6
     if test x$glibcxx_cv_func___builtin_sinf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26786,7 +26795,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sin_link" >&6
     if test x$glibcxx_cv_func___builtin_sin_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sin | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -26933,7 +26943,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sinl_link" >&6
     if test x$glibcxx_cv_func___builtin_sinl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -27081,7 +27092,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_cosf_link" >&6
     if test x$glibcxx_cv_func___builtin_cosf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -27228,7 +27240,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_cos_link" >&6
     if test x$glibcxx_cv_func___builtin_cos_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cos | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -27375,7 +27388,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_cosl_link" >&6
     if test x$glibcxx_cv_func___builtin_cosl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -27383,66 +27397,6 @@ _ACEOF
   fi
 
 
-              dummyvar=no
-  if test x$dummyvar = x"yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_ABS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_LABS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_COS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_COSF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_COSL 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_FABS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_FABSF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_FABSL 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SIN 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SINF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SINL 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SQRT 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SQRTF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SQRTL 1
-_ACEOF
-
-  fi
-
 
 
 echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -27737,6 +27691,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -27958,7 +27913,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -48687,7 +48642,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_abs_link" >&6
     if test x$glibcxx_cv_func___builtin_abs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_abs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -48834,7 +48790,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsf_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -48981,7 +48938,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_fabs_link" >&6
     if test x$glibcxx_cv_func___builtin_fabs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49128,7 +49086,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_fabsl_link" >&6
     if test x$glibcxx_cv_func___builtin_fabsl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49275,7 +49234,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_labs_link" >&6
     if test x$glibcxx_cv_func___builtin_labs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_labs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49423,7 +49383,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtf_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49570,7 +49531,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrt_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrt_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrt | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49717,7 +49679,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sqrtl_link" >&6
     if test x$glibcxx_cv_func___builtin_sqrtl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -49865,7 +49828,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sinf_link" >&6
     if test x$glibcxx_cv_func___builtin_sinf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50012,7 +49976,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sin_link" >&6
     if test x$glibcxx_cv_func___builtin_sin_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sin | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50159,7 +50124,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_sinl_link" >&6
     if test x$glibcxx_cv_func___builtin_sinl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50307,7 +50273,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_cosf_link" >&6
     if test x$glibcxx_cv_func___builtin_cosf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50454,7 +50421,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_cos_link" >&6
     if test x$glibcxx_cv_func___builtin_cos_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cos | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50601,7 +50569,8 @@ fi
 echo "${ECHO_T}$glibcxx_cv_func___builtin_cosl_link" >&6
     if test x$glibcxx_cv_func___builtin_cosl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ${ac_tr_func} 1
 _ACEOF
 
@@ -50609,66 +50578,6 @@ _ACEOF
   fi
 
 
-              dummyvar=no
-  if test x$dummyvar = x"yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_ABS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_LABS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_COS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_COSF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_COSL 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_FABS 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_FABSF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_FABSL 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SIN 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SINF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SINL 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SQRT 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SQRTF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE___BUILTIN_SQRTL 1
-_ACEOF
-
-  fi
-
 
 
 echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -50963,6 +50872,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -51184,7 +51094,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -54175,6 +54085,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54396,7 +54307,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -56543,6 +56454,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -56764,7 +56676,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -58787,6 +58699,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -59008,7 +58921,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -61101,14 +61014,6 @@ _ACEOF
 _ACEOF
 
     cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGNBIT 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGNBITF 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
 #define HAVE_SINF 1
 _ACEOF
 
@@ -61222,10 +61127,6 @@ _ACEOF
 _ACEOF
 
       cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGNBITL 1
-_ACEOF
-
-      cat >>confdefs.h <<\_ACEOF
 #define HAVE_SINL 1
 _ACEOF
 
@@ -61811,6 +61712,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -62032,7 +61934,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -64008,6 +63910,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -64229,7 +64132,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -66096,6 +65999,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -66317,7 +66221,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -70147,6 +70051,7 @@ fi
 done
 
 
+
 for ac_func in __signbitf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -70368,7 +70273,7 @@ done
 
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index faa19d92e72..57ab558b3a6 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -176,8 +176,6 @@ case "${host}" in
     AC_DEFINE(HAVE_LOGF)
     AC_DEFINE(HAVE_LOG10F)
     AC_DEFINE(HAVE_MODFF)
-    AC_DEFINE(HAVE_SIGNBIT)
-    AC_DEFINE(HAVE_SIGNBITF)
     AC_DEFINE(HAVE_SINF)
     AC_DEFINE(HAVE_SINHF)
     AC_DEFINE(HAVE_SINCOS)
@@ -207,7 +205,6 @@ case "${host}" in
       AC_DEFINE(HAVE_LOG10L)
       AC_DEFINE(HAVE_MODFL)
       AC_DEFINE(HAVE_POWL)
-      AC_DEFINE(HAVE_SIGNBITL)
       AC_DEFINE(HAVE_SINL)
       AC_DEFINE(HAVE_SINHL)
       AC_DEFINE(HAVE_SINCOSL)
diff --git a/libstdc++-v3/linkage.m4 b/libstdc++-v3/linkage.m4
index 87c64cb9b57..9af671dd372 100644
--- a/libstdc++-v3/linkage.m4
+++ b/libstdc++-v3/linkage.m4
@@ -1,5 +1,5 @@
 dnl
-dnl This file contains stuff.
+dnl This file contains macros for testing linkage.
 dnl
 
 dnl
@@ -20,7 +20,7 @@ AC_DEFUN([GLIBCXX_CHECK_MATH_DECL_1], [
 		      #endif
 		     ],
                      [ $1(0);],
-                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
+                      [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
@@ -291,7 +291,7 @@ AC_DEFUN([GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1], [
     AC_MSG_RESULT($glibcxx_cv_func_$1_link)
     if test x$glibcxx_cv_func_$1_link = x"yes"; then
       ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-      AC_DEFINE_UNQUOTED(${ac_tr_func})
+      AC_DEFINE(${ac_tr_func}, 1, [Defined if $1 exists.])
     fi
   fi
 ])
@@ -336,30 +336,6 @@ AC_DEFUN([GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT], [
   GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosf)
   GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cos)
   GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosl)
-
-  dnl There is, without a doubt, a more elegant way to have these
-  dnl names exported so that they won't be stripped out of acconfig.h by
-  dnl autoheader. I leave this as an exercise to somebody less frustrated
-  dnl than I.... please email the libstdc++ list if you can figure out a
-  dnl more elegant approach (see autoconf/acgen.m4 and specifically
-  dnl AC_CHECK_FUNC for things to steal.)
-  dummyvar=no
-  if test x$dummyvar = x"yes"; then
-    AC_DEFINE(HAVE___BUILTIN_ABS)
-    AC_DEFINE(HAVE___BUILTIN_LABS)
-    AC_DEFINE(HAVE___BUILTIN_COS)
-    AC_DEFINE(HAVE___BUILTIN_COSF)
-    AC_DEFINE(HAVE___BUILTIN_COSL)
-    AC_DEFINE(HAVE___BUILTIN_FABS)
-    AC_DEFINE(HAVE___BUILTIN_FABSF)
-    AC_DEFINE(HAVE___BUILTIN_FABSL)
-    AC_DEFINE(HAVE___BUILTIN_SIN)
-    AC_DEFINE(HAVE___BUILTIN_SINF)
-    AC_DEFINE(HAVE___BUILTIN_SINL)
-    AC_DEFINE(HAVE___BUILTIN_SQRT)
-    AC_DEFINE(HAVE___BUILTIN_SQRTF)
-    AC_DEFINE(HAVE___BUILTIN_SQRTL)
-  fi
 ])
 
 dnl
@@ -518,7 +494,10 @@ AC_DEFUN([GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT], [
   AC_REPLACE_MATHFUNCS(copysignf)
 
   dnl For __signbit to signbit conversions.
+  dnl Not sure why this is done, as these will be macros mostly. 
+  dnl Should probably coordinate this with std_cmath.h.
   AC_CHECK_FUNCS([__signbit], , [LIBMATHOBJS="$LIBMATHOBJS signbit.lo"])
+
   AC_CHECK_FUNCS([__signbitf], , [LIBMATHOBJS="$LIBMATHOBJS signbitf.lo"])
 
   dnl Compile the long double complex functions only if the function
@@ -529,7 +508,7 @@ AC_DEFUN([GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT], [
     AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"])
   fi
 
-  # XXX Review this.  Nothing uses it.
+  # Used in libmath/Makefile.am.
   if test -n "$LIBMATHOBJS"; then
     need_libmath=yes
   fi
@@ -550,5 +529,3 @@ AC_DEFUN([GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT], [
 dnl AC_REPLACE_MATHFUNCS(FUNCTION...)
 AC_DEFUN([AC_REPLACE_MATHFUNCS],
 [AC_CHECK_FUNCS([$1], , [LIBMATHOBJS="$LIBMATHOBJS ${ac_func}.lo"])])
-
-dnl vim:et:ts=2