2000-06-06 Steven King <sxking@uswest.net>

        * acconfig.h: Added defines for HAVE_BUILTIN math functs for float,
        double and long double.  Added defines for HAVE libm math functs for
        float and long double.
        * aclocal.m4: Added configure checks for builtin math funcs and libm
        support for float and long double versions of the math functions.
        * config.h.in: Added undefs for math functs.
        * configure: Regenerate.
        * math/mathconf: Changed the _GLIBCPP_HAS_BUILTIN_* to
        _GLIBCPP_HAVE_BUILTIN_*.
        * bits/std_cmath.h: Added long double support.  Use builtins for
        float, double and long if available, otherwise, use libm versions if
        availible, otherwise, punt.
        * shadow/bits/std_cmath.h: ditto


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

1 files changed, 911 insertions, 100 deletions

diff --git a/libstdc++-v3/shadow/bits/std_cmath.h b/libstdc++-v3/shadow/bits/std_cmath.h
index 9d61dfe7f87..d233dd151e6 100644
--- a/libstdc++-v3/shadow/bits/std_cmath.h
+++ b/libstdc++-v3/shadow/bits/std_cmath.h
@@ -34,6 +34,8 @@
 #ifndef _CPP_CMATH
 #define _CPP_CMATH 1
 
+# include <bits/c++config.h>
+
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
@@ -41,137 +43,946 @@
 #     include_next <math.h>
     }
     inline double _CPP_HUGE_VAL_capture()        { return HUGE_VAL; }
