123 files changed, 59 insertions, 61 deletions
diff --git a/sysdeps/i386/fpu/w_sqrt.c b/sysdeps/i386/fpu/w_sqrt_compat.c
index 19b5074179..ddd36d0964 100644
--- a/sysdeps/i386/fpu/w_sqrt.c
+++ b/sysdeps/i386/fpu/w_sqrt_compat.c
@@ -5,4 +5,4 @@
 #include <math_private.h>
 #undef __ieee754_sqrt
 extern double __ieee754_sqrt (double);
-#include <math/w_sqrt.c>
+#include <math/w_sqrt_compat.c>
diff --git a/sysdeps/ia64/fpu/w_acos.c b/sysdeps/ia64/fpu/w_acos_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_acos.c
+++ b/sysdeps/ia64/fpu/w_acos_compat.c
diff --git a/sysdeps/ia64/fpu/w_acosf.c b/sysdeps/ia64/fpu/w_acosf_compat.c
index 1cc8931700..1cc8931700 100644
--- a/sysdeps/ia64/fpu/w_acosf.c
+++ b/sysdeps/ia64/fpu/w_acosf_compat.c
diff --git a/sysdeps/ia64/fpu/w_acosh.c b/sysdeps/ia64/fpu/w_acosh_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_acosh.c
+++ b/sysdeps/ia64/fpu/w_acosh_compat.c
diff --git a/sysdeps/ia64/fpu/w_acoshf.c b/sysdeps/ia64/fpu/w_acoshf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_acoshf.c
+++ b/sysdeps/ia64/fpu/w_acoshf_compat.c
diff --git a/sysdeps/ia64/fpu/w_acoshl.c b/sysdeps/ia64/fpu/w_acoshl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_acoshl.c
+++ b/sysdeps/ia64/fpu/w_acoshl_compat.c
diff --git a/sysdeps/ia64/fpu/w_acosl.c b/sysdeps/ia64/fpu/w_acosl_compat.c
index 1cc8931700..1cc8931700 100644
--- a/sysdeps/ia64/fpu/w_acosl.c
+++ b/sysdeps/ia64/fpu/w_acosl_compat.c
diff --git a/sysdeps/ia64/fpu/w_asin.c b/sysdeps/ia64/fpu/w_asin_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_asin.c
+++ b/sysdeps/ia64/fpu/w_asin_compat.c
diff --git a/sysdeps/ia64/fpu/w_asinf.c b/sysdeps/ia64/fpu/w_asinf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_asinf.c
+++ b/sysdeps/ia64/fpu/w_asinf_compat.c
diff --git a/sysdeps/ia64/fpu/w_asinl.c b/sysdeps/ia64/fpu/w_asinl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_asinl.c
+++ b/sysdeps/ia64/fpu/w_asinl_compat.c
diff --git a/sysdeps/ia64/fpu/w_atan2.c b/sysdeps/ia64/fpu/w_atan2_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_atan2.c
+++ b/sysdeps/ia64/fpu/w_atan2_compat.c
diff --git a/sysdeps/ia64/fpu/w_atan2f.c b/sysdeps/ia64/fpu/w_atan2f_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_atan2f.c
+++ b/sysdeps/ia64/fpu/w_atan2f_compat.c
diff --git a/sysdeps/ia64/fpu/w_atan2l.c b/sysdeps/ia64/fpu/w_atan2l_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_atan2l.c
+++ b/sysdeps/ia64/fpu/w_atan2l_compat.c
diff --git a/sysdeps/ia64/fpu/w_atanh.c b/sysdeps/ia64/fpu/w_atanh_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_atanh.c
+++ b/sysdeps/ia64/fpu/w_atanh_compat.c
diff --git a/sysdeps/ia64/fpu/w_atanhf.c b/sysdeps/ia64/fpu/w_atanhf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_atanhf.c
+++ b/sysdeps/ia64/fpu/w_atanhf_compat.c
diff --git a/sysdeps/ia64/fpu/w_atanhl.c b/sysdeps/ia64/fpu/w_atanhl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_atanhl.c
+++ b/sysdeps/ia64/fpu/w_atanhl_compat.c
diff --git a/sysdeps/ia64/fpu/w_cosh.c b/sysdeps/ia64/fpu/w_cosh_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_cosh.c
+++ b/sysdeps/ia64/fpu/w_cosh_compat.c
diff --git a/sysdeps/ia64/fpu/w_coshf.c b/sysdeps/ia64/fpu/w_coshf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_coshf.c
+++ b/sysdeps/ia64/fpu/w_coshf_compat.c
diff --git a/sysdeps/ia64/fpu/w_coshl.c b/sysdeps/ia64/fpu/w_coshl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_coshl.c
+++ b/sysdeps/ia64/fpu/w_coshl_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp10.c b/sysdeps/ia64/fpu/w_exp10_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_exp10.c
+++ b/sysdeps/ia64/fpu/w_exp10_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp10f.c b/sysdeps/ia64/fpu/w_exp10f_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_exp10f.c
+++ b/sysdeps/ia64/fpu/w_exp10f_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp10l.c b/sysdeps/ia64/fpu/w_exp10l_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_exp10l.c
+++ b/sysdeps/ia64/fpu/w_exp10l_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp2.c b/sysdeps/ia64/fpu/w_exp2_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_exp2.c
+++ b/sysdeps/ia64/fpu/w_exp2_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp2f.c b/sysdeps/ia64/fpu/w_exp2f_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_exp2f.c
+++ b/sysdeps/ia64/fpu/w_exp2f_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp2l.c b/sysdeps/ia64/fpu/w_exp2l_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_exp2l.c
+++ b/sysdeps/ia64/fpu/w_exp2l_compat.c
diff --git a/sysdeps/ia64/fpu/w_fmod.c b/sysdeps/ia64/fpu/w_fmod_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_fmod.c
+++ b/sysdeps/ia64/fpu/w_fmod_compat.c
diff --git a/sysdeps/ia64/fpu/w_fmodf.c b/sysdeps/ia64/fpu/w_fmodf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_fmodf.c
+++ b/sysdeps/ia64/fpu/w_fmodf_compat.c
diff --git a/sysdeps/ia64/fpu/w_fmodl.c b/sysdeps/ia64/fpu/w_fmodl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_fmodl.c
+++ b/sysdeps/ia64/fpu/w_fmodl_compat.c
diff --git a/sysdeps/ia64/fpu/w_hypot.c b/sysdeps/ia64/fpu/w_hypot_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_hypot.c
+++ b/sysdeps/ia64/fpu/w_hypot_compat.c
diff --git a/sysdeps/ia64/fpu/w_hypotf.c b/sysdeps/ia64/fpu/w_hypotf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_hypotf.c
+++ b/sysdeps/ia64/fpu/w_hypotf_compat.c
diff --git a/sysdeps/ia64/fpu/w_hypotl.c b/sysdeps/ia64/fpu/w_hypotl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_hypotl.c
+++ b/sysdeps/ia64/fpu/w_hypotl_compat.c
diff --git a/sysdeps/ia64/fpu/w_log.c b/sysdeps/ia64/fpu/w_log10_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_log.c
+++ b/sysdeps/ia64/fpu/w_log10_compat.c
diff --git a/sysdeps/ia64/fpu/w_log10.c b/sysdeps/ia64/fpu/w_log10f_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_log10.c
+++ b/sysdeps/ia64/fpu/w_log10f_compat.c
diff --git a/sysdeps/ia64/fpu/w_log10f.c b/sysdeps/ia64/fpu/w_log10l_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_log10f.c
+++ b/sysdeps/ia64/fpu/w_log10l_compat.c
diff --git a/sysdeps/ia64/fpu/w_log10l.c b/sysdeps/ia64/fpu/w_log2_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_log10l.c
+++ b/sysdeps/ia64/fpu/w_log2_compat.c
diff --git a/sysdeps/ia64/fpu/w_log2.c b/sysdeps/ia64/fpu/w_log2f_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_log2.c
+++ b/sysdeps/ia64/fpu/w_log2f_compat.c
diff --git a/sysdeps/ia64/fpu/w_log2f.c b/sysdeps/ia64/fpu/w_log2l_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_log2f.c
+++ b/sysdeps/ia64/fpu/w_log2l_compat.c
diff --git a/sysdeps/ia64/fpu/w_log2l.c b/sysdeps/ia64/fpu/w_log_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_log2l.c
+++ b/sysdeps/ia64/fpu/w_log_compat.c
diff --git a/sysdeps/ia64/fpu/w_logf.c b/sysdeps/ia64/fpu/w_logf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_logf.c
+++ b/sysdeps/ia64/fpu/w_logf_compat.c
diff --git a/sysdeps/ia64/fpu/w_logl.c b/sysdeps/ia64/fpu/w_logl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_logl.c
+++ b/sysdeps/ia64/fpu/w_logl_compat.c
diff --git a/sysdeps/ia64/fpu/w_pow.c b/sysdeps/ia64/fpu/w_pow_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_pow.c
+++ b/sysdeps/ia64/fpu/w_pow_compat.c
diff --git a/sysdeps/ia64/fpu/w_powf.c b/sysdeps/ia64/fpu/w_powf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_powf.c
+++ b/sysdeps/ia64/fpu/w_powf_compat.c
diff --git a/sysdeps/ia64/fpu/w_powl.c b/sysdeps/ia64/fpu/w_powl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_powl.c
+++ b/sysdeps/ia64/fpu/w_powl_compat.c
diff --git a/sysdeps/ia64/fpu/w_remainder.c b/sysdeps/ia64/fpu/w_remainder_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_remainder.c
+++ b/sysdeps/ia64/fpu/w_remainder_compat.c
diff --git a/sysdeps/ia64/fpu/w_remainderf.c b/sysdeps/ia64/fpu/w_remainderf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_remainderf.c
+++ b/sysdeps/ia64/fpu/w_remainderf_compat.c
diff --git a/sysdeps/ia64/fpu/w_remainderl.c b/sysdeps/ia64/fpu/w_remainderl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_remainderl.c
+++ b/sysdeps/ia64/fpu/w_remainderl_compat.c
diff --git a/sysdeps/ia64/fpu/w_scalb.c b/sysdeps/ia64/fpu/w_scalb_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_scalb.c
+++ b/sysdeps/ia64/fpu/w_scalb_compat.c
diff --git a/sysdeps/ia64/fpu/w_scalbf.c b/sysdeps/ia64/fpu/w_scalbf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_scalbf.c
+++ b/sysdeps/ia64/fpu/w_scalbf_compat.c
diff --git a/sysdeps/ia64/fpu/w_scalbl.c b/sysdeps/ia64/fpu/w_scalbl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_scalbl.c
+++ b/sysdeps/ia64/fpu/w_scalbl_compat.c
diff --git a/sysdeps/ia64/fpu/w_sinh.c b/sysdeps/ia64/fpu/w_sinh_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_sinh.c
+++ b/sysdeps/ia64/fpu/w_sinh_compat.c
diff --git a/sysdeps/ia64/fpu/w_sinhf.c b/sysdeps/ia64/fpu/w_sinhf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_sinhf.c
+++ b/sysdeps/ia64/fpu/w_sinhf_compat.c
diff --git a/sysdeps/ia64/fpu/w_sinhl.c b/sysdeps/ia64/fpu/w_sinhl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_sinhl.c
+++ b/sysdeps/ia64/fpu/w_sinhl_compat.c
diff --git a/sysdeps/ia64/fpu/w_sqrt.c b/sysdeps/ia64/fpu/w_sqrt_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_sqrt.c
+++ b/sysdeps/ia64/fpu/w_sqrt_compat.c
diff --git a/sysdeps/ia64/fpu/w_sqrtf.c b/sysdeps/ia64/fpu/w_sqrtf_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_sqrtf.c
+++ b/sysdeps/ia64/fpu/w_sqrtf_compat.c
diff --git a/sysdeps/ia64/fpu/w_sqrtl.c b/sysdeps/ia64/fpu/w_sqrtl_compat.c
index 41254ae60a..41254ae60a 100644
--- a/sysdeps/ia64/fpu/w_sqrtl.c
+++ b/sysdeps/ia64/fpu/w_sqrtl_compat.c
diff --git a/sysdeps/ia64/fpu/w_tgamma.S b/sysdeps/ia64/fpu/w_tgamma_compat.S
index 867815cf46..867815cf46 100644
--- a/sysdeps/ia64/fpu/w_tgamma.S
+++ b/sysdeps/ia64/fpu/w_tgamma_compat.S
diff --git a/sysdeps/ia64/fpu/w_tgammaf.S b/sysdeps/ia64/fpu/w_tgammaf_compat.S
index 0fbd840adb..0fbd840adb 100644
--- a/sysdeps/ia64/fpu/w_tgammaf.S
+++ b/sysdeps/ia64/fpu/w_tgammaf_compat.S
diff --git a/sysdeps/ia64/fpu/w_tgammal.S b/sysdeps/ia64/fpu/w_tgammal_compat.S
index b10c5dc276..b10c5dc276 100644
--- a/sysdeps/ia64/fpu/w_tgammal.S
+++ b/sysdeps/ia64/fpu/w_tgammal_compat.S
diff --git a/sysdeps/ieee754/ldbl-opt/w_acos.c b/sysdeps/ieee754/ldbl-opt/w_acos_compat.c
index 2934041d4d..1e6d1b37ec 100644
--- a/sysdeps/ieee754/ldbl-opt/w_acos.c
+++ b/sysdeps/ieee754/ldbl-opt/w_acos_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_acos.c>
+#include <math/w_acos_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __acos, acosl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_acosh.c b/sysdeps/ieee754/ldbl-opt/w_acosh_compat.c
index 7f7fa14e27..40da339a7a 100644
--- a/sysdeps/ieee754/ldbl-opt/w_acosh.c
+++ b/sysdeps/ieee754/ldbl-opt/w_acosh_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_acosh.c>
+#include <math/w_acosh_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __acosh, acoshl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_acoshl.c b/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c
index 6243c2ac80..df4338d9fa 100644
--- a/sysdeps/ieee754/ldbl-opt/w_acoshl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_acoshl.c>
+#include <math/w_acoshl_compat.c>
 long_double_symbol (libm, __acoshl, acoshl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_acosl.c b/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c
index 8b6e890a53..5efc99024c 100644
--- a/sysdeps/ieee754/ldbl-opt/w_acosl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_acosl.c>
+#include <math/w_acosl_compat.c>
 long_double_symbol (libm, __acosl, acosl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_asin.c b/sysdeps/ieee754/ldbl-opt/w_asin_compat.c
index 5e1d70ff65..1c52cc22ad 100644
--- a/sysdeps/ieee754/ldbl-opt/w_asin.c
+++ b/sysdeps/ieee754/ldbl-opt/w_asin_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_asin.c>
+#include <math/w_asin_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __asin, asinl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_asinl.c b/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c
index a58a224a38..087fab25bb 100644
--- a/sysdeps/ieee754/ldbl-opt/w_asinl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_asinl.c>
+#include <math/w_asinl_compat.c>
 long_double_symbol (libm, __asinl, asinl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_atan2.c b/sysdeps/ieee754/ldbl-opt/w_atan2_compat.c
index f1d1501bd2..d3f7964d7c 100644
--- a/sysdeps/ieee754/ldbl-opt/w_atan2.c
+++ b/sysdeps/ieee754/ldbl-opt/w_atan2_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_atan2.c>
+#include <math/w_atan2_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __atan2, atan2l, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_atan2l.c b/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c
index 01431eff44..6b12209625 100644
--- a/sysdeps/ieee754/ldbl-opt/w_atan2l.c
+++ b/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_atan2l.c>
+#include <math/w_atan2l_compat.c>
 long_double_symbol (libm, __atan2l, atan2l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_atanh.c b/sysdeps/ieee754/ldbl-opt/w_atanh_compat.c
index b4cab87c32..e15ef1f93d 100644
--- a/sysdeps/ieee754/ldbl-opt/w_atanh.c
+++ b/sysdeps/ieee754/ldbl-opt/w_atanh_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_atanh.c>
+#include <math/w_atanh_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __atanh, atanhl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_atanhl.c b/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c
index 0dbc114481..49bae1ee8f 100644
--- a/sysdeps/ieee754/ldbl-opt/w_atanhl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_atanhl.c>
+#include <math/w_atanhl_compat.c>
 long_double_symbol (libm, __atanhl, atanhl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_cosh.c b/sysdeps/ieee754/ldbl-opt/w_cosh_compat.c
index a6f56cf4c5..af29735e10 100644
--- a/sysdeps/ieee754/ldbl-opt/w_cosh.c
+++ b/sysdeps/ieee754/ldbl-opt/w_cosh_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_cosh.c>
+#include <math/w_cosh_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __cosh, coshl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_coshl.c b/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c
index 8c7dccb7f3..a8808778ba 100644
--- a/sysdeps/ieee754/ldbl-opt/w_coshl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_coshl.c>
+#include <math/w_coshl_compat.c>
 long_double_symbol (libm, __coshl, coshl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_exp10.c b/sysdeps/ieee754/ldbl-opt/w_exp10_compat.c
index 990c48e61a..142a70bcd6 100644
--- a/sysdeps/ieee754/ldbl-opt/w_exp10.c
+++ b/sysdeps/ieee754/ldbl-opt/w_exp10_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_exp10.c>
+#include <math/w_exp10_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
 compat_symbol (libm, __exp10, exp10l, GLIBC_2_1);
 compat_symbol (libm, __pow10, pow10l, GLIBC_2_1);
diff --git a/sysdeps/ieee754/ldbl-opt/w_exp10l.c b/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c
index e06dfb5014..8f2ccd3441 100644
--- a/sysdeps/ieee754/ldbl-opt/w_exp10l.c
+++ b/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c
@@ -1,6 +1,6 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_exp10l.c>
+#include <math/w_exp10l_compat.c>
 long_double_symbol (libm, __exp10l, exp10l);
 long_double_symbol (libm, __pow10l, pow10l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_fmod.c b/sysdeps/ieee754/ldbl-opt/w_fmod_compat.c
index 81ad5057f7..9280d39d70 100644
--- a/sysdeps/ieee754/ldbl-opt/w_fmod.c
+++ b/sysdeps/ieee754/ldbl-opt/w_fmod_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_fmod.c>
+#include <math/w_fmod_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __fmod, fmodl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_fmodl.c b/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c
index 2a534a304c..88fe0ac4d2 100644
--- a/sysdeps/ieee754/ldbl-opt/w_fmodl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_fmodl.c>
+#include <math/w_fmodl_compat.c>
 long_double_symbol (libm, __fmodl, fmodl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_hypot.c b/sysdeps/ieee754/ldbl-opt/w_hypot_compat.c
index e1cf1ffcfe..b3979ff0f4 100644
--- a/sysdeps/ieee754/ldbl-opt/w_hypot.c
+++ b/sysdeps/ieee754/ldbl-opt/w_hypot_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_hypot.c>
+#include <math/w_hypot_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __hypot, hypotl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_hypotl.c b/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c
index 6c46bd4bde..68e3997489 100644
--- a/sysdeps/ieee754/ldbl-opt/w_hypotl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_hypotl.c>
+#include <math/w_hypotl_compat.c>
 long_double_symbol (libm, __hypotl, hypotl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_j0.c b/sysdeps/ieee754/ldbl-opt/w_j0_compat.c
index 5c78aff085..45b4d14764 100644
--- a/sysdeps/ieee754/ldbl-opt/w_j0.c
+++ b/sysdeps/ieee754/ldbl-opt/w_j0_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_j0.c>
+#include <math/w_j0_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, j0, j0l, GLIBC_2_0);
 compat_symbol (libm, y0, y0l, GLIBC_2_0);
diff --git a/sysdeps/ieee754/ldbl-opt/w_j0l.c b/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c
index 767a1bcada..9050657e03 100644
--- a/sysdeps/ieee754/ldbl-opt/w_j0l.c
+++ b/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c
@@ -1,6 +1,6 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_j0l.c>
+#include <math/w_j0l_compat.c>
 long_double_symbol (libm, __j0l, j0l);
 long_double_symbol (libm, __y0l, y0l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_j1.c b/sysdeps/ieee754/ldbl-opt/w_j1_compat.c
index ed3dbc0361..1071c8fd6a 100644
--- a/sysdeps/ieee754/ldbl-opt/w_j1.c
+++ b/sysdeps/ieee754/ldbl-opt/w_j1_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_j1.c>
+#include <math/w_j1_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, j1, j1l, GLIBC_2_0);
 compat_symbol (libm, y1, y1l, GLIBC_2_0);
diff --git a/sysdeps/ieee754/ldbl-opt/w_j1l.c b/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c
index 946c36467c..4ed9e2dd12 100644
--- a/sysdeps/ieee754/ldbl-opt/w_j1l.c
+++ b/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c
@@ -1,6 +1,6 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_j1l.c>
+#include <math/w_j1l_compat.c>
 long_double_symbol (libm, __j1l, j1l);
 long_double_symbol (libm, __y1l, y1l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_jn.c b/sysdeps/ieee754/ldbl-opt/w_jn_compat.c
index 7a7e0d434b..be29a36041 100644
--- a/sysdeps/ieee754/ldbl-opt/w_jn.c
+++ b/sysdeps/ieee754/ldbl-opt/w_jn_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_jn.c>
+#include <math/w_jn_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, jn, jnl, GLIBC_2_0);
 compat_symbol (libm, yn, ynl, GLIBC_2_0);
diff --git a/sysdeps/ieee754/ldbl-opt/w_jnl.c b/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c
index 5219543a97..d22ee54997 100644
--- a/sysdeps/ieee754/ldbl-opt/w_jnl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c
@@ -1,6 +1,6 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_jnl.c>
+#include <math/w_jnl_compat.c>
 long_double_symbol (libm, __jnl, jnl);
 long_double_symbol (libm, __ynl, ynl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_log10.c b/sysdeps/ieee754/ldbl-opt/w_log10_compat.c
index 74e716821e..5ec6a2b2b6 100644
--- a/sysdeps/ieee754/ldbl-opt/w_log10.c
+++ b/sysdeps/ieee754/ldbl-opt/w_log10_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_log10.c>
+#include <math/w_log10_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __log10, log10l, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_log10l.c b/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c
index 9c936e376a..17de3e7856 100644
--- a/sysdeps/ieee754/ldbl-opt/w_log10l.c
+++ b/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_log10l.c>
+#include <math/w_log10l_compat.c>
 long_double_symbol (libm, __log10l, log10l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_log2.c b/sysdeps/ieee754/ldbl-opt/w_log2_compat.c
index 9b9b45b21b..dffd2c183e 100644
--- a/sysdeps/ieee754/ldbl-opt/w_log2.c
+++ b/sysdeps/ieee754/ldbl-opt/w_log2_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_log2.c>
+#include <math/w_log2_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
 compat_symbol (libm, __log2, log2l, GLIBC_2_1);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_log2l.c b/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c
index c859682133..3c5e734573 100644
--- a/sysdeps/ieee754/ldbl-opt/w_log2l.c
+++ b/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_log2l.c>
+#include <math/w_log2l_compat.c>
 long_double_symbol (libm, __log2l, log2l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_log.c b/sysdeps/ieee754/ldbl-opt/w_log_compat.c
index bde1e31db4..d2a2bcadde 100644
--- a/sysdeps/ieee754/ldbl-opt/w_log.c
+++ b/sysdeps/ieee754/ldbl-opt/w_log_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_log.c>
+#include <math/w_log_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __log, logl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_logl.c b/sysdeps/ieee754/ldbl-opt/w_logl_compat.c
index c2354a02b9..2b55842139 100644
--- a/sysdeps/ieee754/ldbl-opt/w_logl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_logl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_logl.c>
+#include <math/w_logl_compat.c>
 long_double_symbol (libm, __logl, logl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_pow.c b/sysdeps/ieee754/ldbl-opt/w_pow_compat.c
index 2d98fb9be4..c2a7942019 100644
--- a/sysdeps/ieee754/ldbl-opt/w_pow.c
+++ b/sysdeps/ieee754/ldbl-opt/w_pow_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_pow.c>
+#include <math/w_pow_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __pow, powl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_powl.c b/sysdeps/ieee754/ldbl-opt/w_powl_compat.c
index 85b8927648..1897cf1c63 100644
--- a/sysdeps/ieee754/ldbl-opt/w_powl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_powl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_powl.c>
+#include <math/w_powl_compat.c>
 long_double_symbol (libm, __powl, powl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_remainder.c b/sysdeps/ieee754/ldbl-opt/w_remainder_compat.c
index dfa7b7f569..c823dcb8e7 100644
--- a/sysdeps/ieee754/ldbl-opt/w_remainder.c
+++ b/sysdeps/ieee754/ldbl-opt/w_remainder_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_remainder.c>
+#include <math/w_remainder_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __remainder, remainderl, GLIBC_2_0);
 strong_alias (__remainder, __drem)
diff --git a/sysdeps/ieee754/ldbl-opt/w_remainderl.c b/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c
index 7a344b7709..b2ce5c9563 100644
--- a/sysdeps/ieee754/ldbl-opt/w_remainderl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c
@@ -1,7 +1,7 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_remainderl.c>
+#include <math/w_remainderl_compat.c>
 long_double_symbol (libm, __remainderl, remainderl);
 strong_alias (__remainderl, __dreml)
 long_double_symbol (libm, __dreml, dreml);
diff --git a/sysdeps/ieee754/ldbl-opt/w_scalb.c b/sysdeps/ieee754/ldbl-opt/w_scalb_compat.c
index e2ac601596..f6d53a5ba5 100644
--- a/sysdeps/ieee754/ldbl-opt/w_scalb.c
+++ b/sysdeps/ieee754/ldbl-opt/w_scalb_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_scalb.c>
+#include <math/w_scalb_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __scalb, scalbl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_scalbl.c b/sysdeps/ieee754/ldbl-opt/w_scalbl_compat.c
index f3d3901f86..c8feb654a2 100644
--- a/sysdeps/ieee754/ldbl-opt/w_scalbl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_scalbl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_scalbl.c>
+#include <math/w_scalbl_compat.c>
 long_double_symbol (libm, __scalbl, scalbl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_sinh.c b/sysdeps/ieee754/ldbl-opt/w_sinh_compat.c
index a5400b5eb1..b47182c017 100644
--- a/sysdeps/ieee754/ldbl-opt/w_sinh.c
+++ b/sysdeps/ieee754/ldbl-opt/w_sinh_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_sinh.c>
+#include <math/w_sinh_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __sinh, sinhl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_sinhl.c b/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c
index b94f4ec845..305ed82357 100644
--- a/sysdeps/ieee754/ldbl-opt/w_sinhl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_sinhl.c>
+#include <math/w_sinhl_compat.c>
 long_double_symbol (libm, __sinhl, sinhl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_sqrt.c b/sysdeps/ieee754/ldbl-opt/w_sqrt_compat.c
index ca2ba061e8..355d1c20db 100644
--- a/sysdeps/ieee754/ldbl-opt/w_sqrt.c
+++ b/sysdeps/ieee754/ldbl-opt/w_sqrt_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_sqrt.c>
+#include <math/w_sqrt_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __sqrt, sqrtl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_sqrtl.c b/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c
index 609f5bf3d6..1e4526f2c6 100644
--- a/sysdeps/ieee754/ldbl-opt/w_sqrtl.c
+++ b/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_sqrtl.c>
+#include <math/w_sqrtl_compat.c>
 long_double_symbol (libm, __sqrtl, sqrtl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_tgamma.c b/sysdeps/ieee754/ldbl-opt/w_tgamma_compat.c
index cce9f348ed..082ce8aaff 100644
--- a/sysdeps/ieee754/ldbl-opt/w_tgamma.c
+++ b/sysdeps/ieee754/ldbl-opt/w_tgamma_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <math/w_tgamma.c>
+#include <math/w_tgamma_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
 compat_symbol (libm, __tgamma, tgammal, GLIBC_2_1);
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_tgammal.c b/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c
index c3c511db8c..aaf5403522 100644
--- a/sysdeps/ieee754/ldbl-opt/w_tgammal.c
+++ b/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <math/w_tgammal.c>
+#include <math/w_tgammal_compat.c>
 long_double_symbol (libm, __tgammal, tgammal);
diff --git a/sysdeps/powerpc/nofpu/Makefile b/sysdeps/powerpc/nofpu/Makefile
index 99761ef7f0..35517b63a1 100644
--- a/sysdeps/powerpc/nofpu/Makefile
+++ b/sysdeps/powerpc/nofpu/Makefile
@@ -24,9 +24,9 @@ CFLAGS-s_clogl.c += -fno-builtin-fabsl
 CFLAGS-s_clog10l.c += -fno-builtin-fabsl
 CFLAGS-s_csinl.c += -fno-builtin-fabsl
 CFLAGS-s_csqrtl.c += -fno-builtin-fabsl
-CFLAGS-w_acosl.c += -fno-builtin-fabsl
-CFLAGS-w_asinl.c += -fno-builtin-fabsl
-CFLAGS-w_atanhl.c += -fno-builtin-fabsl
-CFLAGS-w_j0l.c += -fno-builtin-fabsl
-CFLAGS-w_j1l.c += -fno-builtin-fabsl
+CFLAGS-w_acosl_compat.c += -fno-builtin-fabsl
+CFLAGS-w_asinl_compat.c += -fno-builtin-fabsl
+CFLAGS-w_atanhl_compat.c += -fno-builtin-fabsl
+CFLAGS-w_j0l_compat.c += -fno-builtin-fabsl
+CFLAGS-w_j1l_compat.c += -fno-builtin-fabsl
 endif
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile
index 804e7dc095..5afbade15f 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile
@@ -8,8 +8,9 @@ sysdep_routines += s_isnan-power7 s_isnan-power6 s_isnan-power5 s_isnan-ppc32 \
 
 libm-sysdep_routines += s_llrintf-power6 s_llrintf-ppc32 s_llrint-power6 \
 			s_llrint-ppc32 s_llround-power6 s_llround-power5+ \
-			s_llround-ppc32 w_sqrt-power5 w_sqrt-ppc32 \
-			w_sqrtf-power5 w_sqrtf-ppc32 s_isnan-power7 \
+			s_llround-ppc32 s_isnan-power7 \
+			w_sqrt_compat-power5 w_sqrt_compat-ppc32 \
+			w_sqrtf_compat-power5 w_sqrtf_compat-ppc32 \
 			s_isnan-power6 s_isnan-power5 s_isnan-ppc32 \
 			s_isnanf-power6 s_isnanf-power5 s_isinf-power7 \
 			s_isinf-ppc32 s_isinff-ppc32 s_finite-power7 \
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-power5.S b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-power5.S
index 9d1f9c2d47..7c5a504177 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-power5.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-power5.S
@@ -28,4 +28,4 @@
 
 #define __sqrt __sqrt_power5
 
-#include <sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S>
+#include <sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt_compat.S>
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-ppc32.S b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-ppc32.S
index 5eed5c05cc..534e934ac9 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-ppc32.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-ppc32.S
@@ -28,4 +28,4 @@
 
 #define __sqrt __sqrt_ppc32
 
-#include <sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S>
+#include <sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt_compat.S>
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat.c
index 1e1892034e..1e1892034e 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat.c
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-power5.S b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-power5.S
index d4b28d6941..eacc042850 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-power5.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-power5.S
@@ -23,4 +23,4 @@
 
 #define __sqrtf __sqrtf_power5
 
-#include <sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S>
+#include <sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf_compat.S>
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-ppc32.S b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-ppc32.S
index 256ed0ba2a..72191fc9a5 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-ppc32.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-ppc32.S
@@ -23,4 +23,4 @@
 
 #define __sqrtf __sqrtf_ppc32
 
-#include <sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S>
+#include <sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf_compat.S>
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat.c
index bbab4d4f93..bbab4d4f93 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat.c
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt_compat.S
index 61e6d1feff..bb896a33cd 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt_compat.S
@@ -106,4 +106,3 @@ strong_alias (__sqrt, __sqrtl)
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __sqrt, sqrtl, GLIBC_2_0)
 #endif
-
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf_compat.S
index 8e74232ba3..c304ab5ca2 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf_compat.S
@@ -98,4 +98,3 @@ EALIGN (__sqrtf, 5, 0)
 	END	(__sqrtf)
 
 weak_alias (__sqrtf, sqrtf)
-
diff --git a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt_compat.S
index 617fc69f05..93625c5aa9 100644
--- a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S
+++ b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt_compat.S
@@ -104,4 +104,3 @@ strong_alias (__sqrt, __sqrtl)
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __sqrt, sqrtl, GLIBC_2_0)
 #endif
-
diff --git a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf_compat.S
index 1ccd1f99a4..2ca86b6155 100644
--- a/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S
+++ b/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf_compat.S
@@ -96,4 +96,3 @@ EALIGN (__sqrtf, 5, 0)
 	END	(__sqrtf)
 
 weak_alias (__sqrtf, sqrtf)
-
diff --git a/sysdeps/sparc/sparc32/fpu/w_sqrt.S b/sysdeps/sparc/sparc32/fpu/w_sqrt_compat.S
index 703f228766..703f228766 100644
--- a/sysdeps/sparc/sparc32/fpu/w_sqrt.S
+++ b/sysdeps/sparc/sparc32/fpu/w_sqrt_compat.S
diff --git a/sysdeps/sparc/sparc32/fpu/w_sqrtf.S b/sysdeps/sparc/sparc32/fpu/w_sqrtf_compat.S
index 05d1160378..05d1160378 100644
--- a/sysdeps/sparc/sparc32/fpu/w_sqrtf.S
+++ b/sysdeps/sparc/sparc32/fpu/w_sqrtf_compat.S
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
index 4489b70cff..c929f98764 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
@@ -2,7 +2,8 @@ ifeq ($(subdir),math)
 ifeq ($(have-as-vis3),yes)
 libm-sysdep_routines += m_copysignf-vis3 m_copysign-vis3 s_fabs-vis3 \
 			s_fabsf-vis3 s_llrintf-vis3 s_llrint-vis3 \
-			s_rintf-vis3 s_rint-vis3 w_sqrt-vis3 w_sqrtf-vis3 \
+			s_rintf-vis3 s_rint-vis3 \
+			w_sqrt_compat-vis3 w_sqrtf_compat-vis3 \
 			s_fminf-vis3 s_fmin-vis3 s_fmaxf-vis3 s_fmax-vis3 \
 			s_fmaf-vis3 s_fma-vis3 s_nearbyint-vis3 \
 			s_nearbyintf-vis3 s_fdimf-vis3 s_fdim-vis3
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt-vis3.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat-vis3.S
index 06ff449150..06ff449150 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt-vis3.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat-vis3.S
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat.S
index 3b070721d2..1ccac19e29 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat.S
@@ -9,4 +9,4 @@ weak_alias (__sqrt, sqrt)
 
 #define __sqrt __sqrt_generic
 
-#include "../w_sqrt.S"
+#include "../w_sqrt_compat.S"
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf-vis3.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat-vis3.S
index 5b21523fc0..5b21523fc0 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf-vis3.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat-vis3.S
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat.S
index 777a04058c..f0e759a2c8 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat.S
@@ -9,4 +9,4 @@ weak_alias (__sqrtf, sqrtf)
 
 #define __sqrtf __sqrtf_generic
 
-#include "../w_sqrtf.S"
+#include "../w_sqrtf_compat.S"
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt_compat.S
index 4415a82024..4415a82024 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt_compat.S
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf_compat.S
index 1c3c97f8e9..1c3c97f8e9 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf_compat.S
diff --git a/sysdeps/sparc/sparc64/fpu/w_sqrt.S b/sysdeps/sparc/sparc64/fpu/w_sqrt_compat.S
index de95e52e8e..de95e52e8e 100644
--- a/sysdeps/sparc/sparc64/fpu/w_sqrt.S
+++ b/sysdeps/sparc/sparc64/fpu/w_sqrt_compat.S
diff --git a/sysdeps/sparc/sparc64/fpu/w_sqrtf.S b/sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S
index 0c253fe43a..0c253fe43a 100644
--- a/sysdeps/sparc/sparc64/fpu/w_sqrtf.S
+++ b/sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S