2005-04-05 Kelley Cook <kcook@gcc.gnu.org>

	* linkage.m4 (GLIBCXX_CHECK_BUILTIN_MATH_DEC): Use m4 translit macro
	to convert to uppercase instead of shelling out to tr.
	* acconfig.h: Remove now redundant HAVE__BUILTINS_*.
	* configure, config.h.in: Regenerate.


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

5 files changed, 221 insertions, 212 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 389850ba867..e9a74cf568e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2005-04-05  Kelley Cook  <kcook@gcc.gnu.org>
 
+	* linkage.m4 (GLIBCXX_CHECK_BUILTIN_MATH_DEC): Use m4 translit macro 
+	to convert to uppercase instead of shelling out to tr.
+	* acconfig.h: Remove now redundant HAVE__BUILTINS_*.
+	* configure, config.h.in: Regenerate.
+
+2005-04-05  Kelley Cook  <kcook@gcc.gnu.org>
+
 	* acconfig.h (HAVE_TANL): Correct cut-and-paste typo.
 	* config.h.in: Regenerate.
 
diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h
index 0d74a0fb125..ae7932b3982 100644
--- a/libstdc++-v3/acconfig.h
+++ b/libstdc++-v3/acconfig.h
@@ -106,48 +106,6 @@
 // Define if you have the hypotl function.
 #undef HAVE_HYPOTL
 
-// Define if the compiler/host combination has __builtin_abs
-#undef HAVE___BUILTIN_ABS
-
-// Define if the compiler/host combination has __builtin_labs
-#undef HAVE___BUILTIN_LABS
-
-// Define if the compiler/host combination has __builtin_cos
-#undef HAVE___BUILTIN_COS
-
-// Define if the compiler/host combination has __builtin_cosf
-#undef HAVE___BUILTIN_COSF
-
-// Define if the compiler/host combination has __builtin_cosl
-#undef HAVE___BUILTIN_COSL
-
-// Define if the compiler/host combination has __builtin_fabs
-#undef HAVE___BUILTIN_FABS
-
-// Define if the compiler/host combination has __builtin_fabsf
-#undef HAVE___BUILTIN_FABSF
-
-// Define if the compiler/host combination has __builtin_fabsl
-#undef HAVE___BUILTIN_FABSL
-
-// Define if the compiler/host combination has __builtin_sin
-#undef HAVE___BUILTIN_SIN
-
-// Define if the compiler/host combination has __builtin_sinf
-#undef HAVE___BUILTIN_SINF
-
-// Define if the compiler/host combination has __builtin_sinl
-#undef HAVE___BUILTIN_SINL
-
-// Define if the compiler/host combination has __builtin_sqrt
-#undef HAVE___BUILTIN_SQRT
-
-// Define if the compiler/host combination has __builtin_sqrtf
-#undef HAVE___BUILTIN_SQRTF
-
-// Define if the compiler/host combination has __builtin_sqrtl
-#undef HAVE___BUILTIN_SQRTL
-
 // Define if poll is available in <poll.h>.
 #undef HAVE_POLL
 
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index 71aebe6b14b..1faa63d68b4 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -107,48 +107,6 @@
 // Define if you have the hypotl function.
 #undef HAVE_HYPOTL
 
-// Define if the compiler/host combination has __builtin_abs
-#undef HAVE___BUILTIN_ABS
-
-// Define if the compiler/host combination has __builtin_labs
-#undef HAVE___BUILTIN_LABS
-
-// Define if the compiler/host combination has __builtin_cos
-#undef HAVE___BUILTIN_COS
-
-// Define if the compiler/host combination has __builtin_cosf
-#undef HAVE___BUILTIN_COSF
-
-// Define if the compiler/host combination has __builtin_cosl
-#undef HAVE___BUILTIN_COSL
-
-// Define if the compiler/host combination has __builtin_fabs
-#undef HAVE___BUILTIN_FABS
-
-// Define if the compiler/host combination has __builtin_fabsf
-#undef HAVE___BUILTIN_FABSF
-
-// Define if the compiler/host combination has __builtin_fabsl
-#undef HAVE___BUILTIN_FABSL
-
-// Define if the compiler/host combination has __builtin_sin
-#undef HAVE___BUILTIN_SIN
-
-// Define if the compiler/host combination has __builtin_sinf
-#undef HAVE___BUILTIN_SINF
-
-// Define if the compiler/host combination has __builtin_sinl
-#undef HAVE___BUILTIN_SINL
-
-// Define if the compiler/host combination has __builtin_sqrt
-#undef HAVE___BUILTIN_SQRT
-
-// Define if the compiler/host combination has __builtin_sqrtf
-#undef HAVE___BUILTIN_SQRTF
-
-// Define if the compiler/host combination has __builtin_sqrtl
-#undef HAVE___BUILTIN_SQRTL
-
 // Define if poll is available in <poll.h>.
 #undef HAVE_POLL
 
@@ -714,6 +672,48 @@
 /* Define to 1 if you have the `_tanl' function. */
 #undef HAVE__TANL
 