-    inline double _CPP_acos_capture(double __x)  { return acos(__x); }
-    inline double _CPP_asin_capture(double __x)  { return asin(__x); }
-    inline double _CPP_atan_capture(double __x)  { return atan(__x); }
-    inline double _CPP_atan2_capture(double __y, double __x) 
-      { return atan2(__y,__x); }
-    inline double _CPP_cos_capture(double __x)   { return cos(__x); }
-    inline double _CPP_sin_capture(double __x)   { return sin(__x); }
-    inline double _CPP_tan_capture(double __x)   { return tan(__x); }
-    inline double _CPP_cosh_capture(double __x)  { return cosh(__x); }
-    inline double _CPP_sinh_capture(double __x)  { return sinh(__x); }
-    inline double _CPP_tanh_capture(double __x)  { return tanh(__x); }
-    inline double _CPP_exp_capture(double __x)   { return exp(__x); }
-    inline double _CPP_frexp_capture(double __x, int* __exp) 
+#if _GLIBCPP_HAVE_BUILTIN_ACOSF
+    inline float _CPP_acos_capture(float __x)
+      { return __builtin_acosf(__x); }
+#elif _GLIBCPP_HAVE_ACOSF
+    inline float _CPP_acos_capture(float __x)
+      { return acosf(__x); }
+#else
+    inline float _CPP_acos_capture(float __x)
+      { return acos(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ASINF
+    inline float _CPP_asin_capture(float __x)
+      { return __builtin_asinf(__x); }
+#elif _GLIBCPP_HAVE_ASINF
+    inline float _CPP_asin_capture(float __x)
+      { return asinf(__x); }
+#else
+    inline float _CPP_asin_capture(float __x)
+      { return asin(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ATANF
+    inline float _CPP_atan_capture(float __x)
+      { return __builtin_atanf(__x); }
+#elif _GLIBCPP_HAVE_ATANF
+    inline float _CPP_atan_capture(float __x)
+      { return atanf(__x); }
+#else
+    inline float _CPP_atan_capture(float __x)
+      { return atan(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ATAN2F
+    inline float _CPP_atan2_capture(float __y, float __x)
+      { return __builtin_atan2f(__y, __x); }
+#elif _GLIBCPP_HAVE_ATAN2F
+    inline float _CPP_atan2_capture(float __y, float __x)
+      { return atan2f(__y, __x); }
+#else
+    inline float _CPP_atan2_capture(float __y, float __x)
+      { return atan2(static_cast<double>(__y), static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_CEILF
+    inline float _CPP_ceil_capture(float __x)
+      { return __builtin_ceilf(__x); }
+#elif _GLIBCPP_HAVE_CEILF
+    inline float _CPP_ceil_capture(float __x)
+      { return ceilf(__x); }
+#else
+    inline float _CPP_ceil_capture(float __x)
+      { return ceil(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_COSF
+    inline float _CPP_cos_capture(float __x)
+      { return __builtin_cosf(__x); }
+#elif _GLIBCPP_HAVE_COSF
+    inline float _CPP_cos_capture(float __x)
+      { return cosf(__x); }
+#else
+    inline float _CPP_cos_capture(float __x)
+      { return cos(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_COSHF
+    inline float _CPP_cosh_capture(float __x)
+      { return __builtin_coshf(__x); }
+#elif _GLIBCPP_HAVE_COSHF
+    inline float _CPP_cosh_capture(float __x)
+      { return coshf(__x); }
+#else
+    inline float _CPP_cosh_capture(float __x)
+      { return cosh(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_EXPF
+    inline float _CPP_exp_capture(float __x)
+      { return __builtin_expf(__x); }
+#elif _GLIBCPP_HAVE_EXPF
+    inline float _CPP_exp_capture(float __x)
+      { return expf(__x); }
+#else
+    inline float _CPP_exp_capture(float __x)
+      { return exp(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FABSF
+    inline float _CPP_fabs_capture(float __x)
+      { return __builtin_fabsf(__x); }
+#elif _GLIBCPP_HAVE_FABSF
+    inline float _CPP_fabs_capture(float __x)
+      { return fabsf(__x); }
+#else
+    inline float _CPP_fabs_capture(float __x)
+      { return fabs(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FLOORF
+    inline float _CPP_floor_capture(float __x)
+      { return __builtin_floorf(__x); }
+#elif _GLIBCPP_HAVE_FLOORF
+    inline float _CPP_floor_capture(float __x)
+      { return floorf(__x); }
+#else
+    inline float _CPP_floor_capture(float __x)
+      { return floor(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FMODFF
+    inline float _CPP_fmod_capture(float __x, float __y)
+      { return __builtin_fmodf(__x, __y); }
+#elif _GLIBCPP_HAVE_FMODFF
+    inline float _CPP_fmod_capture(float __x, float __y)
+      { return fmodf(__x, __y); }
+#else
+    inline float _CPP_fmod_capture(float __x, float __y)
+      { return fmod(static_cast<double>(__x), static_cast<double>(__y)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FREXPF
+    inline float _CPP_frexp_capture(float __x, int* __exp)
+      { return __builtin_frexpf(__x, __exp); }
+#elif _GLIBCPP_HAVE_FREXPF
+    inline float _CPP_frexp_capture(float __x, int* __exp)
+      { return frexpf(__x, __exp); }
+#else
+    inline float _CPP_frexp_capture(float __x, int* __exp)
+      { return frexp(__x, __exp); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LDEXPF
+    inline float _CPP_ldexp_capture(float __x, int __exp)
+      { return __builtin_ldexpf(__x, __exp); }
+#elif _GLIBCPP_HAVE_LDEXPF
+    inline float _CPP_ldexp_capture(float __x, int __exp)
+      { return ldexpf(__x, __exp); }
+#else
+    inline float _CPP_ldexp_capture(float __x, int __exp)
+      { return ldexp(static_cast<double>(__x), __exp); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LOGF
+    inline float _CPP_log_capture(float __x)
+      { return __builtin_logf(__x); }
+#elif _GLIBCPP_HAVE_LOGF
+    inline float _CPP_log_capture(float __x)
+      { return logf(__x); }
+#else
+    inline float _CPP_log_capture(float __x)
+      { return log(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LOG10F
+    inline float _CPP_log10_capture(float __x)
+      { return __builtin_log10f(__x); }
+#elif _GLIBCPP_HAVE_LOG10F
+    inline float _CPP_log10_capture(float __x)
+      { return log10f(__x); }
+#else
+    inline float _CPP_log10_capture(float __x)
+      { return log10(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_MODFF
+    inline float _CPP_modf_capture(float __x, float* __iptr)
+      { return __builtin_modff(__x, __iptr); }
+#elif _GLIBCPP_HAVE_MODFF
+    inline float _CPP_modf_capture(float __x, float* __iptr)
+      { return modff(__x, __iptr); }
+#else
+    inline float _CPP_modf_capture(float __x, float* __iptr)
+    {
+       double __tmp;
+       double __res = _C_legacy::modf(static_cast<double>(__x), &__tmp);
+       *__iptr = static_cast<float> (__tmp);
+       return __res;
+    }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_POWF
+    inline float _CPP_pow_capture(float __x, float __y)
+      { return __builtin_powf(__x, __y); }
+#elif _GLIBCPP_HAVE_POWF
+    inline float _CPP_pow_capture(float __x, float __y)
+      { return powf(__x, __y); }
+#else
+    inline float _CPP_pow_capture(float __x, float __y)
+      { return pow(static_cast<double>(__x), static_cast<double>(__y)); }
+#endif
+
+    float pow(float, int);
+
+#if _GLIBCPP_HAVE_BUILTIN_SINF
+    inline float _CPP_sin_capture(float __x)
+      { return __builtin_sinf(__x); }
+#elif _GLIBCPP_HAVE_SINF
+    inline float _CPP_sin_capture(float __x)
+      { return sinf(__x); }
+#else
+    inline float _CPP_sin_capture(float __x)
+      { return sin(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SINHF
+    inline float _CPP_sinh_capture(float __x)
+      { return __builtin_sinhf(__x); }
+#elif _GLIBCPP_HAVE_SINHF
+    inline float _CPP_sinh_capture(float __x)
+      { return sinhf(__x); }
+#else
+    inline float _CPP_sinh_capture(float __x)
+      { return sinh(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SQRTF
+    inline float _CPP_sqrt_capture(float __x)
+      { return __builtin_sqrtf(__x); }
+#elif _GLIBCPP_HAVE_SQRTF
+    inline float _CPP_sqrt_capture(float __x)
+      { return sqrtf(__x); }
+#else
+    inline float _CPP_sqrt_capture(float __x)
+      { return sqrt(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_TANF
+    inline float _CPP_tan_capture(float __x)
+      { return __builtin_tanf(__x); }
+#elif _GLIBCPP_HAVE_TANF
+    inline float _CPP_tan_capture(float __x)
+      { return tanf(__x); }
+#else
+    inline float _CPP_tan_capture(float __x)
+      { return tan(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_TANHF
+    inline float _CPP_tanh_capture(float __x)
+      { return __builtin_tanhf(__x); }
+#elif _GLIBCPP_HAVE_TANHF
+    inline float _CPP_tanh_capture(float __x)
+      { return tanhf(__x); }
+#else
+    inline float _CPP_tanh_capture(float __x)
+      { return tanh(static_cast<double>(__x)); }
+#endif
+
+    //
+    // double
+    //
+
+#if _GLIBCPP_HAVE_BUILTIN_ACOS
+    inline double _CPP_acos_capture(double __x)
+      { return __builtin_acos(__x); }
+#else
+    inline double _CPP_acos_capture(double __x)
+      { return acos(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ASIN
+    inline double _CPP_asin_capture(double __x)
+      { return __builtin_asin(__x); }
+#else
+    inline double _CPP_asin_capture(double __x)
+      { return asin(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ATAN
+    inline double _CPP_atan_capture(double __x)
+      { return __builtin_atan(__x); }
+#else
+    inline double _CPP_atan_capture(double __x)
+      { return atan(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ATAN2
+    inline double _CPP_atan2_capture(double __y, double __x)
+      { return __builtin_atan2(__y, __x); }
+#else
+    inline double _CPP_atan2_capture(double __y, double __x)
+      { return atan2(__y, __x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_CEIL
+    inline double _CPP_ceil_capture(double __x)
+      { return __builtin_fceil(__x); }
+#else
+    inline double _CPP_ceil_capture(double __x)
+      { return ceil(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_COS
+    inline double _CPP_cos_capture(double __x)
+      { return __builtin_cos(__x); }
+#else
+    inline double _CPP_cos_capture(double __x)
+      { return cos(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_COSH
+    inline double _CPP_cosh_capture(double __x)
+      { return __builtin_cosh(__x); }
+#else
+    inline double _CPP_cosh_capture(double __x)
+      { return cosh(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_EXP
+    inline double _CPP_exp_capture(double __x)
+      { return __builtin_exp(__x); }
+#else
+    inline double _CPP_exp_capture(double __x)
+      { return exp(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FABS
+    inline double _CPP_fabs_capture(double __x)
+      { return __builtin_fabs(__x); }
+#else
+    inline double _CPP_fabs_capture(double __x)
+      { return fabs(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FLOOR
+    inline double _CPP_floor_capture(double __x)
+      { return __builtin_ffloor(__x); }
+#else
+    inline double _CPP_floor_capture(double __x)
+      { return floor(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FMOD
+    inline double _CPP_fmod_capture(double __x, double __y)
+      { return __builtin_fmod(__x, __y); }
+#else
+    inline double _CPP_fmod_capture(double __x, double __y)
+      { return fmod(__x, __y); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FREXP
+    inline double _CPP_frexp_capture(double __x, int* __exp)
+      { return __builtin_frexp(__x, __exp); }
+#else
+    inline double _CPP_frexp_capture(double __x, int* __exp)
       { return frexp(__x, __exp); }
-    inline double _CPP_ldexp_capture(double __x, int __exp) 
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LDEXP
+    inline double _CPP_ldexp_capture(double __x, int __exp)
+      { return __builtin_ldexp(__x, __exp); }
+#else
+    inline double _CPP_ldexp_capture(double __x, int __exp)
       { return ldexp(__x, __exp); }
-    inline double _CPP_log_capture(double __x)   { return log(__x); }
-    inline double _CPP_log10_capture(double __x) { return log10(__x); }
-    inline double _CPP_modf_capture(double __x, double* __iptr) 
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LOG
+    inline double _CPP_log_capture(double __x)
+      { return __builtin_log(__x); }
+#else
+    inline double _CPP_log_capture(double __x)
+      { return log(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LOG10
+    inline double _CPP_log10_capture(double __x)
+      { return __builtin_log10(__x); }
+#else
+    inline double _CPP_log10_capture(double __x)
+      { return log10(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_MODF
+    inline double _CPP_modf_capture(double __x, double* __iptr)
+      { return __builtin_modf(__x, __iptr); }
+#else
+    inline double _CPP_modf_capture(double __x, double* __iptr)
       { return modf(__x, __iptr); }
-    inline double _CPP_pow_capture(double __x, double __y) 
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_POW
+    inline double _CPP_pow_capture(double __x, double __y)
+      { return __builtin_pow(__x, static_cast<double>(__y)); }
+#else
+    inline double _CPP_pow_capture(double __x, double __y)
       { return pow(__x, __y); }
-    inline double _CPP_sqrt_capture(double __x)  { return sqrt(__x); }
-    inline double _CPP_ceil_capture(double __x)  { return ceil(__x); }
-    inline double _CPP_fabs_capture(double __x)  { return fabs(__x); }
-    inline double _CPP_floor_capture(double __x) { return floor(__x); }
-    inline double _CPP_fmod_capture(double __x, double __y) 
-      { return fmod(__x, __y); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SIN
+    inline double _CPP_sin_capture(double __x)
+      { return __builtin_sin(__x); }
+#else
+    inline double _CPP_sin_capture(double __x)
+      { return sin(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SINH
+    inline double _CPP_sinh_capture(double __x)
+      { return __builtin_sinh(__x); }
+#else
+    inline double _CPP_sinh_capture(double __x)
+      { return sinh(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SQRT
+    inline double _CPP_sqrt_capture(double __x)
+      { return __builtin_fsqrt(__x); }
+#else
+    inline double _CPP_sqrt_capture(double __x)
+      { return sqrt(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_TAN
+    inline double _CPP_tan_capture(double __x)
+      { return __builtin_tan(__x); }
+#else
+    inline double _CPP_tan_capture(double __x)
+      { return tan(__x); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_TANH
+    inline double _CPP_tanh_capture(double __x)
+      { return __builtin_tanh(__x); }
+#else
+    inline double _CPP_tanh_capture(double __x)
+      { return tanh(__x); }
+#endif
+
+    //
+    // long double
+    //
+
+#if _GLIBCPP_HAVE_BUILTIN_ACOSL
+    inline long double _CPP_acos_capture(long double __x)
+      { return __builtin_acosl(__x); }
+#elif _GLIBCPP_HAVE_ACOSL
+    inline long double _CPP_acos_capture(long double __x)
+      { return acosl(__x); }
+#else
+    inline long double _CPP_acos_capture(long double __x)
+      { return acos(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ASINL
+    inline long double _CPP_asin_capture(long double __x)
+      { return __builtin_asinl(__x); }
+#elif _GLIBCPP_HAVE_ASINL
+    inline long double _CPP_asin_capture(long double __x)
+      { return asinl(__x); }
+#else
+    inline long double _CPP_asin_capture(long double __x)
+      { return asin(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ATANL
+    inline long double _CPP_atan_capture(long double __x)
+      { return __builtin_atanl(__x); }
+#elif _GLIBCPP_HAVE_ATANL
+    inline long double _CPP_atan_capture(long double __x)
+      { return atanl(__x); }
+#else
+    inline long double _CPP_atan_capture(long double __x)
+      { return atan(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_ATAN2L
+    inline long double _CPP_atan2_capture(long double __y, long double __x)
+      { return __builtin_atan2l(__y, __x); }
+#elif _GLIBCPP_HAVE_ATAN2L
+    inline long double _CPP_atan2_capture(long double __y, long double __x)
+      { return atan2l(__y, __x); }
+#else
+    inline long double _CPP_atan2_capture(long double __y, long double __x)
+      { return atan2(static_cast<double>(__y), static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_CEILL
+    inline long double _CPP_ceil_capture(long double __x)
+      { return __builtin_ceill(__x); }
+#elif _GLIBCPP_HAVE_CEILL
+    inline long double _CPP_ceil_capture(long double __x)
+      { return ceill(__x); }
+#else
+    inline long double _CPP_ceil_capture(long double __x)
+      { return ceil(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_COSL
+    inline long double _CPP_cos_capture(long double __x)
+      { return __builtin_cosl(__x); }
+#elif _GLIBCPP_HAVE_COSL
+    inline long double _CPP_cos_capture(long double __x)
+      { return cosl(__x); }
+#else
+    inline long double _CPP_cos_capture(long double __x)
+      { return cos(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_COSHL
+    inline long double _CPP_cosh_capture(long double __x)
+      { return __builtin_coshl(__x); }
+#elif _GLIBCPP_HAVE_COSHL
+    inline long double _CPP_cosh_capture(long double __x)
+      { return coshl(__x); }
+#else
+    inline long double _CPP_cosh_capture(long double __x)
+      { return cosh(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_EXPL
+    inline long double _CPP_exp_capture(long double __x)
+      { return __builtin_expl(__x); }
+#elif _GLIBCPP_HAVE_EXPL
+    inline long double _CPP_exp_capture(long double __x)
+      { return expl(__x); }
+#else
+    inline long double _CPP_exp_capture(long double __x)
+      { return exp(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FABSL
+    inline long double _CPP_fabs_capture(long double __x)
+      { return __builtin_fabsl(__x); }
+#elif _GLIBCPP_HAVE_FABSL
+    inline long double _CPP_fabs_capture(long double __x)
+      { return fabsl(__x); }
+#else
+    inline long double _CPP_fabs_capture(long double __x)
+      { return fabs(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FLOORL
+    inline long double _CPP_floor_capture(long double __x)
+      { return __builtin_floorl(__x); }
+#elif _GLIBCPP_HAVE_FLOORL
+    inline long double _CPP_floor_capture(long double __x)
+      { return floorl(__x); }
+#else
+    inline long double _CPP_floor_capture(long double __x)
+      { return floor(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FMODL
+    inline long double _CPP_fmod_capture(long double __x, long double __y)
+      { return __builtin_fmodl(__x, __y); }
+#elif _GLIBCPP_HAVE_FMODL
+    inline long double _CPP_fmod_capture(long double __x, long double __y)
+      { return fmodl(__x, __y); }
+#else
+    inline long double _CPP_fmod_capture(long double __x, long double __y)
+      { return fmod(static_cast<double>(__x), static_cast<double>(__y)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_FREXPL
+    inline long double _CPP_frexp_capture(long double __x, int* __exp)
+      { return __builtin_frexpl(__x, __exp); }
+#elif _GLIBCPP_HAVE_FREXPL
+    inline long double _CPP_frexp_capture(long double __x, int* __exp)
+      { return frexpl(__x, __exp); }
+#else
+    inline long double _CPP_frexp_capture(long double __x, int* __exp)
+      { return frexp(static_cast<double>(__x), __exp); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LDEXPL
+    inline long double _CPP_ldexp_capture(long double __x, int __exp)
+      { return __builtin_ldexpl(__x, __exp); }
+#elif _GLIBCPP_HAVE_LDEXPL
+    inline long double _CPP_ldexp_capture(long double __x, int __exp)
+      { return ldexpl(__x, __exp); }
+#else
+    inline long double _CPP_ldexp_capture(long double __x, int __exp)
+      { return ldexp(static_cast<double>(__x), __exp); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LOGL
+    inline long double _CPP_log_capture(long double __x)
+      { return __builtin_logl(__x); }
+#elif _GLIBCPP_HAVE_LOGL
+    inline long double _CPP_log_capture(long double __x)
+      { return logl(__x); }
+#else
+    inline long double _CPP_log_capture(long double __x)
+      { return log(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_LOG10L
+    inline long double _CPP_log10_capture(long double __x)
+      { return __builtin_log10l(__x); }
+#elif _GLIBCPP_HAVE_LOG10L
+    inline long double _CPP_log10_capture(long double __x)
+      { return log10l(__x); }
+#else
+    inline long double _CPP_log10_capture(long double __x)
+      { return log10(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_MODFL
+    inline long double _CPP_mod_capture(long double __x, long double* __iptr)
+      { return __builtin_modfl(__x, __iptr); }
+#elif _GLIBCPP_HAVE_MODFL
+    inline long double _CPP_modf_capture(long double __x, long double* __iptr)
+      { return modfl(__x, __iptr); }
+#else
+    inline long double _CPP_modf_capture(long double __x, long double* __iptr)
+    {
+       double __tmp;
+       double __res = _C_legacy::modf(static_cast<double>(__x), &__tmp);
+       *__iptr = static_cast<long double> (__tmp);
+       return __res;
+    }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_POWL
+    inline long double _CPP_pow_capture(long double __x, long double __y)
+      { return __builtin_powl(__x, __y); }
+#elif _GLIBCPP_HAVE_POWL
+    inline long double _CPP_pow_capture(long double __x, long double __y)
+      { return powl(__x, __y); }
+#else
+    inline long double _CPP_pow_capture(long double __x, long double __y)
+      { return pow(static_cast<double>(__x), static_cast<double>(__y)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SINL
+    inline long double _CPP_sin_capture(long double __x)
+      { return __builtin_sinl(__x); }
+#elif _GLIBCPP_HAVE_SINL
+    inline long double _CPP_sin_capture(long double __x)
+      { return sinl(__x); }
+#else
+    inline long double _CPP_sin_capture(long double __x)
+      { return sin(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SINHL
+    inline long double _CPP_sinh_capture(long double __x)
+      { return __builtin_sinhl(__x); }
+#elif _GLIBCPP_HAVE_SINHL
+    inline long double _CPP_sinh_capture(long double __x)
+      { return sinhl(__x); }
+#else
+    inline long double _CPP_sinh_capture(long double __x)
+      { return sinh(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_SQRTL
+    inline long double _CPP_sqrt_capture(long double __x)
+      { return __builtin_sqrtl(__x); }
+#elif _GLIBCPP_HAVE_SQRTL
+    inline long double _CPP_sqrt_capture(long double __x)
+      { return sqrtl(__x); }
+#else
+    inline long double _CPP_sqrt_capture(long double __x)
+      { return sqrt(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_TANL
+    inline long double _CPP_tan_capture(long double __x)
+      { return __builtin_tanl(__x); }
+#elif _GLIBCPP_HAVE_TANL
+    inline long double _CPP_tan_capture(long double __x)
+      { return tanl(__x); }
+#else
+    inline long double _CPP_tan_capture(long double __x)
+      { return tan(static_cast<double>(__x)); }
+#endif
+
+#if _GLIBCPP_HAVE_BUILTIN_TANHL
+    inline long double _CPP_tanh_capture(long double __x)
+      { return __builtin_tanhl(__x); }
+#elif _GLIBCPP_HAVE_TANHL
+    inline long double _CPP_tanh_capture(long double __x)
+      { return tanhl(__x); }
+#else
+    inline long double _CPP_tanh_capture(long double __x)
+      { return tanh(static_cast<double>(__x)); }
+#endif
+
 
     namespace _C_shadow { }
   } // close namespace ::_C_legacy::
 
 # undef HUGE_VAL
 # define HUGE_VAL ::_C_legacy::_CPP_HUGE_VAL_capture()
+# undef abs
 # undef acos
 # undef asin
 # undef atan
 # undef atan2
+# undef ceil
 # undef cos
-# undef sin
-# undef tan
 # undef cosh
-# undef sinh
-# undef tanh
 # undef exp
+# undef fabs
+# undef floor
+# undef fmod
 # undef frexp
 # undef ldexp
 # undef log
 # undef log10
 # undef modf
 # undef pow
+# undef sin
+# undef sinh
 # undef sqrt
-# undef ceil
-# undef fabs
-# undef floor
-# undef fmod
+# undef tan
+# undef tanh
 
   namespace _C_legacy {
     namespace _C_shadow {
-      inline double acos(double __x)
-        { return ::_C_legacy::_CPP_acos_capture(__x); }
-      inline double asin(double __x)
-        { return ::_C_legacy::_CPP_asin_capture(__x); }
-      inline double atan(double __x)
-        { return ::_C_legacy::_CPP_atan_capture(__x); }
-      inline double atan2(double __y, double __x)
-      	{ return ::_C_legacy::_CPP_atan2_capture(__y,__x); }
-      inline double cos(double __x)
-        { return ::_C_legacy::_CPP_cos_capture(__x); }
-      inline double sin(double __x)
-        { return ::_C_legacy::_CPP_sin_capture(__x); }
-      inline double tan(double __x)
-        { return ::_C_legacy::_CPP_tan_capture(__x); }
-      inline double cosh(double __x)
-        { return ::_C_legacy::_CPP_cosh_capture(__x); }
-      inline double sinh(double __x)
-        { return ::_C_legacy::_CPP_sinh_capture(__x); }
-      inline double tanh(double __x)
-        { return ::_C_legacy::_CPP_tanh_capture(__x); }
-      inline double exp(double __x)
-        { return ::_C_legacy::_CPP_exp_capture(__x); }
-      inline double frexp(double __x, int* __exp)
-      	{ return ::_C_legacy::_CPP_frexp_capture(__x, __exp); }
-      inline double ldexp(double __x, int __exp)
-      	{ return ::_C_legacy::_CPP_ldexp_capture(__x, __exp); }
-      inline double log(double __x)
-        { return ::_C_legacy::_CPP_log_capture(__x); }
-      inline double log10(double __x)
-        { return ::_C_legacy::_CPP_log10_capture(__x); }
-      inline double modf(double __x, double* __iptr)
-      	{ return ::_C_legacy::_CPP_modf_capture(__x, __iptr); }
-      inline double pow(double __x, double __y)
-      	{ return ::_C_legacy::_CPP_pow_capture(__x, __y); }
-      inline double sqrt(double __x)
-        { return ::_C_legacy::_CPP_sqrt_capture(__x); }
-      inline double ceil(double __x)
-        { return ::_C_legacy::_CPP_ceil_capture(__x); }
-      inline double fabs(double __x)
-        { return ::_C_legacy::_CPP_fabs_capture(__x); }
-      inline double floor(double __x)
-        { return ::_C_legacy::_CPP_floor_capture(__x); }
-      inline double fmod(double __x, double __y)
-      	{ return ::_C_legacy::_CPP_fmod_capture(__x, __y); }
-
     }
   }
   namespace std {
 
-    // Adopt C names into std::
-    using ::_C_legacy::_C_shadow::acos;
-    using ::_C_legacy::_C_shadow::asin;
-    using ::_C_legacy::_C_shadow::atan;
-    using ::_C_legacy::_C_shadow::atan2;
-    using ::_C_legacy::_C_shadow::cos;
-    using ::_C_legacy::_C_shadow::sin;
-    using ::_C_legacy::_C_shadow::tan;
-    using ::_C_legacy::_C_shadow::cosh;
-    using ::_C_legacy::_C_shadow::sinh;
-    using ::_C_legacy::_C_shadow::tanh;
-    using ::_C_legacy::_C_shadow::exp;
-    using ::_C_legacy::_C_shadow::frexp;
-    using ::_C_legacy::_C_shadow::ldexp;
-    using ::_C_legacy::_C_shadow::log;
-    using ::_C_legacy::_C_shadow::log10;
-    using ::_C_legacy::_C_shadow::modf;
-    using ::_C_legacy::_C_shadow::pow;
-    using ::_C_legacy::_C_shadow::sqrt;
-    using ::_C_legacy::_C_shadow::ceil;
-    using ::_C_legacy::_C_shadow::fabs;
-    using ::_C_legacy::_C_shadow::floor;
-    using ::_C_legacy::_C_shadow::fmod;
+    //
+    // float
+    //
+
+    inline float abs(float __x)
+      { return ::_C_legacy::_CPP_fabs_capture(__x); }
+
+    inline float acos(float __x)
+      { return ::_C_legacy::_CPP_acos_capture(__x); }
+
+    inline float asin(float __x)
+      { return ::_C_legacy::_CPP_asin_capture(__x); }
+
+    inline float atan(float __x)
+      { return ::_C_legacy::_CPP_atan_capture(__x); }
+
+    inline float atan2(float __y, float __x)
+      { return ::_C_legacy::_CPP_atan2_capture(__y, __x); }
+
+    inline float ceil(float __x)
+      { return ::_C_legacy::_CPP_ceil_capture(__x); }
+
+    inline float cos(float __x)
+      { return ::_C_legacy::_CPP_cos_capture(__x); }
+
+    inline float cosh(float __x)
+      { return ::_C_legacy::_CPP_cosh_capture(__x); }
+
+    inline float exp(float __x)
+      { return ::_C_legacy::_CPP_exp_capture(__x); }
+
+    inline float fabs(float __x)
+      { return ::_C_legacy::_CPP_fabs_capture(__x); }
+
+    inline float floor(float __x)
+      { return ::_C_legacy::_CPP_floor_capture(__x); }
+
+    inline float fmod(float __x, float __y)
+      { return ::_C_legacy::_CPP_fmod_capture(__x, __y); }
+
+    inline float frexp(float __x, int* __exp)
+      { return ::_C_legacy::_CPP_frexp_capture(__x, __exp); }
+
+    inline float ldexp(float __x, int __exp)
+      { return ::_C_legacy::_CPP_ldexp_capture(__x, __exp); }
+
+    inline float log(float __x)
+      { return ::_C_legacy::_CPP_log_capture(__x); }
+
+    inline float log10(float __x)
+      { return ::_C_legacy::_CPP_log10_capture(__x); }
+
+    inline float modf(float __x, float* __iptr)
+      { return ::_C_legacy::_CPP_modf_capture(__x, __iptr); }
+
+    inline float pow(float __x, float __y)
+      { return ::_C_legacy::_CPP_pow_capture(__x, __y); }
+
+    float pow(float, int);
+
+    inline float sin(float __x)
+      { return ::_C_legacy::_CPP_sin_capture(__x); }
+
+    inline float sinh(float __x)
+      { return ::_C_legacy::_CPP_sinh_capture(__x); }
+
+    inline float sqrt(float __x)
+      { return ::_C_legacy::_CPP_sqrt_capture(__x); }
+
+    inline float tan(float __x)
+      { return ::_C_legacy::_CPP_tan_capture(__x); }
+
+    inline float tanh(float __x)
+      { return ::_C_legacy::_CPP_tanh_capture(__x); }
+
+    //
+    // double
+    //
+
+    inline double abs(double __x)
+      { return ::_C_legacy::_CPP_fabs_capture(__x); }
+
+    inline double acos(double __x)
+      { return ::_C_legacy::_CPP_acos_capture(__x); }
+
+    inline double asin(double __x)
+      { return ::_C_legacy::_CPP_asin_capture(__x); }
+
+    inline double atan(double __x)
+      { return ::_C_legacy::_CPP_atan_capture(__x); }
+
+    inline double atan2(double __y, double __x)
+      { return ::_C_legacy::_CPP_atan2_capture(__y, __x); }
+
+    inline double ceil(double __x)
+      { return ::_C_legacy::_CPP_ceil_capture(__x); }
+
+    inline double cos(double __x)
+      { return ::_C_legacy::_CPP_cos_capture(__x); }
+
+    inline double cosh(double __x)
+      { return ::_C_legacy::_CPP_cosh_capture(__x); }
+
+    inline double exp(double __x)
+      { return ::_C_legacy::_CPP_exp_capture(__x); }
+
+    inline double fabs(double __x)
+      { return ::_C_legacy::_CPP_fabs_capture(__x); }
+
+    inline double floor(double __x)
+      { return ::_C_legacy::_CPP_floor_capture(__x); }
+
+    inline double fmod(double __x, double __y)
+      { return ::_C_legacy::_CPP_fmod_capture(__x, __y); }
+
+    inline double frexp(double __x, int* __exp)
+      { return ::_C_legacy::_CPP_frexp_capture(__x, __exp); }
+
+    inline double ldexp(double __x, int __exp)
+      { return ::_C_legacy::_CPP_ldexp_capture(__x, __exp); }
+
+    inline double log(double __x)
+      { return ::_C_legacy::_CPP_log_capture(__x); }
+
+    inline double log10(double __x)
+      { return ::_C_legacy::_CPP_log10_capture(__x); }
+
+    inline double modf(double __x, double* __iptr)
+      { return ::_C_legacy::_CPP_modf_capture(__x, __iptr); }
+
+    inline double pow(double __x, double __y)
+      { return ::_C_legacy::_CPP_pow_capture(__x, __y); }
+
+    double pow (double, int);
+
+    inline double sin(double __x)
+      { return ::_C_legacy::_CPP_sin_capture(__x); }
+
+    inline double sinh(double __x)
+      { return ::_C_legacy::_CPP_sinh_capture(__x); }
+
+    inline double sqrt(double __x)
+      { return ::_C_legacy::_CPP_sqrt_capture(__x); }
+
+    inline double tan(double __x)
+      { return ::_C_legacy::_CPP_tan_capture(__x); }
+
+    inline double tanh(double __x)
+      { return ::_C_legacy::_CPP_tanh_capture(__x); }
+
+    //
+    // long double
+    //
+    inline long double abs(long double __x)
+      { return ::_C_legacy::_CPP_fabs_capture(__x); }
+
+    inline long double acos(long double __x)
+      { return ::_C_legacy::_CPP_acos_capture(__x); }
+
+    inline long double asin(long double __x)
+      { return ::_C_legacy::_CPP_asin_capture(__x); }
+
+    inline long double atan(long double __x)
+      { return ::_C_legacy::_CPP_atan_capture(__x); }
+
+    inline long double atan2(long double __y, long double __x)
+      { return ::_C_legacy::_CPP_atan2_capture(__y, __x); }
+
+    inline long double ceil(long double __x)
+      { return ::_C_legacy::_CPP_ceil_capture(__x); }
+
+    inline long double cos(long double __x)
+      { return ::_C_legacy::_CPP_cos_capture(__x); }
+
+    inline long double cosh(long double __x)
+      { return ::_C_legacy::_CPP_cosh_capture(__x); }
+
+    inline long double exp(long double __x)
+      { return ::_C_legacy::_CPP_exp_capture(__x); }
+
+    inline long double fabs(long double __x)
+      { return ::_C_legacy::_CPP_fabs_capture(__x); }
+
+    inline long double floor(long double __x)
+      { return ::_C_legacy::_CPP_floor_capture(__x); }
+
+    inline long double fmod(long double __x, long double __y)
+      { return ::_C_legacy::_CPP_fmod_capture(__x, __y); }
+
+    inline long double frexp(long double __x, int* __exp)
+      { return ::_C_legacy::_CPP_frexp_capture(__x, __exp); }
+
+    inline long double ldexp(long double __x, int __exp)
+      { return ::_C_legacy::_CPP_ldexp_capture(__x, __exp); }
+
+    inline long double log(long double __x)
+      { return ::_C_legacy::_CPP_log_capture(__x); }
+
+    inline long double log10(long double __x)
+      { return ::_C_legacy::_CPP_log10_capture(__x); }
+
+    inline long double modf(long double __x, long double* __iptr)
+      { return ::_C_legacy::_CPP_modf_capture(__x, __iptr); }
+
+    inline long double pow(long double __x, long double __y)
+      { return ::_C_legacy::_CPP_pow_capture(__x, __y); }
+
+    long double pow (long double, int);
+
+    inline long double sin(long double __x)
+      { return ::_C_legacy::_CPP_sin_capture(__x); }
+
+    inline long double sinh(long double __x)
+      { return ::_C_legacy::_CPP_sinh_capture(__x); }
+
+    inline long double sqrt(long double __x)
+      { return ::_C_legacy::_CPP_sqrt_capture(__x); }
+
+    inline long double tan(long double __x)
+      { return ::_C_legacy::_CPP_tan_capture(__x); }
+
+    inline long double tanh(long double __x)
+      { return ::_C_legacy::_CPP_tanh_capture(__x); }
+
 
   } // close namespace std::