From f67d78192c1be9d56d3a6f3fda4e0a70ae48c44d Mon Sep 17 00:00:00 2001
From: "Gabriel F. T. Gomes" <gftg@linux.vnet.ibm.com>
Date: Tue, 13 Dec 2016 22:42:51 -0200
Subject: [PATCH] Move wrappers to libm-compat-calls-auto

This commit moves one step towards the deprecation of wrappers that
use _LIB_VERSION / matherr / __kernel_standard functionality, by
adding the suffix '_compat' to their filenames and adjusting Makefiles
and #includes accordingly.

New template wrappers that do not use such functionality will be added
by future patches and will be first used by the float128 wrappers.
---
 ChangeLog                                     | 402 ++++++++++++++++++
 math/Makefile                                 |  18 +-
 math/{w_acos.c => w_acos_compat.c}            |   0
 math/{w_acosf.c => w_acosf_compat.c}          |   0
 math/{w_acosh.c => w_acosh_compat.c}          |   0
 math/{w_acoshf.c => w_acoshf_compat.c}        |   0
 math/{w_acoshl.c => w_acoshl_compat.c}        |   0
 math/{w_acosl.c => w_acosl_compat.c}          |   0
 math/{w_asin.c => w_asin_compat.c}            |   0
 math/{w_asinf.c => w_asinf_compat.c}          |   0
 math/{w_asinl.c => w_asinl_compat.c}          |   0
 math/{w_atan2.c => w_atan2_compat.c}          |   0
 math/{w_atan2f.c => w_atan2f_compat.c}        |   0
 math/{w_atan2l.c => w_atan2l_compat.c}        |   0
 math/{w_atanh.c => w_atanh_compat.c}          |   0
 math/{w_atanhf.c => w_atanhf_compat.c}        |   0
 math/{w_atanhl.c => w_atanhl_compat.c}        |   0
 math/{w_cosh.c => w_cosh_compat.c}            |   0
 math/{w_coshf.c => w_coshf_compat.c}          |   0
 math/{w_coshl.c => w_coshl_compat.c}          |   0
 math/{w_exp10.c => w_exp10_compat.c}          |   0
 math/{w_exp10f.c => w_exp10f_compat.c}        |   0
 math/{w_exp10l.c => w_exp10l_compat.c}        |   0
 math/{w_exp2.c => w_exp2_compat.c}            |   0
 math/{w_exp2f.c => w_exp2f_compat.c}          |   0
 math/{w_exp2l.c => w_exp2l_compat.c}          |   0
 math/{w_fmod.c => w_fmod_compat.c}            |   0
 math/{w_fmodf.c => w_fmodf_compat.c}          |   0
 math/{w_fmodl.c => w_fmodl_compat.c}          |   0
 math/{w_hypot.c => w_hypot_compat.c}          |   0
 math/{w_hypotf.c => w_hypotf_compat.c}        |   0
 math/{w_hypotl.c => w_hypotl_compat.c}        |   0
 math/{w_j0.c => w_j0_compat.c}                |   0
 math/{w_j0f.c => w_j0f_compat.c}              |   0
 math/{w_j0l.c => w_j0l_compat.c}              |   0
 math/{w_j1.c => w_j1_compat.c}                |   0
 math/{w_j1f.c => w_j1f_compat.c}              |   0
 math/{w_j1l.c => w_j1l_compat.c}              |   0
 math/{w_jn.c => w_jn_compat.c}                |   0
 math/{w_jnf.c => w_jnf_compat.c}              |   0
 math/{w_jnl.c => w_jnl_compat.c}              |   0
 math/{w_log10.c => w_log10_compat.c}          |   0
 math/{w_log10f.c => w_log10f_compat.c}        |   0
 math/{w_log10l.c => w_log10l_compat.c}        |   0
 math/{w_log2.c => w_log2_compat.c}            |   0
 math/{w_log2f.c => w_log2f_compat.c}          |   0
 math/{w_log2l.c => w_log2l_compat.c}          |   0
 math/{w_log.c => w_log_compat.c}              |   0
 math/{w_logf.c => w_logf_compat.c}            |   0
 math/{w_logl.c => w_logl_compat.c}            |   0
 math/{w_pow.c => w_pow_compat.c}              |   0
 math/{w_powf.c => w_powf_compat.c}            |   0
 math/{w_powl.c => w_powl_compat.c}            |   0
 math/{w_remainder.c => w_remainder_compat.c}  |   0
 .../{w_remainderf.c => w_remainderf_compat.c} |   0
 .../{w_remainderl.c => w_remainderl_compat.c} |   0
 math/{w_scalb.c => w_scalb_compat.c}          |   0
 math/{w_scalbf.c => w_scalbf_compat.c}        |   0
 math/{w_scalbl.c => w_scalbl_compat.c}        |   0
 math/{w_sinh.c => w_sinh_compat.c}            |   0
 math/{w_sinhf.c => w_sinhf_compat.c}          |   0
 math/{w_sinhl.c => w_sinhl_compat.c}          |   0
 math/{w_sqrt.c => w_sqrt_compat.c}            |   0
 math/{w_sqrtf.c => w_sqrtf_compat.c}          |   0
 math/{w_sqrtl.c => w_sqrtl_compat.c}          |   0
 math/{w_tgamma.c => w_tgamma_compat.c}        |   0
 math/{w_tgammaf.c => w_tgammaf_compat.c}      |   0
 math/{w_tgammal.c => w_tgammal_compat.c}      |   0
 .../i386/fpu/{w_sqrt.c => w_sqrt_compat.c}    |   2 +-
 .../ia64/fpu/{w_acos.c => w_acos_compat.c}    |   0
 .../ia64/fpu/{w_acosf.c => w_acosf_compat.c}  |   0
 .../ia64/fpu/{w_acosh.c => w_acosh_compat.c}  |   0
 .../fpu/{w_acoshf.c => w_acoshf_compat.c}     |   0
 .../fpu/{w_acoshl.c => w_acoshl_compat.c}     |   0
 .../ia64/fpu/{w_acosl.c => w_acosl_compat.c}  |   0
 .../ia64/fpu/{w_asin.c => w_asin_compat.c}    |   0
 .../ia64/fpu/{w_asinf.c => w_asinf_compat.c}  |   0
 .../ia64/fpu/{w_asinl.c => w_asinl_compat.c}  |   0
 .../ia64/fpu/{w_atan2.c => w_atan2_compat.c}  |   0
 .../fpu/{w_atan2f.c => w_atan2f_compat.c}     |   0
 .../fpu/{w_atan2l.c => w_atan2l_compat.c}     |   0
 .../ia64/fpu/{w_atanh.c => w_atanh_compat.c}  |   0
 .../fpu/{w_atanhf.c => w_atanhf_compat.c}     |   0
 .../fpu/{w_atanhl.c => w_atanhl_compat.c}     |   0
 .../ia64/fpu/{w_cosh.c => w_cosh_compat.c}    |   0
 .../ia64/fpu/{w_coshf.c => w_coshf_compat.c}  |   0
 .../ia64/fpu/{w_coshl.c => w_coshl_compat.c}  |   0
 .../ia64/fpu/{w_exp10.c => w_exp10_compat.c}  |   0
 .../fpu/{w_exp10f.c => w_exp10f_compat.c}     |   0
 .../fpu/{w_exp10l.c => w_exp10l_compat.c}     |   0
 .../ia64/fpu/{w_exp2.c => w_exp2_compat.c}    |   0
 .../ia64/fpu/{w_exp2f.c => w_exp2f_compat.c}  |   0
 .../ia64/fpu/{w_exp2l.c => w_exp2l_compat.c}  |   0
 .../ia64/fpu/{w_fmod.c => w_fmod_compat.c}    |   0
 .../ia64/fpu/{w_fmodf.c => w_fmodf_compat.c}  |   0
 .../ia64/fpu/{w_fmodl.c => w_fmodl_compat.c}  |   0
 .../ia64/fpu/{w_hypot.c => w_hypot_compat.c}  |   0
 .../fpu/{w_hypotf.c => w_hypotf_compat.c}     |   0
 .../fpu/{w_hypotl.c => w_hypotl_compat.c}     |   0
 .../ia64/fpu/{w_log.c => w_log10_compat.c}    |   0
 .../ia64/fpu/{w_log10.c => w_log10f_compat.c} |   0
 .../fpu/{w_log10f.c => w_log10l_compat.c}     |   0
 .../ia64/fpu/{w_log10l.c => w_log2_compat.c}  |   0
 .../ia64/fpu/{w_log2.c => w_log2f_compat.c}   |   0
 .../ia64/fpu/{w_log2f.c => w_log2l_compat.c}  |   0
 .../ia64/fpu/{w_log2l.c => w_log_compat.c}    |   0
 .../ia64/fpu/{w_logf.c => w_logf_compat.c}    |   0
 .../ia64/fpu/{w_logl.c => w_logl_compat.c}    |   0
 sysdeps/ia64/fpu/{w_pow.c => w_pow_compat.c}  |   0
 .../ia64/fpu/{w_powf.c => w_powf_compat.c}    |   0
 .../ia64/fpu/{w_powl.c => w_powl_compat.c}    |   0
 .../{w_remainder.c => w_remainder_compat.c}   |   0
 .../{w_remainderf.c => w_remainderf_compat.c} |   0
 .../{w_remainderl.c => w_remainderl_compat.c} |   0
 .../ia64/fpu/{w_scalb.c => w_scalb_compat.c}  |   0
 .../fpu/{w_scalbf.c => w_scalbf_compat.c}     |   0
 .../fpu/{w_scalbl.c => w_scalbl_compat.c}     |   0
 .../ia64/fpu/{w_sinh.c => w_sinh_compat.c}    |   0
 .../ia64/fpu/{w_sinhf.c => w_sinhf_compat.c}  |   0
 .../ia64/fpu/{w_sinhl.c => w_sinhl_compat.c}  |   0
 .../ia64/fpu/{w_sqrt.c => w_sqrt_compat.c}    |   0
 .../ia64/fpu/{w_sqrtf.c => w_sqrtf_compat.c}  |   0
 .../ia64/fpu/{w_sqrtl.c => w_sqrtl_compat.c}  |   0
 .../fpu/{w_tgamma.S => w_tgamma_compat.S}     |   0
 .../fpu/{w_tgammaf.S => w_tgammaf_compat.S}   |   0
 .../fpu/{w_tgammal.S => w_tgammal_compat.S}   |   0
 .../ldbl-opt/{w_acos.c => w_acos_compat.c}    |   2 +-
 .../ldbl-opt/{w_acosh.c => w_acosh_compat.c}  |   2 +-
 .../{w_acoshl.c => w_acoshl_compat.c}         |   2 +-
 .../ldbl-opt/{w_acosl.c => w_acosl_compat.c}  |   2 +-
 .../ldbl-opt/{w_asin.c => w_asin_compat.c}    |   2 +-
 .../ldbl-opt/{w_asinl.c => w_asinl_compat.c}  |   2 +-
 .../ldbl-opt/{w_atan2.c => w_atan2_compat.c}  |   2 +-
 .../{w_atan2l.c => w_atan2l_compat.c}         |   2 +-
 .../ldbl-opt/{w_atanh.c => w_atanh_compat.c}  |   2 +-
 .../{w_atanhl.c => w_atanhl_compat.c}         |   2 +-
 .../ldbl-opt/{w_cosh.c => w_cosh_compat.c}    |   2 +-
 .../ldbl-opt/{w_coshl.c => w_coshl_compat.c}  |   2 +-
 .../ldbl-opt/{w_exp10.c => w_exp10_compat.c}  |   2 +-
 .../{w_exp10l.c => w_exp10l_compat.c}         |   2 +-
 .../ldbl-opt/{w_fmod.c => w_fmod_compat.c}    |   2 +-
 .../ldbl-opt/{w_fmodl.c => w_fmodl_compat.c}  |   2 +-
 .../ldbl-opt/{w_hypot.c => w_hypot_compat.c}  |   2 +-
 .../{w_hypotl.c => w_hypotl_compat.c}         |   2 +-
 .../ldbl-opt/{w_j0.c => w_j0_compat.c}        |   2 +-
 .../ldbl-opt/{w_j0l.c => w_j0l_compat.c}      |   2 +-
 .../ldbl-opt/{w_j1.c => w_j1_compat.c}        |   2 +-
 .../ldbl-opt/{w_j1l.c => w_j1l_compat.c}      |   2 +-
 .../ldbl-opt/{w_jn.c => w_jn_compat.c}        |   2 +-
 .../ldbl-opt/{w_jnl.c => w_jnl_compat.c}      |   2 +-
 .../ldbl-opt/{w_log10.c => w_log10_compat.c}  |   2 +-
 .../{w_log10l.c => w_log10l_compat.c}         |   2 +-
 .../ldbl-opt/{w_log2.c => w_log2_compat.c}    |   2 +-
 .../ldbl-opt/{w_log2l.c => w_log2l_compat.c}  |   2 +-
 .../ldbl-opt/{w_log.c => w_log_compat.c}      |   2 +-
 .../ldbl-opt/{w_logl.c => w_logl_compat.c}    |   2 +-
 .../ldbl-opt/{w_pow.c => w_pow_compat.c}      |   2 +-
 .../ldbl-opt/{w_powl.c => w_powl_compat.c}    |   2 +-
 .../{w_remainder.c => w_remainder_compat.c}   |   2 +-
 .../{w_remainderl.c => w_remainderl_compat.c} |   2 +-
 .../ldbl-opt/{w_scalb.c => w_scalb_compat.c}  |   2 +-
 .../{w_scalbl.c => w_scalbl_compat.c}         |   2 +-
 .../ldbl-opt/{w_sinh.c => w_sinh_compat.c}    |   2 +-
 .../ldbl-opt/{w_sinhl.c => w_sinhl_compat.c}  |   2 +-
 .../ldbl-opt/{w_sqrt.c => w_sqrt_compat.c}    |   2 +-
 .../ldbl-opt/{w_sqrtl.c => w_sqrtl_compat.c}  |   2 +-
 .../{w_tgamma.c => w_tgamma_compat.c}         |   2 +-
 .../{w_tgammal.c => w_tgammal_compat.c}       |   2 +-
 sysdeps/powerpc/nofpu/Makefile                |  10 +-
 .../powerpc32/power4/fpu/multiarch/Makefile   |   5 +-
 ...w_sqrt-power5.S => w_sqrt_compat-power5.S} |   2 +-
 .../{w_sqrt-ppc32.S => w_sqrt_compat-ppc32.S} |   2 +-
 .../multiarch/{w_sqrt.c => w_sqrt_compat.c}   |   0
 ...sqrtf-power5.S => w_sqrtf_compat-power5.S} |   2 +-
 ...w_sqrtf-ppc32.S => w_sqrtf_compat-ppc32.S} |   2 +-
 .../multiarch/{w_sqrtf.c => w_sqrtf_compat.c} |   0
 .../power4/fpu/{w_sqrt.S => w_sqrt_compat.S}  |   1 -
 .../fpu/{w_sqrtf.S => w_sqrtf_compat.S}       |   1 -
 .../power5/fpu/{w_sqrt.S => w_sqrt_compat.S}  |   1 -
 .../fpu/{w_sqrtf.S => w_sqrtf_compat.S}       |   1 -
 .../sparc32/fpu/{w_sqrt.S => w_sqrt_compat.S} |   0
 .../fpu/{w_sqrtf.S => w_sqrtf_compat.S}       |   0
 .../sparc32/sparcv9/fpu/multiarch/Makefile    |   3 +-
 .../{w_sqrt-vis3.S => w_sqrt_compat-vis3.S}   |   0
 .../multiarch/{w_sqrt.S => w_sqrt_compat.S}   |   2 +-
 .../{w_sqrtf-vis3.S => w_sqrtf_compat-vis3.S} |   0
 .../multiarch/{w_sqrtf.S => w_sqrtf_compat.S} |   2 +-
 .../sparcv9/fpu/{w_sqrt.S => w_sqrt_compat.S} |   0
 .../fpu/{w_sqrtf.S => w_sqrtf_compat.S}       |   0
 .../sparc64/fpu/{w_sqrt.S => w_sqrt_compat.S} |   0
 .../fpu/{w_sqrtf.S => w_sqrtf_compat.S}       |   0
 191 files changed, 474 insertions(+), 66 deletions(-)
 rename math/{w_acos.c => w_acos_compat.c} (100%)
 rename math/{w_acosf.c => w_acosf_compat.c} (100%)
 rename math/{w_acosh.c => w_acosh_compat.c} (100%)
 rename math/{w_acoshf.c => w_acoshf_compat.c} (100%)
 rename math/{w_acoshl.c => w_acoshl_compat.c} (100%)
 rename math/{w_acosl.c => w_acosl_compat.c} (100%)
 rename math/{w_asin.c => w_asin_compat.c} (100%)
 rename math/{w_asinf.c => w_asinf_compat.c} (100%)
 rename math/{w_asinl.c => w_asinl_compat.c} (100%)
 rename math/{w_atan2.c => w_atan2_compat.c} (100%)
 rename math/{w_atan2f.c => w_atan2f_compat.c} (100%)
 rename math/{w_atan2l.c => w_atan2l_compat.c} (100%)
 rename math/{w_atanh.c => w_atanh_compat.c} (100%)
 rename math/{w_atanhf.c => w_atanhf_compat.c} (100%)
 rename math/{w_atanhl.c => w_atanhl_compat.c} (100%)
 rename math/{w_cosh.c => w_cosh_compat.c} (100%)
 rename math/{w_coshf.c => w_coshf_compat.c} (100%)
 rename math/{w_coshl.c => w_coshl_compat.c} (100%)
 rename math/{w_exp10.c => w_exp10_compat.c} (100%)
 rename math/{w_exp10f.c => w_exp10f_compat.c} (100%)
 rename math/{w_exp10l.c => w_exp10l_compat.c} (100%)
 rename math/{w_exp2.c => w_exp2_compat.c} (100%)
 rename math/{w_exp2f.c => w_exp2f_compat.c} (100%)
 rename math/{w_exp2l.c => w_exp2l_compat.c} (100%)
 rename math/{w_fmod.c => w_fmod_compat.c} (100%)
 rename math/{w_fmodf.c => w_fmodf_compat.c} (100%)
 rename math/{w_fmodl.c => w_fmodl_compat.c} (100%)
 rename math/{w_hypot.c => w_hypot_compat.c} (100%)
 rename math/{w_hypotf.c => w_hypotf_compat.c} (100%)
 rename math/{w_hypotl.c => w_hypotl_compat.c} (100%)
 rename math/{w_j0.c => w_j0_compat.c} (100%)
 rename math/{w_j0f.c => w_j0f_compat.c} (100%)
 rename math/{w_j0l.c => w_j0l_compat.c} (100%)
 rename math/{w_j1.c => w_j1_compat.c} (100%)
 rename math/{w_j1f.c => w_j1f_compat.c} (100%)
 rename math/{w_j1l.c => w_j1l_compat.c} (100%)
 rename math/{w_jn.c => w_jn_compat.c} (100%)
 rename math/{w_jnf.c => w_jnf_compat.c} (100%)
 rename math/{w_jnl.c => w_jnl_compat.c} (100%)
 rename math/{w_log10.c => w_log10_compat.c} (100%)
 rename math/{w_log10f.c => w_log10f_compat.c} (100%)
 rename math/{w_log10l.c => w_log10l_compat.c} (100%)
 rename math/{w_log2.c => w_log2_compat.c} (100%)
 rename math/{w_log2f.c => w_log2f_compat.c} (100%)
 rename math/{w_log2l.c => w_log2l_compat.c} (100%)
 rename math/{w_log.c => w_log_compat.c} (100%)
 rename math/{w_logf.c => w_logf_compat.c} (100%)
 rename math/{w_logl.c => w_logl_compat.c} (100%)
 rename math/{w_pow.c => w_pow_compat.c} (100%)
 rename math/{w_powf.c => w_powf_compat.c} (100%)
 rename math/{w_powl.c => w_powl_compat.c} (100%)
 rename math/{w_remainder.c => w_remainder_compat.c} (100%)
 rename math/{w_remainderf.c => w_remainderf_compat.c} (100%)
 rename math/{w_remainderl.c => w_remainderl_compat.c} (100%)
 rename math/{w_scalb.c => w_scalb_compat.c} (100%)
 rename math/{w_scalbf.c => w_scalbf_compat.c} (100%)
 rename math/{w_scalbl.c => w_scalbl_compat.c} (100%)
 rename math/{w_sinh.c => w_sinh_compat.c} (100%)
 rename math/{w_sinhf.c => w_sinhf_compat.c} (100%)
 rename math/{w_sinhl.c => w_sinhl_compat.c} (100%)
 rename math/{w_sqrt.c => w_sqrt_compat.c} (100%)
 rename math/{w_sqrtf.c => w_sqrtf_compat.c} (100%)
 rename math/{w_sqrtl.c => w_sqrtl_compat.c} (100%)
 rename math/{w_tgamma.c => w_tgamma_compat.c} (100%)
 rename math/{w_tgammaf.c => w_tgammaf_compat.c} (100%)
 rename math/{w_tgammal.c => w_tgammal_compat.c} (100%)
 rename sysdeps/i386/fpu/{w_sqrt.c => w_sqrt_compat.c} (89%)
 rename sysdeps/ia64/fpu/{w_acos.c => w_acos_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_acosf.c => w_acosf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_acosh.c => w_acosh_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_acoshf.c => w_acoshf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_acoshl.c => w_acoshl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_acosl.c => w_acosl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_asin.c => w_asin_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_asinf.c => w_asinf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_asinl.c => w_asinl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_atan2.c => w_atan2_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_atan2f.c => w_atan2f_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_atan2l.c => w_atan2l_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_atanh.c => w_atanh_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_atanhf.c => w_atanhf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_atanhl.c => w_atanhl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_cosh.c => w_cosh_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_coshf.c => w_coshf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_coshl.c => w_coshl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_exp10.c => w_exp10_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_exp10f.c => w_exp10f_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_exp10l.c => w_exp10l_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_exp2.c => w_exp2_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_exp2f.c => w_exp2f_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_exp2l.c => w_exp2l_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_fmod.c => w_fmod_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_fmodf.c => w_fmodf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_fmodl.c => w_fmodl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_hypot.c => w_hypot_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_hypotf.c => w_hypotf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_hypotl.c => w_hypotl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_log.c => w_log10_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_log10.c => w_log10f_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_log10f.c => w_log10l_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_log10l.c => w_log2_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_log2.c => w_log2f_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_log2f.c => w_log2l_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_log2l.c => w_log_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_logf.c => w_logf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_logl.c => w_logl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_pow.c => w_pow_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_powf.c => w_powf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_powl.c => w_powl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_remainder.c => w_remainder_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_remainderf.c => w_remainderf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_remainderl.c => w_remainderl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_scalb.c => w_scalb_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_scalbf.c => w_scalbf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_scalbl.c => w_scalbl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_sinh.c => w_sinh_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_sinhf.c => w_sinhf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_sinhl.c => w_sinhl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_sqrt.c => w_sqrt_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_sqrtf.c => w_sqrtf_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_sqrtl.c => w_sqrtl_compat.c} (100%)
 rename sysdeps/ia64/fpu/{w_tgamma.S => w_tgamma_compat.S} (100%)
 rename sysdeps/ia64/fpu/{w_tgammaf.S => w_tgammaf_compat.S} (100%)
 rename sysdeps/ia64/fpu/{w_tgammal.S => w_tgammal_compat.S} (100%)
 rename sysdeps/ieee754/ldbl-opt/{w_acos.c => w_acos_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_acosh.c => w_acosh_compat.c} (78%)
 rename sysdeps/ieee754/ldbl-opt/{w_acoshl.c => w_acoshl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_acosl.c => w_acosl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_asin.c => w_asin_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_asinl.c => w_asinl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_atan2.c => w_atan2_compat.c} (78%)
 rename sysdeps/ieee754/ldbl-opt/{w_atan2l.c => w_atan2l_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_atanh.c => w_atanh_compat.c} (78%)
 rename sysdeps/ieee754/ldbl-opt/{w_atanhl.c => w_atanhl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_cosh.c => w_cosh_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_coshl.c => w_coshl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_exp10.c => w_exp10_compat.c} (84%)
 rename sysdeps/ieee754/ldbl-opt/{w_exp10l.c => w_exp10l_compat.c} (82%)
 rename sysdeps/ieee754/ldbl-opt/{w_fmod.c => w_fmod_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_fmodl.c => w_fmodl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_hypot.c => w_hypot_compat.c} (78%)
 rename sysdeps/ieee754/ldbl-opt/{w_hypotl.c => w_hypotl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_j0.c => w_j0_compat.c} (84%)
 rename sysdeps/ieee754/ldbl-opt/{w_j0l.c => w_j0l_compat.c} (82%)
 rename sysdeps/ieee754/ldbl-opt/{w_j1.c => w_j1_compat.c} (84%)
 rename sysdeps/ieee754/ldbl-opt/{w_j1l.c => w_j1l_compat.c} (82%)
 rename sysdeps/ieee754/ldbl-opt/{w_jn.c => w_jn_compat.c} (84%)
 rename sysdeps/ieee754/ldbl-opt/{w_jnl.c => w_jnl_compat.c} (82%)
 rename sysdeps/ieee754/ldbl-opt/{w_log10.c => w_log10_compat.c} (78%)
 rename sysdeps/ieee754/ldbl-opt/{w_log10l.c => w_log10l_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_log2.c => w_log2_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_log2l.c => w_log2l_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_log.c => w_log_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_logl.c => w_logl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_pow.c => w_pow_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_powl.c => w_powl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_remainder.c => w_remainder_compat.c} (85%)
 rename sysdeps/ieee754/ldbl-opt/{w_remainderl.c => w_remainderl_compat.c} (84%)
 rename sysdeps/ieee754/ldbl-opt/{w_scalb.c => w_scalb_compat.c} (78%)
 rename sysdeps/ieee754/ldbl-opt/{w_scalbl.c => w_scalbl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_sinh.c => w_sinh_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_sinhl.c => w_sinhl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_sqrt.c => w_sqrt_compat.c} (79%)
 rename sysdeps/ieee754/ldbl-opt/{w_sqrtl.c => w_sqrtl_compat.c} (77%)
 rename sysdeps/ieee754/ldbl-opt/{w_tgamma.c => w_tgamma_compat.c} (78%)
 rename sysdeps/ieee754/ldbl-opt/{w_tgammal.c => w_tgammal_compat.c} (76%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/multiarch/{w_sqrt-power5.S => w_sqrt_compat-power5.S} (94%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/multiarch/{w_sqrt-ppc32.S => w_sqrt_compat-ppc32.S} (94%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/multiarch/{w_sqrt.c => w_sqrt_compat.c} (100%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/multiarch/{w_sqrtf-power5.S => w_sqrtf_compat-power5.S} (93%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/multiarch/{w_sqrtf-ppc32.S => w_sqrtf_compat-ppc32.S} (93%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/multiarch/{w_sqrtf.c => w_sqrtf_compat.c} (100%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/{w_sqrt.S => w_sqrt_compat.S} (99%)
 rename sysdeps/powerpc/powerpc32/power4/fpu/{w_sqrtf.S => w_sqrtf_compat.S} (99%)
 rename sysdeps/powerpc/powerpc32/power5/fpu/{w_sqrt.S => w_sqrt_compat.S} (99%)
 rename sysdeps/powerpc/powerpc32/power5/fpu/{w_sqrtf.S => w_sqrtf_compat.S} (99%)
 rename sysdeps/sparc/sparc32/fpu/{w_sqrt.S => w_sqrt_compat.S} (100%)
 rename sysdeps/sparc/sparc32/fpu/{w_sqrtf.S => w_sqrtf_compat.S} (100%)
 rename sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/{w_sqrt-vis3.S => w_sqrt_compat-vis3.S} (100%)
 rename sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/{w_sqrt.S => w_sqrt_compat.S} (84%)
 rename sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/{w_sqrtf-vis3.S => w_sqrtf_compat-vis3.S} (100%)
 rename sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/{w_sqrtf.S => w_sqrtf_compat.S} (84%)
 rename sysdeps/sparc/sparc32/sparcv9/fpu/{w_sqrt.S => w_sqrt_compat.S} (100%)
 rename sysdeps/sparc/sparc32/sparcv9/fpu/{w_sqrtf.S => w_sqrtf_compat.S} (100%)
 rename sysdeps/sparc/sparc64/fpu/{w_sqrt.S => w_sqrt_compat.S} (100%)
 rename sysdeps/sparc/sparc64/fpu/{w_sqrtf.S => w_sqrtf_compat.S} (100%)

diff --git a/ChangeLog b/ChangeLog
index 7ab73a78144..0c48f22b620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,405 @@
+2017-01-04  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
+
+	* math/Makefile (libm-calls): Move wrappers...
+	(libm-compat-call-auto): Here.
+	(libm-routines): Add items in libm-compat-calls-auto.
+	* sysdeps/powerpc/nofpu/Makefile: Add suffix ("_compat") to
+	the filenames of the wrappers that have been renamed.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile: Likewise.
+
+	* math/w_acos.c: Add _compat suffix to filename.
+	* math/w_acosf.c: Likewise.
+	* math/w_acosh.c: Likewise.
+	* math/w_acoshf.c: Likewise.
+	* math/w_acoshl.c: Likewise.
+	* math/w_acosl.c: Likewise.
+	* math/w_asin.c: Likewise.
+	* math/w_asinf.c: Likewise.
+	* math/w_asinl.c: Likewise.
+	* math/w_atan2.c: Likewise.
+	* math/w_atan2f.c: Likewise.
+	* math/w_atan2l.c: Likewise.
+	* math/w_atanh.c: Likewise.
+	* math/w_atanhf.c: Likewise.
+	* math/w_atanhl.c: Likewise.
+	* math/w_cosh.c: Likewise.
+	* math/w_coshf.c: Likewise.
+	* math/w_coshl.c: Likewise.
+	* math/w_exp10.c: Likewise.
+	* math/w_exp10f.c: Likewise.
+	* math/w_exp10l.c: Likewise.
+	* math/w_exp2.c: Likewise.
+	* math/w_exp2f.c: Likewise.
+	* math/w_exp2l.c: Likewise.
+	* math/w_fmod.c: Likewise.
+	* math/w_fmodf.c: Likewise.
+	* math/w_fmodl.c: Likewise.
+	* math/w_hypot.c: Likewise.
+	* math/w_hypotf.c: Likewise.
+	* math/w_hypotl.c: Likewise.
+	* math/w_j0.c: Likewise.
+	* math/w_j0f.c: Likewise.
+	* math/w_j0l.c: Likewise.
+	* math/w_j1.c: Likewise.
+	* math/w_j1f.c: Likewise.
+	* math/w_j1l.c: Likewise.
+	* math/w_jn.c: Likewise.
+	* math/w_jnf.c: Likewise.
+	* math/w_jnl.c: Likewise.
+	* math/w_log10.c: Likewise.
+	* math/w_log10f.c: Likewise.
+	* math/w_log10l.c: Likewise.
+	* math/w_log2.c: Likewise.
+	* math/w_log2f.c: Likewise.
+	* math/w_log2l.c: Likewise.
+	* math/w_log.c: Likewise.
+	* math/w_logf.c: Likewise.
+	* math/w_logl.c: Likewise.
+	* math/w_pow.c: Likewise.
+	* math/w_powf.c: Likewise.
+	* math/w_powl.c: Likewise.
+	* math/w_remainder.c: Likewise.
+	* math/w_remainderf.c: Likewise.
+	* math/w_remainderl.c: Likewise.
+	* math/w_scalb.c: Likewise.
+	* math/w_scalbf.c: Likewise.
+	* math/w_scalbl.c: Likewise.
+	* math/w_sinh.c: Likewise.
+	* math/w_sinhf.c: Likewise.
+	* math/w_sinhl.c: Likewise.
+	* math/w_sqrt.c: Likewise.
+	* math/w_sqrtf.c: Likewise.
+	* math/w_sqrtl.c: Likewise.
+	* math/w_tgamma.c: Likewise.
+	* math/w_tgammaf.c: Likewise.
+	* math/w_tgammal.c: Likewise.
+
+	* math/w_acos_compat.c: New file copied from above and
+	adjusted for new #includes path
+	* math/w_acosf_compat.c: Likewise.
+	* math/w_acosh_compat.c: Likewise.
+	* math/w_acoshf_compat.c: Likewise.
+	* math/w_acoshl_compat.c: Likewise.
+	* math/w_acosl_compat.c: Likewise.
+	* math/w_asin_compat.c: Likewise.
+	* math/w_asinf_compat.c: Likewise.
+	* math/w_asinl_compat.c: Likewise.
+	* math/w_atan2_compat.c: Likewise.
+	* math/w_atan2f_compat.c: Likewise.
+	* math/w_atan2l_compat.c: Likewise.
+	* math/w_atanh_compat.c: Likewise.
+	* math/w_atanhf_compat.c: Likewise.
+	* math/w_atanhl_compat.c: Likewise.
+	* math/w_cosh_compat.c: Likewise.
+	* math/w_coshf_compat.c: Likewise.
+	* math/w_coshl_compat.c: Likewise.
+	* math/w_exp10_compat.c: Likewise.
+	* math/w_exp10f_compat.c: Likewise.
+	* math/w_exp10l_compat.c: Likewise.
+	* math/w_exp2_compat.c: Likewise.
+	* math/w_exp2f_compat.c: Likewise.
+	* math/w_exp2l_compat.c: Likewise.
+	* math/w_fmod_compat.c: Likewise.
+	* math/w_fmodf_compat.c: Likewise.
+	* math/w_fmodl_compat.c: Likewise.
+	* math/w_hypot_compat.c: Likewise.
+	* math/w_hypotf_compat.c: Likewise.
+	* math/w_hypotl_compat.c: Likewise.
+	* math/w_j0_compat.c: Likewise.
+	* math/w_j0f_compat.c: Likewise.
+	* math/w_j0l_compat.c: Likewise.
+	* math/w_j1_compat.c: Likewise.
+	* math/w_j1f_compat.c: Likewise.
+	* math/w_j1l_compat.c: Likewise.
+	* math/w_jn_compat.c: Likewise.
+	* math/w_jnf_compat.c: Likewise.
+	* math/w_jnl_compat.c: Likewise.
+	* math/w_log10_compat.c: Likewise.
+	* math/w_log10f_compat.c: Likewise.
+	* math/w_log10l_compat.c: Likewise.
+	* math/w_log2_compat.c: Likewise.
+	* math/w_log2f_compat.c: Likewise.
+	* math/w_log2l_compat.c: Likewise.
+	* math/w_log_compat.c: Likewise.
+	* math/w_logf_compat.c: Likewise.
+	* math/w_logl_compat.c: Likewise.
+	* math/w_pow_compat.c: Likewise.
+	* math/w_powf_compat.c: Likewise.
+	* math/w_powl_compat.c: Likewise.
+	* math/w_remainder_compat.c: Likewise.
+	* math/w_remainderf_compat.c: Likewise.
+	* math/w_remainderl_compat.c: Likewise.
+	* math/w_scalb_compat.c: Likewise.
+	* math/w_scalbf_compat.c: Likewise.
+	* math/w_scalbl_compat.c: Likewise.
+	* math/w_sinh_compat.c: Likewise.
+	* math/w_sinhf_compat.c: Likewise.
+	* math/w_sinhl_compat.c: Likewise.
+	* math/w_sqrt_compat.c: Likewise.
+	* math/w_sqrtf_compat.c: Likewise.
+	* math/w_sqrtl_compat.c: Likewise.
+	* math/w_tgamma_compat.c: Likewise.
+	* math/w_tgammaf_compat.c: Likewise.
+	* math/w_tgammal_compat.c: Likewise.
+
+	* sysdeps/i386/fpu/w_sqrt.c: Add _compat suffix to filename.
+	* sysdeps/ia64/fpu/w_sqrtl.c: Likewise.
+	* sysdeps/ia64/fpu/w_acosl.c: Likewise.
+	* sysdeps/ia64/fpu/w_sqrtf.c: Likewise.
+	* sysdeps/ia64/fpu/w_sqrt.c: Likewise.
+	* sysdeps/ia64/fpu/w_sinhl.c: Likewise.
+	* sysdeps/ia64/fpu/w_acosf.c: Likewise.
+	* sysdeps/ia64/fpu/w_sinhf.c: Likewise.
+	* sysdeps/ia64/fpu/w_sinh.c: Likewise.
+	* sysdeps/ia64/fpu/w_scalbl.c: Likewise.
+	* sysdeps/ia64/fpu/w_scalbf.c: Likewise.
+	* sysdeps/ia64/fpu/w_scalb.c: Likewise.
+	* sysdeps/ia64/fpu/w_remainderl.c: Likewise.
+	* sysdeps/ia64/fpu/w_remainderf.c: Likewise.
+	* sysdeps/ia64/fpu/w_remainder.c: Likewise.
+	* sysdeps/ia64/fpu/w_powl.c: Likewise.
+	* sysdeps/ia64/fpu/w_powf.c: Likewise.
+	* sysdeps/ia64/fpu/w_pow.c: Likewise.
+	* sysdeps/ia64/fpu/w_logl.c: Likewise.
+	* sysdeps/ia64/fpu/w_logf.c: Likewise.
+	* sysdeps/ia64/fpu/w_log2l.c: Likewise.
+	* sysdeps/ia64/fpu/w_log2f.c: Likewise.
+	* sysdeps/ia64/fpu/w_log2.c: Likewise.
+	* sysdeps/ia64/fpu/w_log10l.c: Likewise.
+	* sysdeps/ia64/fpu/w_log10f.c: Likewise.
+	* sysdeps/ia64/fpu/w_log10.c: Likewise.
+	* sysdeps/ia64/fpu/w_log.c: Likewise.
+	* sysdeps/ia64/fpu/w_hypotl.c: Likewise.
+	* sysdeps/ia64/fpu/w_hypotf.c: Likewise.
+	* sysdeps/ia64/fpu/w_hypot.c: Likewise.
+	* sysdeps/ia64/fpu/w_fmodl.c: Likewise.
+	* sysdeps/ia64/fpu/w_fmodf.c: Likewise.
+	* sysdeps/ia64/fpu/w_fmod.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp2l.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp2f.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp2.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp10l.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp10f.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp10.c: Likewise.
+	* sysdeps/ia64/fpu/w_coshl.c: Likewise.
+	* sysdeps/ia64/fpu/w_coshf.c: Likewise.
+	* sysdeps/ia64/fpu/w_cosh.c: Likewise.
+	* sysdeps/ia64/fpu/w_atanhl.c: Likewise.
+	* sysdeps/ia64/fpu/w_atanhf.c: Likewise.
+	* sysdeps/ia64/fpu/w_atanh.c: Likewise.
+	* sysdeps/ia64/fpu/w_atan2l.c: Likewise.
+	* sysdeps/ia64/fpu/w_atan2f.c: Likewise.
+	* sysdeps/ia64/fpu/w_atan2.c: Likewise.
+	* sysdeps/ia64/fpu/w_asinl.c: Likewise.
+	* sysdeps/ia64/fpu/w_asinf.c: Likewise.
+	* sysdeps/ia64/fpu/w_asin.c: Likewise.
+	* sysdeps/ia64/fpu/w_acoshl.c: Likewise.
+	* sysdeps/ia64/fpu/w_acoshf.c: Likewise.
+	* sysdeps/ia64/fpu/w_acosh.c: Likewise.
+	* sysdeps/ia64/fpu/w_acos.c: Likewise.
+	* sysdeps/ia64/fpu/w_tgamma.S: Likewise.
+	* sysdeps/ia64/fpu/w_tgammaf.S: Likewise.
+	* sysdeps/ia64/fpu/w_tgammal.S: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acos.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acosh.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acoshl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acosl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_asin.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_asinl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atan2.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atan2l.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atanh.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atanhl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_cosh.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_coshl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_exp10.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_exp10l.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_fmod.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_fmodl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_hypot.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_hypotl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j0.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j0l.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j1.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j1l.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_jn.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_jnl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log10.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log10l.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log2.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log2l.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_logl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_pow.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_powl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_remainder.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_remainderl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_scalb.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_scalbl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sinh.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sinhl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sqrt.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sqrtl.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_tgamma.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_tgammal.c: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-power5.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-ppc32.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt.c: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-power5.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-ppc32.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf.c: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S: Likewise.
+	* sysdeps/sparc/sparc32/fpu/w_sqrt.S: Likewise.
+	* sysdeps/sparc/sparc32/fpu/w_sqrtf.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt-vis3.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf-vis3.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S: Likewise.
+	* sysdeps/sparc/sparc64/fpu/w_sqrt.S: Likewise.
+	* sysdeps/sparc/sparc64/fpu/w_sqrtf.S: Likewise.
+
+	* sysdeps/i386/fpu/w_sqrt_compat.c: New file copied from above
+	and adjusted for new #includes path
+	* sysdeps/ia64/fpu/w_acos_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_acosf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_acosh_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_acoshf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_acoshl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_acosl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_asin_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_asinf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_asinl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_atan2_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_atan2f_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_atan2l_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_atanh_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_atanhf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_atanhl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_cosh_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_coshf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_coshl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp10_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp10f_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp10l_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp2_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp2f_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp2l_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_fmod_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_fmodf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_fmodl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_hypot_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_hypotf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_hypotl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_log10_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_log10f_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_log10l_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_log2_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_log2f_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_log2l_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_log_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_logf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_logl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_pow_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_powf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_powl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_remainder_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_remainderf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_remainderl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_scalb_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_scalbf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_scalbl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_sinh_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_sinhf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_sinhl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_sqrt_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_sqrtf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_sqrtl_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_tgamma_compat.S: Likewise.
+	* sysdeps/ia64/fpu/w_tgammaf_compat.S: Likewise.
+	* sysdeps/ia64/fpu/w_tgammal_compat.S: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acos_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acosh_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_acosl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_asin_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_asinl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atan2_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atanh_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_cosh_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_coshl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_exp10_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_fmod_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_hypot_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j0_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j0l_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j1_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_j1l_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_jn_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_jnl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log10_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log10l_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log2_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log2l_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_log_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_logl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_pow_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_powl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_remainder_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_scalb_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_scalbl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sinh_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sqrt_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_tgamma_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-power5.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-ppc32.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat.c:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-power5.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-ppc32.S:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat.c:
+	Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt_compat.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf_compat.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt_compat.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf_compat.S: Likewise.
+	* sysdeps/sparc/sparc32/fpu/w_sqrt_compat.S: Likewise.
+	* sysdeps/sparc/sparc32/fpu/w_sqrtf_compat.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat-vis3.S:
+	Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat.S:
+	Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat-vis3.S:
+	Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat.S:
+	Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt_compat.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf_compat.S: Likewise.
+	* sysdeps/sparc/sparc64/fpu/w_sqrt_compat.S: Likewise.
+	* sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S: Likewise.
+
 2017-01-04  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/microblaze/bits/setjmp.h (__jmp_buf): Give struct tag
diff --git a/math/Makefile b/math/Makefile
index d15b58e1cfa..0ee46480e2a 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -65,19 +65,26 @@ libm-calls =								  \
 	s_ceilF s_cosF s_erfF s_expm1F s_fabsF				  \
 	s_floorF s_log1pF s_logbF				  \
 	s_nextafterF s_nexttowardF s_rintF s_scalblnF			  \
-	s_significandF s_sinF s_tanF s_tanhF w_acosF w_acoshF w_asinF	  \
-	w_atan2F w_atanhF w_coshF w_expF w_exp2F w_exp10F w_fmodF	  \
-	w_tgammaF w_hypotF w_j0F w_j1F w_jnF w_lgammaF w_lgammaF_r	  \
-	w_logF w_log10F w_powF w_remainderF w_scalbF w_sinhF w_sqrtF	  \
+	s_significandF s_sinF s_tanF s_tanhF				  \
+	w_expF								  \
+	w_lgammaF w_lgammaF_r						  \
 	s_fpclassifyF s_truncF						  \
 	s_remquoF e_log2F e_exp2F s_roundF s_nearbyintF s_sincosF	  \
-	s_fmaF s_lrintF s_llrintF s_lroundF s_llroundF e_exp10F w_log2F	  \
+	s_fmaF s_lrintF s_llrintF s_lroundF s_llroundF e_exp10F		  \
 	s_issignalingF $(calls:s_%=m_%) x2y2m1F				  \
 	gamma_productF lgamma_negF lgamma_productF			  \
 	s_nextupF s_totalorderF s_totalordermagF s_getpayloadF		  \
 	s_setpayloadF s_setpayloadsigF s_roundevenF s_fromfpF s_ufromfpF  \
 	s_fromfpxF s_ufromfpxF $(gen-libm-calls)
 
+libm-compat-calls-auto =						\
+	w_acosF_compat w_acoshF_compat w_asinF_compat w_atan2F_compat	\
+	w_atanhF_compat w_coshF_compat w_exp2F_compat w_exp10F_compat	\
+	w_fmodF_compat w_hypotF_compat w_j0F_compat w_j1F_compat	\
+	w_jnF_compat w_log2F_compat w_log10F_compat w_logF_compat	\
+	w_powF_compat w_remainderF_compat w_scalbF_compat		\
+	w_sinhF_compat w_sqrtF_compat w_tgammaF_compat
+
 libm-compat-calls-ldouble-yes = w_lgamma_compatl k_standardl
 libm-compat-calls = w_lgamma_compatf w_lgamma_compat k_standard k_standardf \
 		    $(libm-compat-calls-ldouble-$(long-double-fcts))
@@ -116,6 +123,7 @@ type-float-routines := k_rem_pio2f
 type-foreach = $(foreach t,$(types),$(subst F,$(type-$(t)-suffix),$(1)))
 
 libm-routines = $(strip $(libm-support) $(libm-compat-calls)		\
+			$(call type-foreach, $(libm-compat-calls-auto))	\
 			$(call type-foreach, $(libm-calls))		\
 			$(foreach t, $(types), $(type-$(t)-routines))) 	\
 
diff --git a/math/w_acos.c b/math/w_acos_compat.c
similarity index 100%
rename from math/w_acos.c
rename to math/w_acos_compat.c
diff --git a/math/w_acosf.c b/math/w_acosf_compat.c
similarity index 100%
rename from math/w_acosf.c
rename to math/w_acosf_compat.c
diff --git a/math/w_acosh.c b/math/w_acosh_compat.c
similarity index 100%
rename from math/w_acosh.c
rename to math/w_acosh_compat.c
diff --git a/math/w_acoshf.c b/math/w_acoshf_compat.c
similarity index 100%
rename from math/w_acoshf.c
rename to math/w_acoshf_compat.c
diff --git a/math/w_acoshl.c b/math/w_acoshl_compat.c
similarity index 100%
rename from math/w_acoshl.c
rename to math/w_acoshl_compat.c
diff --git a/math/w_acosl.c b/math/w_acosl_compat.c
similarity index 100%
rename from math/w_acosl.c
rename to math/w_acosl_compat.c
diff --git a/math/w_asin.c b/math/w_asin_compat.c
similarity index 100%
rename from math/w_asin.c
rename to math/w_asin_compat.c
diff --git a/math/w_asinf.c b/math/w_asinf_compat.c
similarity index 100%
rename from math/w_asinf.c
rename to math/w_asinf_compat.c
diff --git a/math/w_asinl.c b/math/w_asinl_compat.c
similarity index 100%
rename from math/w_asinl.c
rename to math/w_asinl_compat.c
diff --git a/math/w_atan2.c b/math/w_atan2_compat.c
similarity index 100%
rename from math/w_atan2.c
rename to math/w_atan2_compat.c
diff --git a/math/w_atan2f.c b/math/w_atan2f_compat.c
similarity index 100%
rename from math/w_atan2f.c
rename to math/w_atan2f_compat.c
diff --git a/math/w_atan2l.c b/math/w_atan2l_compat.c
similarity index 100%
rename from math/w_atan2l.c
rename to math/w_atan2l_compat.c
diff --git a/math/w_atanh.c b/math/w_atanh_compat.c
similarity index 100%
rename from math/w_atanh.c
rename to math/w_atanh_compat.c
diff --git a/math/w_atanhf.c b/math/w_atanhf_compat.c
similarity index 100%
rename from math/w_atanhf.c
rename to math/w_atanhf_compat.c
diff --git a/math/w_atanhl.c b/math/w_atanhl_compat.c
similarity index 100%
rename from math/w_atanhl.c
rename to math/w_atanhl_compat.c
diff --git a/math/w_cosh.c b/math/w_cosh_compat.c
similarity index 100%
rename from math/w_cosh.c
rename to math/w_cosh_compat.c
diff --git a/math/w_coshf.c b/math/w_coshf_compat.c
similarity index 100%
rename from math/w_coshf.c
rename to math/w_coshf_compat.c
diff --git a/math/w_coshl.c b/math/w_coshl_compat.c
similarity index 100%
rename from math/w_coshl.c
rename to math/w_coshl_compat.c
diff --git a/math/w_exp10.c b/math/w_exp10_compat.c
similarity index 100%
rename from math/w_exp10.c
rename to math/w_exp10_compat.c
diff --git a/math/w_exp10f.c b/math/w_exp10f_compat.c
similarity index 100%
rename from math/w_exp10f.c
rename to math/w_exp10f_compat.c
diff --git a/math/w_exp10l.c b/math/w_exp10l_compat.c
similarity index 100%
rename from math/w_exp10l.c
rename to math/w_exp10l_compat.c
diff --git a/math/w_exp2.c b/math/w_exp2_compat.c
similarity index 100%
rename from math/w_exp2.c
rename to math/w_exp2_compat.c
diff --git a/math/w_exp2f.c b/math/w_exp2f_compat.c
similarity index 100%
rename from math/w_exp2f.c
rename to math/w_exp2f_compat.c
diff --git a/math/w_exp2l.c b/math/w_exp2l_compat.c
similarity index 100%
rename from math/w_exp2l.c
rename to math/w_exp2l_compat.c
diff --git a/math/w_fmod.c b/math/w_fmod_compat.c
similarity index 100%
rename from math/w_fmod.c
rename to math/w_fmod_compat.c
diff --git a/math/w_fmodf.c b/math/w_fmodf_compat.c
similarity index 100%
rename from math/w_fmodf.c
rename to math/w_fmodf_compat.c
diff --git a/math/w_fmodl.c b/math/w_fmodl_compat.c
similarity index 100%
rename from math/w_fmodl.c
rename to math/w_fmodl_compat.c
diff --git a/math/w_hypot.c b/math/w_hypot_compat.c
similarity index 100%
rename from math/w_hypot.c
rename to math/w_hypot_compat.c
diff --git a/math/w_hypotf.c b/math/w_hypotf_compat.c
similarity index 100%
rename from math/w_hypotf.c
rename to math/w_hypotf_compat.c
diff --git a/math/w_hypotl.c b/math/w_hypotl_compat.c
similarity index 100%
rename from math/w_hypotl.c
rename to math/w_hypotl_compat.c
diff --git a/math/w_j0.c b/math/w_j0_compat.c
similarity index 100%
rename from math/w_j0.c
rename to math/w_j0_compat.c
diff --git a/math/w_j0f.c b/math/w_j0f_compat.c
similarity index 100%
rename from math/w_j0f.c
rename to math/w_j0f_compat.c
diff --git a/math/w_j0l.c b/math/w_j0l_compat.c
similarity index 100%
rename from math/w_j0l.c
rename to math/w_j0l_compat.c
diff --git a/math/w_j1.c b/math/w_j1_compat.c
similarity index 100%
rename from math/w_j1.c
rename to math/w_j1_compat.c
diff --git a/math/w_j1f.c b/math/w_j1f_compat.c
similarity index 100%
rename from math/w_j1f.c
rename to math/w_j1f_compat.c
diff --git a/math/w_j1l.c b/math/w_j1l_compat.c
similarity index 100%
rename from math/w_j1l.c
rename to math/w_j1l_compat.c
diff --git a/math/w_jn.c b/math/w_jn_compat.c
similarity index 100%
rename from math/w_jn.c
rename to math/w_jn_compat.c
diff --git a/math/w_jnf.c b/math/w_jnf_compat.c
similarity index 100%
rename from math/w_jnf.c
rename to math/w_jnf_compat.c
diff --git a/math/w_jnl.c b/math/w_jnl_compat.c
similarity index 100%
rename from math/w_jnl.c
rename to math/w_jnl_compat.c
diff --git a/math/w_log10.c b/math/w_log10_compat.c
similarity index 100%
rename from math/w_log10.c
rename to math/w_log10_compat.c
diff --git a/math/w_log10f.c b/math/w_log10f_compat.c
similarity index 100%
rename from math/w_log10f.c
rename to math/w_log10f_compat.c
diff --git a/math/w_log10l.c b/math/w_log10l_compat.c
similarity index 100%
rename from math/w_log10l.c
rename to math/w_log10l_compat.c
diff --git a/math/w_log2.c b/math/w_log2_compat.c
similarity index 100%
rename from math/w_log2.c
rename to math/w_log2_compat.c
diff --git a/math/w_log2f.c b/math/w_log2f_compat.c
similarity index 100%
rename from math/w_log2f.c
rename to math/w_log2f_compat.c
diff --git a/math/w_log2l.c b/math/w_log2l_compat.c
similarity index 100%
rename from math/w_log2l.c
rename to math/w_log2l_compat.c
diff --git a/math/w_log.c b/math/w_log_compat.c
similarity index 100%
rename from math/w_log.c
rename to math/w_log_compat.c
diff --git a/math/w_logf.c b/math/w_logf_compat.c
similarity index 100%
rename from math/w_logf.c
rename to math/w_logf_compat.c
diff --git a/math/w_logl.c b/math/w_logl_compat.c
similarity index 100%
rename from math/w_logl.c
rename to math/w_logl_compat.c
diff --git a/math/w_pow.c b/math/w_pow_compat.c
similarity index 100%
rename from math/w_pow.c
rename to math/w_pow_compat.c
diff --git a/math/w_powf.c b/math/w_powf_compat.c
similarity index 100%
rename from math/w_powf.c
rename to math/w_powf_compat.c
diff --git a/math/w_powl.c b/math/w_powl_compat.c
similarity index 100%
rename from math/w_powl.c
rename to math/w_powl_compat.c
diff --git a/math/w_remainder.c b/math/w_remainder_compat.c
similarity index 100%
rename from math/w_remainder.c
rename to math/w_remainder_compat.c
diff --git a/math/w_remainderf.c b/math/w_remainderf_compat.c
similarity index 100%
rename from math/w_remainderf.c
rename to math/w_remainderf_compat.c
diff --git a/math/w_remainderl.c b/math/w_remainderl_compat.c
similarity index 100%
rename from math/w_remainderl.c
rename to math/w_remainderl_compat.c
diff --git a/math/w_scalb.c b/math/w_scalb_compat.c
similarity index 100%
rename from math/w_scalb.c
rename to math/w_scalb_compat.c
diff --git a/math/w_scalbf.c b/math/w_scalbf_compat.c
similarity index 100%
rename from math/w_scalbf.c
rename to math/w_scalbf_compat.c
diff --git a/math/w_scalbl.c b/math/w_scalbl_compat.c
similarity index 100%
rename from math/w_scalbl.c
rename to math/w_scalbl_compat.c
diff --git a/math/w_sinh.c b/math/w_sinh_compat.c
similarity index 100%
rename from math/w_sinh.c
rename to math/w_sinh_compat.c
diff --git a/math/w_sinhf.c b/math/w_sinhf_compat.c
similarity index 100%
rename from math/w_sinhf.c
rename to math/w_sinhf_compat.c
diff --git a/math/w_sinhl.c b/math/w_sinhl_compat.c
similarity index 100%
rename from math/w_sinhl.c
rename to math/w_sinhl_compat.c
diff --git a/math/w_sqrt.c b/math/w_sqrt_compat.c
similarity index 100%
rename from math/w_sqrt.c
rename to math/w_sqrt_compat.c
diff --git a/math/w_sqrtf.c b/math/w_sqrtf_compat.c
similarity index 100%
rename from math/w_sqrtf.c
rename to math/w_sqrtf_compat.c
diff --git a/math/w_sqrtl.c b/math/w_sqrtl_compat.c
similarity index 100%
rename from math/w_sqrtl.c
rename to math/w_sqrtl_compat.c
diff --git a/math/w_tgamma.c b/math/w_tgamma_compat.c
similarity index 100%
rename from math/w_tgamma.c
rename to math/w_tgamma_compat.c
diff --git a/math/w_tgammaf.c b/math/w_tgammaf_compat.c
similarity index 100%
rename from math/w_tgammaf.c
rename to math/w_tgammaf_compat.c
diff --git a/math/w_tgammal.c b/math/w_tgammal_compat.c
similarity index 100%
rename from math/w_tgammal.c
rename to math/w_tgammal_compat.c
diff --git a/sysdeps/i386/fpu/w_sqrt.c b/sysdeps/i386/fpu/w_sqrt_compat.c
similarity index 89%
rename from sysdeps/i386/fpu/w_sqrt.c
rename to sysdeps/i386/fpu/w_sqrt_compat.c
index 19b5074179a..ddd36d0964c 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
similarity index 100%
rename from sysdeps/ia64/fpu/w_acos.c
rename to sysdeps/ia64/fpu/w_acos_compat.c
diff --git a/sysdeps/ia64/fpu/w_acosf.c b/sysdeps/ia64/fpu/w_acosf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_acosf.c
rename to sysdeps/ia64/fpu/w_acosf_compat.c
diff --git a/sysdeps/ia64/fpu/w_acosh.c b/sysdeps/ia64/fpu/w_acosh_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_acosh.c
rename to sysdeps/ia64/fpu/w_acosh_compat.c
diff --git a/sysdeps/ia64/fpu/w_acoshf.c b/sysdeps/ia64/fpu/w_acoshf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_acoshf.c
rename to sysdeps/ia64/fpu/w_acoshf_compat.c
diff --git a/sysdeps/ia64/fpu/w_acoshl.c b/sysdeps/ia64/fpu/w_acoshl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_acoshl.c
rename to sysdeps/ia64/fpu/w_acoshl_compat.c
diff --git a/sysdeps/ia64/fpu/w_acosl.c b/sysdeps/ia64/fpu/w_acosl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_acosl.c
rename to sysdeps/ia64/fpu/w_acosl_compat.c
diff --git a/sysdeps/ia64/fpu/w_asin.c b/sysdeps/ia64/fpu/w_asin_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_asin.c
rename to sysdeps/ia64/fpu/w_asin_compat.c
diff --git a/sysdeps/ia64/fpu/w_asinf.c b/sysdeps/ia64/fpu/w_asinf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_asinf.c
rename to sysdeps/ia64/fpu/w_asinf_compat.c
diff --git a/sysdeps/ia64/fpu/w_asinl.c b/sysdeps/ia64/fpu/w_asinl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_asinl.c
rename to sysdeps/ia64/fpu/w_asinl_compat.c
diff --git a/sysdeps/ia64/fpu/w_atan2.c b/sysdeps/ia64/fpu/w_atan2_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_atan2.c
rename to sysdeps/ia64/fpu/w_atan2_compat.c
diff --git a/sysdeps/ia64/fpu/w_atan2f.c b/sysdeps/ia64/fpu/w_atan2f_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_atan2f.c
rename to sysdeps/ia64/fpu/w_atan2f_compat.c
diff --git a/sysdeps/ia64/fpu/w_atan2l.c b/sysdeps/ia64/fpu/w_atan2l_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_atan2l.c
rename to sysdeps/ia64/fpu/w_atan2l_compat.c
diff --git a/sysdeps/ia64/fpu/w_atanh.c b/sysdeps/ia64/fpu/w_atanh_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_atanh.c
rename to sysdeps/ia64/fpu/w_atanh_compat.c
diff --git a/sysdeps/ia64/fpu/w_atanhf.c b/sysdeps/ia64/fpu/w_atanhf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_atanhf.c
rename to sysdeps/ia64/fpu/w_atanhf_compat.c
diff --git a/sysdeps/ia64/fpu/w_atanhl.c b/sysdeps/ia64/fpu/w_atanhl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_atanhl.c
rename to sysdeps/ia64/fpu/w_atanhl_compat.c
diff --git a/sysdeps/ia64/fpu/w_cosh.c b/sysdeps/ia64/fpu/w_cosh_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_cosh.c
rename to sysdeps/ia64/fpu/w_cosh_compat.c
diff --git a/sysdeps/ia64/fpu/w_coshf.c b/sysdeps/ia64/fpu/w_coshf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_coshf.c
rename to sysdeps/ia64/fpu/w_coshf_compat.c
diff --git a/sysdeps/ia64/fpu/w_coshl.c b/sysdeps/ia64/fpu/w_coshl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_coshl.c
rename to sysdeps/ia64/fpu/w_coshl_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp10.c b/sysdeps/ia64/fpu/w_exp10_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_exp10.c
rename to sysdeps/ia64/fpu/w_exp10_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp10f.c b/sysdeps/ia64/fpu/w_exp10f_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_exp10f.c
rename to sysdeps/ia64/fpu/w_exp10f_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp10l.c b/sysdeps/ia64/fpu/w_exp10l_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_exp10l.c
rename to sysdeps/ia64/fpu/w_exp10l_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp2.c b/sysdeps/ia64/fpu/w_exp2_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_exp2.c
rename to sysdeps/ia64/fpu/w_exp2_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp2f.c b/sysdeps/ia64/fpu/w_exp2f_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_exp2f.c
rename to sysdeps/ia64/fpu/w_exp2f_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp2l.c b/sysdeps/ia64/fpu/w_exp2l_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_exp2l.c
rename to sysdeps/ia64/fpu/w_exp2l_compat.c
diff --git a/sysdeps/ia64/fpu/w_fmod.c b/sysdeps/ia64/fpu/w_fmod_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_fmod.c
rename to sysdeps/ia64/fpu/w_fmod_compat.c
diff --git a/sysdeps/ia64/fpu/w_fmodf.c b/sysdeps/ia64/fpu/w_fmodf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_fmodf.c
rename to sysdeps/ia64/fpu/w_fmodf_compat.c
diff --git a/sysdeps/ia64/fpu/w_fmodl.c b/sysdeps/ia64/fpu/w_fmodl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_fmodl.c
rename to sysdeps/ia64/fpu/w_fmodl_compat.c
diff --git a/sysdeps/ia64/fpu/w_hypot.c b/sysdeps/ia64/fpu/w_hypot_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_hypot.c
rename to sysdeps/ia64/fpu/w_hypot_compat.c
diff --git a/sysdeps/ia64/fpu/w_hypotf.c b/sysdeps/ia64/fpu/w_hypotf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_hypotf.c
rename to sysdeps/ia64/fpu/w_hypotf_compat.c
diff --git a/sysdeps/ia64/fpu/w_hypotl.c b/sysdeps/ia64/fpu/w_hypotl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_hypotl.c
rename to sysdeps/ia64/fpu/w_hypotl_compat.c
diff --git a/sysdeps/ia64/fpu/w_log.c b/sysdeps/ia64/fpu/w_log10_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_log.c
rename to sysdeps/ia64/fpu/w_log10_compat.c
diff --git a/sysdeps/ia64/fpu/w_log10.c b/sysdeps/ia64/fpu/w_log10f_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_log10.c
rename to sysdeps/ia64/fpu/w_log10f_compat.c
diff --git a/sysdeps/ia64/fpu/w_log10f.c b/sysdeps/ia64/fpu/w_log10l_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_log10f.c
rename to sysdeps/ia64/fpu/w_log10l_compat.c
diff --git a/sysdeps/ia64/fpu/w_log10l.c b/sysdeps/ia64/fpu/w_log2_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_log10l.c
rename to sysdeps/ia64/fpu/w_log2_compat.c
diff --git a/sysdeps/ia64/fpu/w_log2.c b/sysdeps/ia64/fpu/w_log2f_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_log2.c
rename to sysdeps/ia64/fpu/w_log2f_compat.c
diff --git a/sysdeps/ia64/fpu/w_log2f.c b/sysdeps/ia64/fpu/w_log2l_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_log2f.c
rename to sysdeps/ia64/fpu/w_log2l_compat.c
diff --git a/sysdeps/ia64/fpu/w_log2l.c b/sysdeps/ia64/fpu/w_log_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_log2l.c
rename to sysdeps/ia64/fpu/w_log_compat.c
diff --git a/sysdeps/ia64/fpu/w_logf.c b/sysdeps/ia64/fpu/w_logf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_logf.c
rename to sysdeps/ia64/fpu/w_logf_compat.c
diff --git a/sysdeps/ia64/fpu/w_logl.c b/sysdeps/ia64/fpu/w_logl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_logl.c
rename to sysdeps/ia64/fpu/w_logl_compat.c
diff --git a/sysdeps/ia64/fpu/w_pow.c b/sysdeps/ia64/fpu/w_pow_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_pow.c
rename to sysdeps/ia64/fpu/w_pow_compat.c
diff --git a/sysdeps/ia64/fpu/w_powf.c b/sysdeps/ia64/fpu/w_powf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_powf.c
rename to sysdeps/ia64/fpu/w_powf_compat.c
diff --git a/sysdeps/ia64/fpu/w_powl.c b/sysdeps/ia64/fpu/w_powl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_powl.c
rename to sysdeps/ia64/fpu/w_powl_compat.c
diff --git a/sysdeps/ia64/fpu/w_remainder.c b/sysdeps/ia64/fpu/w_remainder_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_remainder.c
rename to sysdeps/ia64/fpu/w_remainder_compat.c
diff --git a/sysdeps/ia64/fpu/w_remainderf.c b/sysdeps/ia64/fpu/w_remainderf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_remainderf.c
rename to sysdeps/ia64/fpu/w_remainderf_compat.c
diff --git a/sysdeps/ia64/fpu/w_remainderl.c b/sysdeps/ia64/fpu/w_remainderl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_remainderl.c
rename to sysdeps/ia64/fpu/w_remainderl_compat.c
diff --git a/sysdeps/ia64/fpu/w_scalb.c b/sysdeps/ia64/fpu/w_scalb_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_scalb.c
rename to sysdeps/ia64/fpu/w_scalb_compat.c
diff --git a/sysdeps/ia64/fpu/w_scalbf.c b/sysdeps/ia64/fpu/w_scalbf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_scalbf.c
rename to sysdeps/ia64/fpu/w_scalbf_compat.c
diff --git a/sysdeps/ia64/fpu/w_scalbl.c b/sysdeps/ia64/fpu/w_scalbl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_scalbl.c
rename to sysdeps/ia64/fpu/w_scalbl_compat.c
diff --git a/sysdeps/ia64/fpu/w_sinh.c b/sysdeps/ia64/fpu/w_sinh_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_sinh.c
rename to sysdeps/ia64/fpu/w_sinh_compat.c
diff --git a/sysdeps/ia64/fpu/w_sinhf.c b/sysdeps/ia64/fpu/w_sinhf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_sinhf.c
rename to sysdeps/ia64/fpu/w_sinhf_compat.c
diff --git a/sysdeps/ia64/fpu/w_sinhl.c b/sysdeps/ia64/fpu/w_sinhl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_sinhl.c
rename to sysdeps/ia64/fpu/w_sinhl_compat.c
diff --git a/sysdeps/ia64/fpu/w_sqrt.c b/sysdeps/ia64/fpu/w_sqrt_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_sqrt.c
rename to sysdeps/ia64/fpu/w_sqrt_compat.c
diff --git a/sysdeps/ia64/fpu/w_sqrtf.c b/sysdeps/ia64/fpu/w_sqrtf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_sqrtf.c
rename to sysdeps/ia64/fpu/w_sqrtf_compat.c
diff --git a/sysdeps/ia64/fpu/w_sqrtl.c b/sysdeps/ia64/fpu/w_sqrtl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_sqrtl.c
rename to sysdeps/ia64/fpu/w_sqrtl_compat.c
diff --git a/sysdeps/ia64/fpu/w_tgamma.S b/sysdeps/ia64/fpu/w_tgamma_compat.S
similarity index 100%
rename from sysdeps/ia64/fpu/w_tgamma.S
rename to sysdeps/ia64/fpu/w_tgamma_compat.S
diff --git a/sysdeps/ia64/fpu/w_tgammaf.S b/sysdeps/ia64/fpu/w_tgammaf_compat.S
similarity index 100%
rename from sysdeps/ia64/fpu/w_tgammaf.S
rename to sysdeps/ia64/fpu/w_tgammaf_compat.S
diff --git a/sysdeps/ia64/fpu/w_tgammal.S b/sysdeps/ia64/fpu/w_tgammal_compat.S
similarity index 100%
rename from sysdeps/ia64/fpu/w_tgammal.S
rename to 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_acos.c
rename to sysdeps/ieee754/ldbl-opt/w_acos_compat.c
index 2934041d4d7..1e6d1b37ece 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
similarity index 78%
rename from sysdeps/ieee754/ldbl-opt/w_acosh.c
rename to sysdeps/ieee754/ldbl-opt/w_acosh_compat.c
index 7f7fa14e279..40da339a7a6 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_acoshl.c
rename to sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c
index 6243c2ac805..df4338d9fa2 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_acosl.c
rename to sysdeps/ieee754/ldbl-opt/w_acosl_compat.c
index 8b6e890a532..5efc99024c6 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_asin.c
rename to sysdeps/ieee754/ldbl-opt/w_asin_compat.c
index 5e1d70ff652..1c52cc22adc 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_asinl.c
rename to sysdeps/ieee754/ldbl-opt/w_asinl_compat.c
index a58a224a38c..087fab25bbb 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
similarity index 78%
rename from sysdeps/ieee754/ldbl-opt/w_atan2.c
rename to sysdeps/ieee754/ldbl-opt/w_atan2_compat.c
index f1d1501bd2a..d3f7964d7ce 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_atan2l.c
rename to sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c
index 01431eff449..6b12209625e 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
similarity index 78%
rename from sysdeps/ieee754/ldbl-opt/w_atanh.c
rename to sysdeps/ieee754/ldbl-opt/w_atanh_compat.c
index b4cab87c32e..e15ef1f93da 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_atanhl.c
rename to sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c
index 0dbc114481b..49bae1ee8f7 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_cosh.c
rename to sysdeps/ieee754/ldbl-opt/w_cosh_compat.c
index a6f56cf4c59..af29735e102 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_coshl.c
rename to sysdeps/ieee754/ldbl-opt/w_coshl_compat.c
index 8c7dccb7f35..a8808778ba4 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
similarity index 84%
rename from sysdeps/ieee754/ldbl-opt/w_exp10.c
rename to sysdeps/ieee754/ldbl-opt/w_exp10_compat.c
index 990c48e61ac..142a70bcd6c 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
similarity index 82%
rename from sysdeps/ieee754/ldbl-opt/w_exp10l.c
rename to sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c
index e06dfb50145..8f2ccd3441a 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_fmod.c
rename to sysdeps/ieee754/ldbl-opt/w_fmod_compat.c
index 81ad5057f7f..9280d39d707 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_fmodl.c
rename to sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c
index 2a534a304c5..88fe0ac4d27 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
similarity index 78%
rename from sysdeps/ieee754/ldbl-opt/w_hypot.c
rename to sysdeps/ieee754/ldbl-opt/w_hypot_compat.c
index e1cf1ffcfec..b3979ff0f41 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_hypotl.c
rename to sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c
index 6c46bd4bdec..68e39974898 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
similarity index 84%
rename from sysdeps/ieee754/ldbl-opt/w_j0.c
rename to sysdeps/ieee754/ldbl-opt/w_j0_compat.c
index 5c78aff0850..45b4d147647 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
similarity index 82%
rename from sysdeps/ieee754/ldbl-opt/w_j0l.c
rename to sysdeps/ieee754/ldbl-opt/w_j0l_compat.c
index 767a1bcada6..9050657e03f 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
similarity index 84%
rename from sysdeps/ieee754/ldbl-opt/w_j1.c
rename to sysdeps/ieee754/ldbl-opt/w_j1_compat.c
index ed3dbc0361e..1071c8fd6ae 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
similarity index 82%
rename from sysdeps/ieee754/ldbl-opt/w_j1l.c
rename to sysdeps/ieee754/ldbl-opt/w_j1l_compat.c
index 946c36467c7..4ed9e2dd12e 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
similarity index 84%
rename from sysdeps/ieee754/ldbl-opt/w_jn.c
rename to sysdeps/ieee754/ldbl-opt/w_jn_compat.c
index 7a7e0d434b7..be29a360412 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
similarity index 82%
rename from sysdeps/ieee754/ldbl-opt/w_jnl.c
rename to sysdeps/ieee754/ldbl-opt/w_jnl_compat.c
index 5219543a97a..d22ee549974 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
similarity index 78%
rename from sysdeps/ieee754/ldbl-opt/w_log10.c
rename to sysdeps/ieee754/ldbl-opt/w_log10_compat.c
index 74e716821e8..5ec6a2b2b60 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_log10l.c
rename to sysdeps/ieee754/ldbl-opt/w_log10l_compat.c
index 9c936e376a7..17de3e78561 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_log2.c
rename to sysdeps/ieee754/ldbl-opt/w_log2_compat.c
index 9b9b45b21bb..dffd2c183ec 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_log2l.c
rename to sysdeps/ieee754/ldbl-opt/w_log2l_compat.c
index c8596821336..3c5e7345730 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_log.c
rename to sysdeps/ieee754/ldbl-opt/w_log_compat.c
index bde1e31db47..d2a2bcadde6 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_logl.c
rename to sysdeps/ieee754/ldbl-opt/w_logl_compat.c
index c2354a02b91..2b558421393 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_pow.c
rename to sysdeps/ieee754/ldbl-opt/w_pow_compat.c
index 2d98fb9be4b..c2a79420194 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_powl.c
rename to sysdeps/ieee754/ldbl-opt/w_powl_compat.c
index 85b89276481..1897cf1c632 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
similarity index 85%
rename from sysdeps/ieee754/ldbl-opt/w_remainder.c
rename to sysdeps/ieee754/ldbl-opt/w_remainder_compat.c
index dfa7b7f5692..c823dcb8e76 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
similarity index 84%
rename from sysdeps/ieee754/ldbl-opt/w_remainderl.c
rename to sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c
index 7a344b77098..b2ce5c95637 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
similarity index 78%
rename from sysdeps/ieee754/ldbl-opt/w_scalb.c
rename to sysdeps/ieee754/ldbl-opt/w_scalb_compat.c
index e2ac601596e..f6d53a5ba58 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_scalbl.c
rename to sysdeps/ieee754/ldbl-opt/w_scalbl_compat.c
index f3d3901f866..c8feb654a2c 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_sinh.c
rename to sysdeps/ieee754/ldbl-opt/w_sinh_compat.c
index a5400b5eb11..b47182c0175 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_sinhl.c
rename to sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c
index b94f4ec8452..305ed823571 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
similarity index 79%
rename from sysdeps/ieee754/ldbl-opt/w_sqrt.c
rename to sysdeps/ieee754/ldbl-opt/w_sqrt_compat.c
index ca2ba061e87..355d1c20db4 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
similarity index 77%
rename from sysdeps/ieee754/ldbl-opt/w_sqrtl.c
rename to sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c
index 609f5bf3d6d..1e4526f2c66 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
similarity index 78%
rename from sysdeps/ieee754/ldbl-opt/w_tgamma.c
rename to sysdeps/ieee754/ldbl-opt/w_tgamma_compat.c
index cce9f348ed8..082ce8aaff9 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
similarity index 76%
rename from sysdeps/ieee754/ldbl-opt/w_tgammal.c
rename to sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c
index c3c511db8c6..aaf54035221 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 99761ef7f00..35517b63a1e 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 804e7dc095d..5afbade15f9 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
similarity index 94%
rename from sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-power5.S
rename to sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-power5.S
index 9d1f9c2d47b..7c5a504177e 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
similarity index 94%
rename from sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt-ppc32.S
rename to sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt_compat-ppc32.S
index 5eed5c05cc4..534e934ac91 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
similarity index 100%
rename from sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrt.c
rename to 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
similarity index 93%
rename from sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-power5.S
rename to sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-power5.S
index d4b28d69411..eacc0428506 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
similarity index 93%
rename from sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf-ppc32.S
rename to sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf_compat-ppc32.S
index 256ed0ba2af..72191fc9a55 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
similarity index 100%
rename from sysdeps/powerpc/powerpc32/power4/fpu/multiarch/w_sqrtf.c
rename to 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
similarity index 99%
rename from sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S
rename to sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt_compat.S
index 61e6d1feffc..bb896a33cd0 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
similarity index 99%
rename from sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S
rename to sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf_compat.S
index 8e74232ba37..c304ab5ca24 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
similarity index 99%
rename from sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S
rename to sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt_compat.S
index 617fc69f057..93625c5aa9e 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
similarity index 99%
rename from sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S
rename to sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf_compat.S
index 1ccd1f99a4d..2ca86b6155e 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
similarity index 100%
rename from sysdeps/sparc/sparc32/fpu/w_sqrt.S
rename to 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
similarity index 100%
rename from sysdeps/sparc/sparc32/fpu/w_sqrtf.S
rename to 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 4489b70cff0..c929f987645 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
similarity index 100%
rename from sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt-vis3.S
rename to 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
similarity index 84%
rename from sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt.S
rename to sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat.S
index 3b070721d23..1ccac19e290 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
similarity index 100%
rename from sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf-vis3.S
rename to 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
similarity index 84%
rename from sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf.S
rename to sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat.S
index 777a04058cc..f0e759a2c87 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
similarity index 100%
rename from sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S
rename to 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
similarity index 100%
rename from sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S
rename to 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
similarity index 100%
rename from sysdeps/sparc/sparc64/fpu/w_sqrt.S
rename to 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
similarity index 100%
rename from sysdeps/sparc/sparc64/fpu/w_sqrtf.S
rename to sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S
-- 
2.39.2