+/* Define if the compiler/host combination has __builtin_abs. */
+#undef HAVE___BUILTIN_ABS
+
+/* Define if the compiler/host combination has __builtin_cos. */
+#undef HAVE___BUILTIN_COS
+
+/* Define if the compiler/host combination has __builtin_cosf. */
+#undef HAVE___BUILTIN_COSF
+
+/* Define if the compiler/host combination has __builtin_cosl. */
+#undef HAVE___BUILTIN_COSL
+
+/* Define if the compiler/host combination has __builtin_fabs. */
+#undef HAVE___BUILTIN_FABS
+
+/* Define if the compiler/host combination has __builtin_fabsf. */
+#undef HAVE___BUILTIN_FABSF
+
+/* Define if the compiler/host combination has __builtin_fabsl. */
+#undef HAVE___BUILTIN_FABSL
+
+/* Define if the compiler/host combination has __builtin_labs. */
+#undef HAVE___BUILTIN_LABS
+
+/* Define if the compiler/host combination has __builtin_sin. */
+#undef HAVE___BUILTIN_SIN
+
+/* Define if the compiler/host combination has __builtin_sinf. */
+#undef HAVE___BUILTIN_SINF
+
+/* Define if the compiler/host combination has __builtin_sinl. */
+#undef HAVE___BUILTIN_SINL
+
+/* Define if the compiler/host combination has __builtin_sqrt. */
+#undef HAVE___BUILTIN_SQRT
+
+/* Define if the compiler/host combination has __builtin_sqrtf. */
+#undef HAVE___BUILTIN_SQRTF
+
+/* Define if the compiler/host combination has __builtin_sqrtl. */
+#undef HAVE___BUILTIN_SQRTL
+
 /* Define to 1 if you have the `__signbit' function. */
 #undef HAVE___SIGNBIT
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index cae1c106237..cf9150386ef 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -25209,14 +25209,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_abs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_ABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -25357,14 +25358,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabsf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABSF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -25505,14 +25507,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -25653,14 +25656,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabsl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABSL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -25801,14 +25805,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_labs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_LABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -25950,14 +25955,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrtf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRTF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -26098,14 +26104,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrt_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRT 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -26246,14 +26253,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrtl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRTL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -26395,14 +26403,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sinf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SINF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -26543,14 +26552,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sin_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SIN 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -26691,14 +26701,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sinl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SINL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -26840,14 +26851,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cosf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COSF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -26988,14 +27000,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cos_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -27136,14 +27149,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cosl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COSL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -47429,14 +47443,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_abs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_ABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -47577,14 +47592,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabsf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABSF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -47725,14 +47741,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -47873,14 +47890,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabsl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABSL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -48021,14 +48039,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_labs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_LABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -48170,14 +48189,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrtf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRTF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -48318,14 +48338,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrt_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRT 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -48466,14 +48487,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrtl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRTL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -48615,14 +48637,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sinf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SINF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -48763,14 +48786,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sin_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SIN 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -48911,14 +48935,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sinl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SINL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -49060,14 +49085,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cosf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COSF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -49208,14 +49234,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cos_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -49356,14 +49383,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cosl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COSL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -68803,14 +68831,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_abs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_ABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -68951,14 +68980,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabsf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABSF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -69099,14 +69129,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -69247,14 +69278,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_fabsl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_FABSL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -69395,14 +69427,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_labs_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_LABS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -69544,14 +69577,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrtf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRTF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -69692,14 +69726,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrt_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRT 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -69840,14 +69875,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sqrtl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SQRTL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -69989,14 +70025,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sinf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SINF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -70137,14 +70174,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sin_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SIN 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -70285,14 +70323,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_sinl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_SINL 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -70434,14 +70473,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cosf_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COSF 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -70582,14 +70622,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cos_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COS 1
 _ACEOF
 
     fi
+
   fi
 
 
@@ -70730,14 +70771,15 @@ fi
     fi
     echo "$as_me:$LINENO: result: $glibcxx_cv_func___builtin_cosl_link" >&5
 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
-#define ${ac_tr_func} 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE___BUILTIN_COSL 1
 _ACEOF
 
     fi
+
   fi
 
 
diff --git a/libstdc++-v3/linkage.m4 b/libstdc++-v3/linkage.m4
index 6c8a6a766c0..d0cbecd8ea8 100644
--- a/libstdc++-v3/linkage.m4
+++ b/libstdc++-v3/linkage.m4
@@ -289,10 +289,12 @@ AC_DEFUN([GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1], [
       ])
     fi
     AC_MSG_RESULT($glibcxx_cv_func_$1_link)
+    define([NAME], [translit([$1],[abcdefghijklmnopqrstuvwxyz],
+    				  [ABCDEFGHIJKLMNOPQRSTUVWXYZ])])
     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}, 1, [Defined if $1 exists.])
+      AC_DEFINE([HAVE_]NAME, 1, [Define if the compiler/host combination has $1.])
     fi
+    undefine([NAME])
   fi
 ])