Prepare for radical source tree reorganization.zack/build-layout-experiment

All top-level files and directories are moved into a temporary storage
directory, REORG.TODO, except for files that will certainly still
exist in their current form at top level when we're done (COPYING,
COPYING.LIB, LICENSES, NEWS, README), all old ChangeLog files (which
are moved to the new directory OldChangeLogs, instead), and the
generated file INSTALL (which is just deleted; in the new order, there
will be no generated files checked into version control).

297 files changed, 0 insertions, 4569 deletions

diff --git a/sysdeps/ieee754/ldbl-opt/Makefile b/sysdeps/ieee754/ldbl-opt/Makefile
deleted file mode 100644
index 81429d0ddd..0000000000
--- a/sysdeps/ieee754/ldbl-opt/Makefile
+++ /dev/null
@@ -1,167 +0,0 @@
-# The`long double' type is a distinct type we support if
-# -mlong-double-128 option is used (or when it becomes a default
-# when -mlong-double-64 is not used).
-long-double-fcts = yes
-ifeq (,$(filter -mlong-double-128,$(sysdep-CFLAGS)))
-sysdep-CFLAGS += -mlong-double-128
-endif
-
-ifeq ($(subdir),math)
-libm-routines += s_nexttowardfd
-routines += math_ldbl_opt nldbl-compat
-
-extra-libs += libnldbl
-libnldbl-calls = asprintf dprintf fprintf fscanf fwprintf fwscanf iovfscanf \
-		 obstack_printf obstack_vprintf printf scanf snprintf \
-		 sprintf sscanf swprintf swscanf vasprintf vdprintf vfprintf \
-		 vfscanf vfwprintf vfwscanf vprintf vscanf vsnprintf \
-		 vsprintf vsscanf vswprintf vswscanf vwprintf vwscanf \
-		 wprintf wscanf printf_fp printf_size \
-		 fprintf_chk fwprintf_chk printf_chk snprintf_chk sprintf_chk \
-		 swprintf_chk vfprintf_chk vfwprintf_chk vprintf_chk \
-		 vsnprintf_chk vsprintf_chk vswprintf_chk vwprintf_chk \
-		 wprintf_chk asprintf_chk vasprintf_chk dprintf_chk \
-		 vdprintf_chk obstack_printf_chk obstack_vprintf_chk \
-		 syslog syslog_chk vsyslog vsyslog_chk \
-		 strfmon strfmon_l \
-		 strfroml \
-		 strtold strtold_l strtoldint wcstold wcstold_l wcstoldint \
-		 qecvt qfcvt qgcvt qecvt_r qfcvt_r \
-		 isinf isnan finite signbit scalb log2 lgamma_r ceil \
-		 significand acos asin atan atan2 cos sin tan cosh sinh \
-		 tanh acosh asinh atanh exp log log10 exp10 pow10 expm1 \
-		 log1p logb exp2 sqrt cbrt fabs floor j0 j1 y0 y1 erf erfc \
-		 lgamma tgamma gamma rint nearbyint round trunc \
-		 copysign fdim fmax fmin nextafter pow hypot fmod \
-		 remainder ldexp scalbn frexp modf scalbln fma nan sincos \
-		 jn yn ilogb remquo lrint lround llrint llround nexttowardf \
-		 nexttoward conj cacos cacosh casin catan catanh ccos ccosh \
-		 casinh cexp clog cproj csin csinh csqrt ctan ctanh cpow \
-		 cabs carg cimag creal clog10 \
-		 isoc99_scanf isoc99_fscanf isoc99_sscanf \
-		 isoc99_vscanf isoc99_vfscanf isoc99_vsscanf \
-		 isoc99_wscanf isoc99_fwscanf isoc99_swscanf \
-		 isoc99_vwscanf isoc99_vfwscanf isoc99_vswscanf \
-		 nextup nextdown totalorder totalordermag getpayload \
-		 canonicalize setpayload setpayloadsig llogb fmaxmag fminmag \
-		 roundeven fromfp ufromfp fromfpx ufromfpx
-libnldbl-routines = $(libnldbl-calls:%=nldbl-%)
-libnldbl-inhibit-o = $(object-suffixes)
-libnldbl-static-only-routines = $(libnldbl-routines)
-extra-objs += $(addsuffix .oS, $(libnldbl-routines))
-
-CFLAGS-nldbl-acos.c = -fno-builtin-acosl
-CFLAGS-nldbl-acosh.c = -fno-builtin-acoshl
-CFLAGS-nldbl-asin.c = -fno-builtin-asinl
-CFLAGS-nldbl-asinh.c = -fno-builtin-asinhl
-CFLAGS-nldbl-atan.c = -fno-builtin-atanl
-CFLAGS-nldbl-atan2.c = -fno-builtin-atan2l
-CFLAGS-nldbl-atanh.c = -fno-builtin-atanhl
-CFLAGS-nldbl-cabs.c = -fno-builtin-cabsl
-CFLAGS-nldbl-cacos.c = -fno-builtin-cacosl
-CFLAGS-nldbl-cacosh.c = -fno-builtin-cacoshl
-CFLAGS-nldbl-canonicalize.c = -fno-builtin-canonicalizel
-CFLAGS-nldbl-carg.c = -fno-builtin-cargl
-CFLAGS-nldbl-casin.c = -fno-builtin-casinl
-CFLAGS-nldbl-casinh.c = -fno-builtin-casinhl
-CFLAGS-nldbl-catan.c = -fno-builtin-catanl
-CFLAGS-nldbl-catanh.c = -fno-builtin-catanhl
-CFLAGS-nldbl-cbrt.c = -fno-builtin-cbrtl
-CFLAGS-nldbl-ccos.c = -fno-builtin-ccosl
-CFLAGS-nldbl-ccosh.c = -fno-builtin-ccoshl
-CFLAGS-nldbl-ceil.c = -fno-builtin-ceill
-CFLAGS-nldbl-cexp.c = -fno-builtin-cexpl
-CFLAGS-nldbl-cimag.c = -fno-builtin-cimagl
-CFLAGS-nldbl-clog.c = -fno-builtin-clogl
-CFLAGS-nldbl-clog10.c = -fno-builtin-clog10l
-CFLAGS-nldbl-conj.c = -fno-builtin-conjl
-CFLAGS-nldbl-copysign.c = -fno-builtin-copysignl
-CFLAGS-nldbl-cos.c = -fno-builtin-cosl
-CFLAGS-nldbl-cosh.c = -fno-builtin-coshl
-CFLAGS-nldbl-cpow.c = -fno-builtin-cpowl
-CFLAGS-nldbl-cproj.c = -fno-builtin-cprojl
-CFLAGS-nldbl-creal.c = -fno-builtin-creall
-CFLAGS-nldbl-csin.c = -fno-builtin-csinl
-CFLAGS-nldbl-csinh.c = -fno-builtin-csinhl
-CFLAGS-nldbl-csqrt.c = -fno-builtin-csqrtl
-CFLAGS-nldbl-ctan.c = -fno-builtin-ctanl
-CFLAGS-nldbl-ctanh.c = -fno-builtin-ctanhl
-CFLAGS-nldbl-erf.c = -fno-builtin-erfl
-CFLAGS-nldbl-erfc.c = -fno-builtin-erfcl
-CFLAGS-nldbl-exp.c = -fno-builtin-expl
-CFLAGS-nldbl-exp10.c = -fno-builtin-exp10l
-CFLAGS-nldbl-exp2.c = -fno-builtin-exp2l
-CFLAGS-nldbl-expm1.c = -fno-builtin-expm1l
-CFLAGS-nldbl-fabs.c = -fno-builtin-fabsl
-CFLAGS-nldbl-fdim.c = -fno-builtin-fdiml
-CFLAGS-nldbl-finite.c = -fno-builtin-finitel
-CFLAGS-nldbl-floor.c = -fno-builtin-floorl
-CFLAGS-nldbl-fma.c = -fno-builtin-fmal
-CFLAGS-nldbl-fmax.c = -fno-builtin-fmaxl
-CFLAGS-nldbl-fmaxmag.c = -fno-builtin-fmaxmagl
-CFLAGS-nldbl-fmin.c = -fno-builtin-fminl
-CFLAGS-nldbl-fminmag.c = -fno-builtin-fminmagl
-CFLAGS-nldbl-fmod.c = -fno-builtin-fmodl
-CFLAGS-nldbl-frexp.c = -fno-builtin-frexpl
-CFLAGS-nldbl-fromfp.c = -fno-builtin-fromfpl
-CFLAGS-nldbl-fromfpx.c = -fno-builtin-fromfpxl
-CFLAGS-nldbl-gamma.c = -fno-builtin-gammal
-CFLAGS-nldbl-getpayload.c = -fno-builtin-getpayloadl
-CFLAGS-nldbl-hypot.c = -fno-builtin-hypotl
-CFLAGS-nldbl-ilogb.c = -fno-builtin-ilogbl
-CFLAGS-nldbl-isinf.c = -fno-builtin-isinfl
-CFLAGS-nldbl-isnan.c = -fno-builtin-isnanl
-CFLAGS-nldbl-j0.c = -fno-builtin-j0l
-CFLAGS-nldbl-j1.c = -fno-builtin-j1l
-CFLAGS-nldbl-jn.c = -fno-builtin-jnl
-CFLAGS-nldbl-ldexp.c = -fno-builtin-ldexpl
-CFLAGS-nldbl-lgamma.c = -fno-builtin-lgammal
-CFLAGS-nldbl-lgamma_r.c = -fno-builtin-lgammal_r
-CFLAGS-nldbl-llogb.c = -fno-builtin-llogbl
-CFLAGS-nldbl-llrint.c = -fno-builtin-llrintl
-CFLAGS-nldbl-llround.c = -fno-builtin-llroundl
-CFLAGS-nldbl-log.c = -fno-builtin-logl
-CFLAGS-nldbl-log10.c = -fno-builtin-log10l
-CFLAGS-nldbl-log1p.c = -fno-builtin-log1pl
-CFLAGS-nldbl-log2.c = -fno-builtin-log2l
-CFLAGS-nldbl-logb.c = -fno-builtin-logbl
-CFLAGS-nldbl-lrint.c = -fno-builtin-lrintl
-CFLAGS-nldbl-lround.c = -fno-builtin-lroundl
-CFLAGS-nldbl-modf.c = -fno-builtin-modfl
-CFLAGS-nldbl-nan.c = -fno-builtin-nanl
-CFLAGS-nldbl-nearbyint.c = -fno-builtin-nearbyintl
-CFLAGS-nldbl-nextafter.c = -fno-builtin-nextafterl
-CFLAGS-nldbl-nextdown.c = -fno-builtin-nextdownl
-CFLAGS-nldbl-nexttoward.c = -fno-builtin-nexttoward -fno-builtin-nexttowardl
-CFLAGS-nldbl-nexttowardf.c = -fno-builtin-nexttowardf
-CFLAGS-nldbl-nextup.c = -fno-builtin-nextupl
-CFLAGS-nldbl-pow.c = -fno-builtin-powl
-CFLAGS-nldbl-pow10.c = -fno-builtin-pow10l
-CFLAGS-nldbl-remainder.c = -fno-builtin-remainderl -fno-builtin-dreml
-CFLAGS-nldbl-remquo.c = -fno-builtin-remquol
-CFLAGS-nldbl-rint.c = -fno-builtin-rintl
-CFLAGS-nldbl-round.c = -fno-builtin-roundl
-CFLAGS-nldbl-roundeven.c = -fno-builtin-roundevenl
-CFLAGS-nldbl-scalb.c = -fno-builtin-scalbl
-CFLAGS-nldbl-scalbln.c = -fno-builtin-scalblnl
-CFLAGS-nldbl-scalbn.c = -fno-builtin-scalbnl
-CFLAGS-nldbl-setpayload.c = -fno-builtin-setpayloadl
-CFLAGS-nldbl-setpayloadsig.c = -fno-builtin-setpayloadsigl
-CFLAGS-nldbl-significand.c = -fno-builtin-significandl
-CFLAGS-nldbl-sin.c = -fno-builtin-sinl
-CFLAGS-nldbl-sincos.c = -fno-builtin-sincosl
-CFLAGS-nldbl-sinh.c = -fno-builtin-sinhl
-CFLAGS-nldbl-sqrt.c = -fno-builtin-sqrtl
-CFLAGS-nldbl-tan.c = -fno-builtin-tanl
-CFLAGS-nldbl-tanh.c = -fno-builtin-tanhl
-CFLAGS-nldbl-tgamma.c = -fno-builtin-tgammal
-CFLAGS-nldbl-totalorder.c = -fno-builtin-totalorderl
-CFLAGS-nldbl-totalordermag.c = -fno-builtin-totalordermagl
-CFLAGS-nldbl-trunc.c = -fno-builtin-truncl
-CFLAGS-nldbl-ufromfp.c = -fno-builtin-ufromfpl
-CFLAGS-nldbl-ufromfpx.c = -fno-builtin-ufromfpxl
-CFLAGS-nldbl-y0.c = -fno-builtin-y0l
-CFLAGS-nldbl-y1.c = -fno-builtin-y1l
-CFLAGS-nldbl-yn.c = -fno-builtin-ynl
-
-endif
diff --git a/sysdeps/ieee754/ldbl-opt/Versions b/sysdeps/ieee754/ldbl-opt/Versions
deleted file mode 100644
index d3f0beaef2..0000000000
--- a/sysdeps/ieee754/ldbl-opt/Versions
+++ /dev/null
@@ -1,100 +0,0 @@
-%include <nldbl-abi.h>
-%ifndef NLDBL_VERSION
-% error "nldbl-abi.h must define NLDBL_VERSION"
-%endif
-
-libc {
-  NLDBL_VERSION {
-    # IEEE quad long double functions (older symver is for
-    # IEEE double long double).
-    ldexpl; copysignl; finitel; frexpl; isinfl; isnanl; modfl;
-    __isinfl; __isnanl; __finitel; __signbitl;
-    scalbnl;
-    qecvt; qfcvt; qgcvt; qecvt_r; qfcvt_r;
-
-    strtold; __strtold_internal; wcstold; __wcstold_internal;
-    __strtold_l; strtold_l; __wcstold_l; wcstold_l;
-
-    strfmon; __strfmon_l; strfmon_l;
-    __nldbl_strfmon; __nldbl___strfmon_l; __nldbl_strfmon_l;
-    __nldbl___vstrfmon; __nldbl___vstrfmon_l;
-
-    syslog; vsyslog;
-    __nldbl_syslog; __nldbl_vsyslog;
-    __nldbl___syslog_chk; __nldbl___vsyslog_chk;
-
-    # *printf* family, using IEEE quad long double
-    __asprintf; asprintf; dprintf; fprintf; fwprintf; _IO_fprintf;
-    _IO_printf; _IO_sprintf; _IO_vfprintf; _IO_vsprintf; obstack_printf;
-    obstack_vprintf; printf; __printf_fp; printf_size; snprintf; sprintf;
-    swprintf; vasprintf; vdprintf; vfprintf; vfwprintf; vprintf; vsnprintf;
-    __vsnprintf; vsprintf; vswprintf; vwprintf; wprintf;
-
-    # *printf* family, using IEEE double as long double
-    # The standard functions are __REDIRECTed to these if -mlong-double-64
-    __nldbl___asprintf; __nldbl_asprintf; __nldbl_dprintf; __nldbl_fprintf;
-    __nldbl_fwprintf; __nldbl__IO_fprintf; __nldbl__IO_printf;
-    __nldbl__IO_sprintf; __nldbl__IO_vfprintf; __nldbl__IO_vsprintf;
-    __nldbl_obstack_printf; __nldbl_obstack_vprintf; __nldbl_printf;
-    __nldbl___printf_fp; __nldbl_printf_size; __nldbl_snprintf;
-    __nldbl_sprintf; __nldbl_swprintf; __nldbl_vasprintf; __nldbl_vdprintf;
-    __nldbl_vfprintf; __nldbl_vfwprintf; __nldbl_vprintf; __nldbl_vsnprintf;
-    __nldbl___vsnprintf; __nldbl_vsprintf; __nldbl_vswprintf;
-    __nldbl_vwprintf; __nldbl_wprintf;
-
-    # *scanf family, using IEEE quad long double
-    _IO_sscanf; _IO_vfscanf; __vfscanf; __vsscanf; fscanf; fwscanf; scanf;
-    sscanf; swscanf; vfscanf; vfwscanf; vscanf; vsscanf; vswscanf; vwscanf;
-    wscanf;
-
-    # *scanf family, using IEEE double as long double
-    __nldbl__IO_sscanf; __nldbl__IO_vfscanf; __nldbl___vfscanf;
-    __nldbl___vsscanf; __nldbl_fscanf; __nldbl_fwscanf; __nldbl_scanf;
-    __nldbl_sscanf; __nldbl_swscanf; __nldbl_vfscanf; __nldbl_vfwscanf;
-    __nldbl_vscanf; __nldbl_vsscanf; __nldbl_vswscanf; __nldbl_vwscanf;
-    __nldbl_wscanf;
-
-    # checking versions, using IEEE quad long double
-    __sprintf_chk; __vsprintf_chk; __snprintf_chk; __vsnprintf_chk;
-    __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk;
-
-    # checking versions, using IEEE double as long double
-    __nldbl___sprintf_chk; __nldbl___vsprintf_chk; __nldbl___snprintf_chk;
-    __nldbl___vsnprintf_chk; __nldbl___printf_chk; __nldbl___fprintf_chk;
-    __nldbl___vprintf_chk; __nldbl___vfprintf_chk;
-    __nldbl___swprintf_chk; __nldbl___vswprintf_chk; __nldbl___fwprintf_chk;
-    __nldbl___wprintf_chk; __nldbl___vfwprintf_chk; __nldbl___vwprintf_chk;
-  }
-  GLIBC_2.7 {
-    __nldbl___isoc99_scanf; __nldbl___isoc99_fscanf;
-    __nldbl___isoc99_sscanf; __nldbl___isoc99_vscanf;
-    __nldbl___isoc99_vfscanf; __nldbl___isoc99_vsscanf;
-    __nldbl___isoc99_wscanf; __nldbl___isoc99_fwscanf;
-    __nldbl___isoc99_swscanf; __nldbl___isoc99_vwscanf;
-    __nldbl___isoc99_vfwscanf; __nldbl___isoc99_vswscanf;
-  }
-  GLIBC_2.8 {
-    __nldbl___asprintf_chk; __nldbl___vasprintf_chk;
-    __nldbl___dprintf_chk; __nldbl___vdprintf_chk;
-    __nldbl___obstack_printf_chk; __nldbl___obstack_vprintf_chk;
-  }
-}
-libm {
-  NLDBL_VERSION {
-    # IEEE quad long double functions (older symver is for
-    # IEEE double as long double).
-    cabsl; cargl; cimagl; conjl; creall; cacosl; cacoshl; casinl;
-    catanl; catanhl; ccosl; ccoshl; casinhl; cexpl; clogl; __clog10l;
-    clog10l; cpowl; cprojl; csinl; csinhl; csqrtl; ctanl; ctanhl;
-    fdiml; fmal; fmaxl; fminl; ldexpl; nanl; nextafterl; nexttowardl;
-    significandl; acosl; acoshl; asinl; atan2l; atanhl; coshl; dreml;
-    exp10l; pow10l; exp2l; fmodl; hypotl; j0l; y0l; j1l; y1l; jnl; ynl;
-    lgammal; gammal; lgammal_r; logl; log10l; log2l; powl; remainderl;
-    scalbl; sinhl; sqrtl; tgammal; asinhl; atanl; cbrtl; ceill; copysignl;
-    erfl; erfcl; expm1l; fabsl; finitel; floorl; frexpl; ilogbl;
-    llrintl; llroundl; log1pl; logbl; lrintl; lroundl; modfl;
-    nearbyintl; remquol; rintl; roundl; scalblnl; scalbnl; sinl; cosl;
-    sincosl; tanl; tanhl; truncl; expl; __finitel; __signbitl;
-    __fpclassifyl; nexttowardf; nexttoward; __nldbl_nexttowardf;
-  }
-}
diff --git a/sysdeps/ieee754/ldbl-opt/bits/long-double.h b/sysdeps/ieee754/ldbl-opt/bits/long-double.h
deleted file mode 100644
index 67db5b9d0c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/bits/long-double.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Properties of long double type.  ldbl-opt version.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License  published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NO_LONG_DOUBLE_MATH
-# define __LONG_DOUBLE_MATH_OPTIONAL	1
-# ifndef __LONG_DOUBLE_128__
-#  define __NO_LONG_DOUBLE_MATH		1
-# endif
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/configure b/sysdeps/ieee754/ldbl-opt/configure
deleted file mode 100644
index ad9d77b88c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/configure
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
- # Local configure fragment for sysdeps/ieee754/ldbl-opt/.
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC $CFLAGS supports -mlong-double-128" >&5
-$as_echo_n "checking whether $CC $CFLAGS supports -mlong-double-128... " >&6; }
-if ${libc_cv_mlong_double_128+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -mlong-double-128"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-#ifndef __LONG_DOUBLE_128__
-# error "compiler did not predefine __LONG_DOUBLE_128__ as expected"
-#endif
-long double foobar (long double x) { return x; }
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  libc_cv_mlong_double_128=yes
-else
-  libc_cv_mlong_double_128=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CFLAGS="$save_CFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mlong_double_128" >&5
-$as_echo "$libc_cv_mlong_double_128" >&6; }
-if test "$libc_cv_mlong_double_128" = no; then
-  as_fn_error $? "this configuration requires -mlong-double-128 support" "$LINENO" 5
-fi
diff --git a/sysdeps/ieee754/ldbl-opt/configure.ac b/sysdeps/ieee754/ldbl-opt/configure.ac
deleted file mode 100644
index a77fadd1c4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
-sinclude(./aclocal.m4)dnl Autoconf lossage
-GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/ieee754/ldbl-opt/.
-
-AC_CACHE_CHECK(whether $CC $CFLAGS supports -mlong-double-128,
-	       libc_cv_mlong_double_128, [dnl
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -mlong-double-128"
-AC_TRY_COMPILE(, [
-#ifndef __LONG_DOUBLE_128__
-# error "compiler did not predefine __LONG_DOUBLE_128__ as expected"
-#endif
-long double foobar (long double x) { return x; }],
-	       libc_cv_mlong_double_128=yes,
-	       libc_cv_mlong_double_128=no)
-CFLAGS="$save_CFLAGS"])
-if test "$libc_cv_mlong_double_128" = no; then
-  AC_MSG_ERROR([this configuration requires -mlong-double-128 support])
-fi
diff --git a/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h b/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h
deleted file mode 100644
index 67b5268dc4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Overrides for ldbl-opt versioning for double types.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_TYPE_MACROS_DOUBLE
-
-#include <math_ldbl_opt.h>
-#include <first-versions.h>
-
-/* Define compat symbols for long double on platforms
-   where it was not always a distinct type.  */
-#if !defined M_LIBM_NEED_COMPAT
-# define M_LIBM_NEED_COMPAT(f) \
-  LONG_DOUBLE_COMPAT (libm, FIRST_VERSION_libm_ ## f ## l)
-#endif
-
-#if !defined declare_mgen_libm_compat
-# define declare_mgen_libm_compat(from, to)	      \
-  compat_symbol (libm, from, to ## l,		      \
-		 FIRST_VERSION_libm_ ## to ## l);
-#endif
-
-#include_next <math-type-macros-double.h>
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h b/sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h
deleted file mode 100644
index 20873ae6b5..0000000000
--- a/sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Overrides for ldbl-opt versioning for long double types.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_TYPE_MACROS_LDOUBLE
-
-#include <math_ldbl_opt.h>
-#include <ldbl-compat-choose.h>
-
-#define maybe_long_double_symbol(lib, from, to)				\
-  LONG_DOUBLE_COMPAT_CHOOSE_ ## lib ## _ ## to (long_double_symbol (lib, \
-								    from, \
-								    to), \
-						weak_alias (from, to))
-
-/* Use properly versioned symbols for long double on platforms where
-   it was not always a distinct type.  */
-#if !defined declare_mgen_alias
-# define declare_mgen_alias(from, to) \
-  maybe_long_double_symbol (libm, from ## l, to ## l);
-#endif
-
-#include_next <math-type-macros-ldouble.h>
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.c b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.c
deleted file mode 100644
index 49c5c1249b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Set temporarily to non-zero if long double should be considered
-   the same as double.  */
-__thread int __no_long_double attribute_tls_model_ie attribute_hidden;
diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
deleted file mode 100644
index af861c11ea..0000000000
--- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -mlong-double-64 compatibility mode macros.  */
-
-#include <nldbl-abi.h>
-#ifndef LONG_DOUBLE_COMPAT_VERSION
-# error "nldbl-abi.h must define LONG_DOUBLE_COMPAT_VERSION"
-#endif
-
-#include <shlib-compat.h>
-#define LONG_DOUBLE_COMPAT(lib, introduced) \
-  SHLIB_COMPAT(lib, introduced, LONG_DOUBLE_COMPAT_VERSION)
-#define long_double_symbol(lib, local, symbol) \
-  long_double_symbol_1 (lib, local, symbol, LONG_DOUBLE_COMPAT_VERSION)
-#ifdef SHARED
-# define ldbl_hidden_def(local, name) libc_hidden_ver (local, name)
-# define ldbl_strong_alias(name, aliasname) \
-  strong_alias (name, __GL_##name##_##aliasname) \
-  long_double_symbol (libc, __GL_##name##_##aliasname, aliasname);
-# define ldbl_weak_alias(name, aliasname) \
-  weak_alias (name, __GL_##name##_##aliasname) \
-  long_double_symbol (libc, __GL_##name##_##aliasname, aliasname);
-# define long_double_symbol_1(lib, local, symbol, version) \
-  versioned_symbol (lib, local, symbol, version)
-#else
-# define ldbl_hidden_def(local, name) libc_hidden_def (name)
-# define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
-# define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname)
-# ifndef __ASSEMBLER__
-/* Note that weak_alias cannot be used - it is defined to nothing
-   in most of the C files.  */
-#  define long_double_symbol_1(lib, local, symbol, version) \
-  _weak_alias (local, symbol)
-# else
-#  define long_double_symbol_1(lib, local, symbol, version) \
-  weak_alias (local, symbol)
-# endif
-#endif
-
-#ifndef __ASSEMBLER__
-# include <math.h>
-# include <math_private.h>
-
-/* Set temporarily to non-zero if long double should be considered
-   the same as double.  */
-extern __thread int __no_long_double attribute_tls_model_ie attribute_hidden;
-# define __ldbl_is_dbl __builtin_expect (__no_long_double, 0)
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-acos.c b/sysdeps/ieee754/ldbl-opt/nldbl-acos.c
deleted file mode 100644
index 813a17e9d6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-acos.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-acosl (double x)
-{
-  return acos (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-acosh.c b/sysdeps/ieee754/ldbl-opt/nldbl-acosh.c
deleted file mode 100644
index 75508e30d7..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-acosh.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-acoshl (double x)
-{
-  return acosh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-asin.c b/sysdeps/ieee754/ldbl-opt/nldbl-asin.c
deleted file mode 100644
index 5bbe6cd992..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-asin.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-asinl (double x)
-{
-  return asin (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-asinh.c b/sysdeps/ieee754/ldbl-opt/nldbl-asinh.c
deleted file mode 100644
index 512f68519b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-asinh.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-asinhl (double x)
-{
-  return asinh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-asprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-asprintf.c
deleted file mode 100644
index 4be216d610..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-asprintf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "nldbl-compat.h"
-
-attribute_hidden
-int
-__asprintf (char **string_ptr, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vasprintf (string_ptr, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-extern __typeof (__asprintf) asprintf attribute_hidden;
-weak_alias (__asprintf, asprintf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-asprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-asprintf_chk.c
deleted file mode 100644
index b520181db7..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-asprintf_chk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-attribute_hidden
-int
-__asprintf_chk (char **string_ptr, int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vasprintf_chk (string_ptr, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-atan.c b/sysdeps/ieee754/ldbl-opt/nldbl-atan.c
deleted file mode 100644
index 2849e48d03..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-atan.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-atanl (double x)
-{
-  return atan (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-atan2.c b/sysdeps/ieee754/ldbl-opt/nldbl-atan2.c
deleted file mode 100644
index d4e5a91702..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-atan2.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-atan2l (double x, double y)
-{
-  return atan2 (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-atanh.c b/sysdeps/ieee754/ldbl-opt/nldbl-atanh.c
deleted file mode 100644
index 82b54ca6d4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-atanh.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-atanhl (double x)
-{
-  return atanh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cabs.c b/sysdeps/ieee754/ldbl-opt/nldbl-cabs.c
deleted file mode 100644
index 837822d2d6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cabs.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double
-attribute_hidden
-cabsl (double _Complex x)
-{
-  return cabs (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cacos.c b/sysdeps/ieee754/ldbl-opt/nldbl-cacos.c
deleted file mode 100644
index d935b511b4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cacos.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-cacosl (double _Complex x)
-{
-  return cacos (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cacosh.c b/sysdeps/ieee754/ldbl-opt/nldbl-cacosh.c
deleted file mode 100644
index 67f994b849..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cacosh.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-cacoshl (double _Complex x)
-{
-  return cacosh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-canonicalize.c b/sysdeps/ieee754/ldbl-opt/nldbl-canonicalize.c
deleted file mode 100644
index 9d46163208..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-canonicalize.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for canonicalize.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-canonicalizel (double *cx, double *x)
-{
-  return canonicalize (cx, x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-carg.c b/sysdeps/ieee754/ldbl-opt/nldbl-carg.c
deleted file mode 100644
index bfff141c11..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-carg.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double
-attribute_hidden
-cargl (double _Complex x)
-{
-  return carg (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-casin.c b/sysdeps/ieee754/ldbl-opt/nldbl-casin.c
deleted file mode 100644
index 310aa0ac21..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-casin.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-casinl (double _Complex x)
-{
-  return casin (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-casinh.c b/sysdeps/ieee754/ldbl-opt/nldbl-casinh.c
deleted file mode 100644
index 71b466ea22..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-casinh.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-casinhl (double _Complex x)
-{
-  return casinh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-catan.c b/sysdeps/ieee754/ldbl-opt/nldbl-catan.c
deleted file mode 100644
index ea5f528ee5..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-catan.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-catanl (double _Complex x)
-{
-  return catan (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-catanh.c b/sysdeps/ieee754/ldbl-opt/nldbl-catanh.c
deleted file mode 100644
index e6f58aa048..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-catanh.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-catanhl (double _Complex x)
-{
-  return catanh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cbrt.c b/sysdeps/ieee754/ldbl-opt/nldbl-cbrt.c
deleted file mode 100644
index 1c353a6e6b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cbrt.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-cbrtl (double x)
-{
-  return cbrt (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ccos.c b/sysdeps/ieee754/ldbl-opt/nldbl-ccos.c
deleted file mode 100644
index 0e1c2e70f3..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ccos.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-ccosl (double _Complex x)
-{
-  return ccos (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ccosh.c b/sysdeps/ieee754/ldbl-opt/nldbl-ccosh.c
deleted file mode 100644
index da2bf580af..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ccosh.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-ccoshl (double _Complex x)
-{
-  return ccosh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ceil.c b/sysdeps/ieee754/ldbl-opt/nldbl-ceil.c
deleted file mode 100644
index a8fc3d548a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ceil.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-ceill (double x)
-{
-  return ceil (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cexp.c b/sysdeps/ieee754/ldbl-opt/nldbl-cexp.c
deleted file mode 100644
index f1837afc28..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cexp.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-cexpl (double _Complex x)
-{
-  return cexp (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cimag.c b/sysdeps/ieee754/ldbl-opt/nldbl-cimag.c
deleted file mode 100644
index fffbdd58ec..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cimag.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double
-attribute_hidden
-cimagl (double _Complex x)
-{
-  return cimag (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-clog.c b/sysdeps/ieee754/ldbl-opt/nldbl-clog.c
deleted file mode 100644
index ecbae7ba91..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-clog.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-clogl (double _Complex x)
-{
-  return clog (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-clog10.c b/sysdeps/ieee754/ldbl-opt/nldbl-clog10.c
deleted file mode 100644
index 193f40104a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-clog10.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-clog10l (double _Complex x)
-{
-  return clog10 (x);
-}
-extern __typeof (clog10l) __clog10l attribute_hidden;
-weak_alias (clog10l, __clog10l)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
deleted file mode 100644
index 84c4aeeed9..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
+++ /dev/null
@@ -1,1085 +0,0 @@
-/* *printf* family compatibility routines for IEEE double as long double
-   Copyright (C) 2006-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@cygnus.com>, 2006.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <libioP.h>
-#include <wchar.h>
-#include <printf.h>
-#include <monetary.h>
-#include <locale/localeinfo.h>
-#include <sys/syslog.h>
-#include <libc-lock.h>
-
-#include "nldbl-compat.h"
-
-libc_hidden_proto (__nldbl_vfprintf)
-libc_hidden_proto (__nldbl_vsscanf)
-libc_hidden_proto (__nldbl_vsprintf)
-libc_hidden_proto (__nldbl_vfscanf)
-libc_hidden_proto (__nldbl_vfwscanf)
-libc_hidden_proto (__nldbl_vdprintf)
-libc_hidden_proto (__nldbl_vswscanf)
-libc_hidden_proto (__nldbl_vfwprintf)
-libc_hidden_proto (__nldbl_vswprintf)
-libc_hidden_proto (__nldbl_vsnprintf)
-libc_hidden_proto (__nldbl_vasprintf)
-libc_hidden_proto (__nldbl_obstack_vprintf)
-libc_hidden_proto (__nldbl___vfwprintf_chk)
-libc_hidden_proto (__nldbl___vsnprintf_chk)
-libc_hidden_proto (__nldbl___vfprintf_chk)
-libc_hidden_proto (__nldbl___vsyslog_chk)
-libc_hidden_proto (__nldbl___vsprintf_chk)
-libc_hidden_proto (__nldbl___vswprintf_chk)
-libc_hidden_proto (__nldbl___vasprintf_chk)
-libc_hidden_proto (__nldbl___vdprintf_chk)
-libc_hidden_proto (__nldbl___obstack_vprintf_chk)
-libc_hidden_proto (__nldbl___vstrfmon)
-libc_hidden_proto (__nldbl___vstrfmon_l)
-libc_hidden_proto (__nldbl___isoc99_vsscanf)
-libc_hidden_proto (__nldbl___isoc99_vfscanf)
-libc_hidden_proto (__nldbl___isoc99_vswscanf)
-libc_hidden_proto (__nldbl___isoc99_vfwscanf)
-
-static void
-__nldbl_cleanup (void *arg)
-{
-  __no_long_double = 0;
-}
-
-#define set_no_long_double() \
-  __libc_cleanup_push (__nldbl_cleanup, NULL); __no_long_double = 1
-#define clear_no_long_double() \
-  __no_long_double = 0; __libc_cleanup_pop (0)
-
-/* Compatibility with IEEE double as long double.
-   IEEE quad long double is used by default for most programs, so
-   we don't need to split this into one file per function for the
-   sake of statically linked programs.  */
-
-int
-attribute_compat_text_section
-__nldbl___asprintf (char **string_ptr, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vasprintf (string_ptr, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-weak_alias (__nldbl___asprintf, __nldbl_asprintf)
-
-int
-attribute_compat_text_section
-__nldbl_dprintf (int d, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vdprintf (d, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl_fprintf (FILE *stream, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfprintf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-weak_alias (__nldbl_fprintf, __nldbl__IO_fprintf)
-
-int
-attribute_compat_text_section weak_function
-__nldbl_fwprintf (FILE *stream, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwprintf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl_printf (const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfprintf (stdout, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-strong_alias (__nldbl_printf, __nldbl__IO_printf)
-
-int
-attribute_compat_text_section
-__nldbl_sprintf (char *s, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vsprintf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-strong_alias (__nldbl_sprintf, __nldbl__IO_sprintf)
-
-int
-attribute_compat_text_section
-__nldbl_vfprintf (FILE *s, const char *fmt, va_list ap)
-{
-  int done;
-  set_no_long_double ();
-  done = _IO_vfprintf (s, fmt, ap);
-  clear_no_long_double ();
-  return done;
-}
-libc_hidden_def (__nldbl_vfprintf)
-strong_alias (__nldbl_vfprintf, __nldbl__IO_vfprintf)
-
-int
-attribute_compat_text_section
-__nldbl__IO_vsprintf (char *string, const char *fmt, va_list ap)
-{
-  int done;
-  __no_long_double = 1;
-  done = _IO_vsprintf (string, fmt, ap);
-  __no_long_double = 0;
-  return done;
-}
-weak_alias (__nldbl__IO_vsprintf, __nldbl_vsprintf)
-libc_hidden_def (__nldbl_vsprintf)
-
-int
-attribute_compat_text_section
-__nldbl_obstack_vprintf (struct obstack *obstack, const char *fmt,
-			 va_list ap)
-{
-  int done;
-  __no_long_double = 1;
-  done = _IO_obstack_vprintf (obstack, fmt, ap);
-  __no_long_double = 0;
-  return done;
-}
-libc_hidden_def (__nldbl_obstack_vprintf)
-
-int
-attribute_compat_text_section
-__nldbl_obstack_printf (struct obstack *obstack, const char *fmt, ...)
-{
-  int result;
-  va_list ap;
-  va_start (ap, fmt);
-  result = __nldbl_obstack_vprintf (obstack, fmt, ap);
-  va_end (ap);
-  return result;
-}
-
-int
-attribute_compat_text_section weak_function
-__nldbl_snprintf (char *s, size_t maxlen, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vsnprintf (s, maxlen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl_swprintf (wchar_t *s, size_t n, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vswprintf (s, n, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section weak_function
-__nldbl_vasprintf (char **result_ptr, const char *fmt, va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = _IO_vasprintf (result_ptr, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl_vasprintf)
-
-int
-attribute_compat_text_section
-__nldbl_vdprintf (int d, const char *fmt, va_list arg)
-{
-  int res;
-  set_no_long_double ();
-  res = _IO_vdprintf (d, fmt, arg);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl_vdprintf)
-
-int
-attribute_compat_text_section weak_function
-__nldbl_vfwprintf (FILE *s, const wchar_t *fmt, va_list ap)
-{
-  int res;
-  set_no_long_double ();
-  res = _IO_vfwprintf (s, fmt, ap);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl_vfwprintf)
-
-int
-attribute_compat_text_section
-__nldbl_vprintf (const char *fmt, va_list ap)
-{
-  return __nldbl_vfprintf (stdout, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl_vsnprintf (char *string, size_t maxlen, const char *fmt,
-		   va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = _IO_vsnprintf (string, maxlen, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl_vsnprintf)
-weak_alias (__nldbl_vsnprintf, __nldbl___vsnprintf)
-
-int
-attribute_compat_text_section weak_function
-__nldbl_vswprintf (wchar_t *string, size_t maxlen, const wchar_t *fmt,
-		   va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = _IO_vswprintf (string, maxlen, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl_vswprintf)
-
-int
-attribute_compat_text_section
-__nldbl_vwprintf (const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vfwprintf (stdout, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl_wprintf (const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwprintf (stdout, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl__IO_vfscanf (FILE *s, const char *fmt, _IO_va_list ap,
-		    int *errp)
-{
-  int res;
-  set_no_long_double ();
-  res = _IO_vfscanf (s, fmt, ap, errp);
-  clear_no_long_double ();
-  return res;
-}
-
-int
-attribute_compat_text_section
-__nldbl___vfscanf (FILE *s, const char *fmt, va_list ap)
-{
-  int res;
-  set_no_long_double ();
-  res = _IO_vfscanf (s, fmt, ap, NULL);
-  clear_no_long_double ();
-  return res;
-}
-weak_alias (__nldbl___vfscanf, __nldbl_vfscanf)
-libc_hidden_def (__nldbl_vfscanf)
-
-int
-attribute_compat_text_section
-__nldbl_sscanf (const char *s, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vsscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-strong_alias (__nldbl_sscanf, __nldbl__IO_sscanf)
-
-int
-attribute_compat_text_section
-__nldbl___vsscanf (const char *string, const char *fmt, va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = _IO_vsscanf (string, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-weak_alias (__nldbl___vsscanf, __nldbl_vsscanf)
-libc_hidden_def (__nldbl_vsscanf)
-
-int
-attribute_compat_text_section weak_function
-__nldbl_vscanf (const char *fmt, va_list ap)
-{
-  return __nldbl_vfscanf (stdin, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl_fscanf (FILE *stream, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfscanf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl_scanf (const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfscanf (stdin, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl_vfwscanf (FILE *s, const wchar_t *fmt, va_list ap)
-{
-  int res;
-  set_no_long_double ();
-  res = _IO_vfwscanf (s, fmt, ap, NULL);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl_vfwscanf)
-
-int
-attribute_compat_text_section
-__nldbl_swscanf (const wchar_t *s, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vswscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl_vswscanf (const wchar_t *string, const wchar_t *fmt, va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = vswscanf (string, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl_vswscanf)
-
-int
-attribute_compat_text_section weak_function
-__nldbl_vwscanf (const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vfwscanf (stdin, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl_fwscanf (FILE *stream, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwscanf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl_wscanf (const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwscanf (stdin, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___fprintf_chk (FILE *stream, int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfprintf_chk (stream, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___fwprintf_chk (FILE *stream, int flag, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfwprintf_chk (stream, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___printf_chk (int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfprintf_chk (stdout, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
-			const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vsnprintf_chk (s, maxlen, flag, slen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___sprintf_chk (char *s, int flag, size_t slen, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vsprintf_chk (s, flag, slen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___swprintf_chk (wchar_t *s, size_t n, int flag, size_t slen,
-			const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vswprintf_chk (s, n, flag, slen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___vfprintf_chk (FILE *s, int flag, const char *fmt, va_list ap)
-{
-  int res;
-  set_no_long_double ();
-  res = __vfprintf_chk (s, flag, fmt, ap);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl___vfprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___vfwprintf_chk (FILE *s, int flag, const wchar_t *fmt, va_list ap)
-{
-  int res;
-  set_no_long_double ();
-  res = __vfwprintf_chk (s, flag, fmt, ap);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl___vfwprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___vprintf_chk (int flag, const char *fmt, va_list ap)
-{
-  return __nldbl___vfprintf_chk (stdout, flag, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl___vsnprintf_chk (char *string, size_t maxlen, int flag, size_t slen,
-			 const char *fmt, va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = __vsnprintf_chk (string, maxlen, flag, slen, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl___vsnprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___vsprintf_chk (char *string, int flag, size_t slen, const char *fmt,
-			va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = __vsprintf_chk (string, flag, slen, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl___vsprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___vswprintf_chk (wchar_t *string, size_t maxlen, int flag, size_t slen,
-			 const wchar_t *fmt, va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = __vswprintf_chk (string, maxlen, flag, slen, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl___vswprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___vwprintf_chk (int flag, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___vfwprintf_chk (stdout, flag, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl___wprintf_chk (int flag, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfwprintf_chk (stdout, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___vasprintf_chk (char **ptr, int flag, const char *fmt, va_list arg)
-{
-  int res;
-  __no_long_double = 1;
-  res = __vasprintf_chk (ptr, flag, fmt, arg);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl___vasprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___asprintf_chk (char **ptr, int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vasprintf_chk (ptr, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___vdprintf_chk (int d, int flag, const char *fmt, va_list arg)
-{
-  int res;
-  set_no_long_double ();
-  res = __vdprintf_chk (d, flag, fmt, arg);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl___vdprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___dprintf_chk (int d, int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vdprintf_chk (d, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___obstack_vprintf_chk (struct obstack *obstack, int flag,
-			       const char *fmt, va_list arg)
-{
-  int res;
-  __no_long_double = 1;
-  res = __obstack_vprintf_chk (obstack, flag, fmt, arg);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl___obstack_vprintf_chk)
-
-int
-attribute_compat_text_section
-__nldbl___obstack_printf_chk (struct obstack *obstack, int flag,
-			      const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___obstack_vprintf_chk (obstack, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-extern __typeof (printf_size) __printf_size;
-
-int
-attribute_compat_text_section
-__nldbl_printf_size (FILE *fp, const struct printf_info *info,
-		     const void *const *args)
-{
-  struct printf_info info_no_ldbl = *info;
-
-  info_no_ldbl.is_long_double = 0;
-  return __printf_size (fp, &info_no_ldbl, args);
-}
-
-extern __typeof (__printf_fp) ___printf_fp;
-
-int
-attribute_compat_text_section
-__nldbl___printf_fp (FILE *fp, const struct printf_info *info,
-		     const void *const *args)
-{
-  struct printf_info info_no_ldbl = *info;
-
-  info_no_ldbl.is_long_double = 0;
-  return ___printf_fp (fp, &info_no_ldbl, args);
-}
-
-ssize_t
-attribute_compat_text_section
-__nldbl_strfmon (char *s, size_t maxsize, const char *format, ...)
-{
-  va_list ap;
-  ssize_t res;
-
-  va_start (ap, format);
-  res = __nldbl___vstrfmon (s, maxsize, format, ap);
-  va_end (ap);
-  return res;
-}
-
-ssize_t
-attribute_compat_text_section
-__nldbl___strfmon_l (char *s, size_t maxsize, __locale_t loc,
-		     const char *format, ...)
-{
-  va_list ap;
-  ssize_t res;
-
-  va_start (ap, format);
-  res = __nldbl___vstrfmon_l (s, maxsize, loc, format, ap);
-  va_end (ap);
-  return res;
-}
-weak_alias (__nldbl___strfmon_l, __nldbl_strfmon_l)
-
-ssize_t
-attribute_compat_text_section
-__nldbl___vstrfmon (char *s, size_t maxsize, const char *format, va_list ap)
-{
-  ssize_t res;
-  __no_long_double = 1;
-  res = __vstrfmon_l (s, maxsize, _NL_CURRENT_LOCALE, format, ap);
-  __no_long_double = 0;
-  va_end (ap);
-  return res;
-}
-libc_hidden_def (__nldbl___vstrfmon)
-
-ssize_t
-attribute_compat_text_section
-__nldbl___vstrfmon_l (char *s, size_t maxsize, __locale_t loc,
-		      const char *format, va_list ap)
-{
-  ssize_t res;
-  __no_long_double = 1;
-  res = __vstrfmon_l (s, maxsize, loc, format, ap);
-  __no_long_double = 0;
-  va_end (ap);
-  return res;
-}
-libc_hidden_def (__nldbl___vstrfmon_l)
-
-void
-attribute_compat_text_section
-__nldbl_syslog (int pri, const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  __nldbl___vsyslog_chk (pri, -1, fmt, ap);
-  va_end (ap);
-}
-
-void
-attribute_compat_text_section
-__nldbl___syslog_chk (int pri, int flag, const char *fmt, ...)
-{
-  va_list ap;
-
-  va_start (ap, fmt);
-  __nldbl___vsyslog_chk (pri, flag, fmt, ap);
-  va_end(ap);
-}
-
-void
-attribute_compat_text_section
-__nldbl___vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
-{
-  set_no_long_double ();
-  __vsyslog_chk (pri, flag, fmt, ap);
-  clear_no_long_double ();
-}
-libc_hidden_def (__nldbl___vsyslog_chk)
-
-void
-attribute_compat_text_section
-__nldbl_vsyslog (int pri, const char *fmt, va_list ap)
-{
-  __nldbl___vsyslog_chk (pri, -1, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_vfscanf (FILE *s, const char *fmt, va_list ap)
-{
-  int res;
-  set_no_long_double ();
-  res = __isoc99_vfscanf (s, fmt, ap);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl___isoc99_vfscanf)
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_sscanf (const char *s, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vsscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_vsscanf (const char *string, const char *fmt, va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = __isoc99_vsscanf (string, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl___isoc99_vsscanf)
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_vscanf (const char *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vfscanf (stdin, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_fscanf (FILE *stream, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfscanf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_scanf (const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfscanf (stdin, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_vfwscanf (FILE *s, const wchar_t *fmt, va_list ap)
-{
-  int res;
-  set_no_long_double ();
-  res = __isoc99_vfwscanf (s, fmt, ap);
-  clear_no_long_double ();
-  return res;
-}
-libc_hidden_def (__nldbl___isoc99_vfwscanf)
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_swscanf (const wchar_t *s, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vswscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_vswscanf (const wchar_t *string, const wchar_t *fmt,
-			   va_list ap)
-{
-  int res;
-  __no_long_double = 1;
-  res = __isoc99_vswscanf (string, fmt, ap);
-  __no_long_double = 0;
-  return res;
-}
-libc_hidden_def (__nldbl___isoc99_vswscanf)
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_vwscanf (const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vfwscanf (stdin, fmt, ap);
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_fwscanf (FILE *stream, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfwscanf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-int
-attribute_compat_text_section
-__nldbl___isoc99_wscanf (const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfwscanf (stdin, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-
-#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __nldbl__IO_printf, _IO_printf, GLIBC_2_0);
-compat_symbol (libc, __nldbl__IO_sprintf, _IO_sprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl__IO_vfprintf, _IO_vfprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl__IO_vsprintf, _IO_vsprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_dprintf, dprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_fprintf, fprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_printf, printf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_sprintf, sprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vfprintf, vfprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vprintf, vprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl__IO_fprintf, _IO_fprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl___vsnprintf, __vsnprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_asprintf, asprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_obstack_printf, obstack_printf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_obstack_vprintf, obstack_vprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_snprintf, snprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vasprintf, vasprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vdprintf, vdprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vsnprintf, vsnprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vsprintf, vsprintf, GLIBC_2_0);
-compat_symbol (libc, __nldbl__IO_sscanf, _IO_sscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl__IO_vfscanf, _IO_vfscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl___vfscanf, __vfscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl___vsscanf, __vsscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_fscanf, fscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_scanf, scanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_sscanf, sscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vfscanf, vfscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vscanf, vscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vsscanf, vsscanf, GLIBC_2_0);
-compat_symbol (libc, __nldbl___printf_fp, __printf_fp, GLIBC_2_0);
-compat_symbol (libc, __nldbl_strfmon, strfmon, GLIBC_2_0);
-compat_symbol (libc, __nldbl_syslog, syslog, GLIBC_2_0);
-compat_symbol (libc, __nldbl_vsyslog, vsyslog, GLIBC_2_0);
-#endif
-#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_1)
-compat_symbol (libc, __nldbl___asprintf, __asprintf, GLIBC_2_1);
-compat_symbol (libc, __nldbl_printf_size, printf_size, GLIBC_2_1);
-compat_symbol (libc, __nldbl___strfmon_l, __strfmon_l, GLIBC_2_1);
-#endif
-#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_2)
-compat_symbol (libc, __nldbl_swprintf, swprintf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_vwprintf, vwprintf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_wprintf, wprintf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_fwprintf, fwprintf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_vfwprintf, vfwprintf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_vswprintf, vswprintf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_fwscanf, fwscanf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_swscanf, swscanf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_vfwscanf, vfwscanf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_vswscanf, vswscanf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_vwscanf, vwscanf, GLIBC_2_2);
-compat_symbol (libc, __nldbl_wscanf, wscanf, GLIBC_2_2);
-#endif
-#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_3)
-compat_symbol (libc, __nldbl_strfmon_l, strfmon_l, GLIBC_2_3);
-#endif
-#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_3_4)
-compat_symbol (libc, __nldbl___sprintf_chk, __sprintf_chk, GLIBC_2_3_4);
-compat_symbol (libc, __nldbl___vsprintf_chk, __vsprintf_chk, GLIBC_2_3_4);
-compat_symbol (libc, __nldbl___snprintf_chk, __snprintf_chk, GLIBC_2_3_4);
-compat_symbol (libc, __nldbl___vsnprintf_chk, __vsnprintf_chk, GLIBC_2_3_4);
-compat_symbol (libc, __nldbl___printf_chk, __printf_chk, GLIBC_2_3_4);
-compat_symbol (libc, __nldbl___fprintf_chk, __fprintf_chk, GLIBC_2_3_4);
-compat_symbol (libc, __nldbl___vprintf_chk, __vprintf_chk, GLIBC_2_3_4);
-compat_symbol (libc, __nldbl___vfprintf_chk, __vfprintf_chk, GLIBC_2_3_4);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.h b/sysdeps/ieee754/ldbl-opt/nldbl-compat.h
deleted file mode 100644
index 72ec0db390..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Prototypes for compatibility double == long double entry points.
-   Copyright (C) 2006-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@cygnus.com>, 2006.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef __NLDBL_COMPAT_H
-#define __NLDBL_COMPAT_H	1
-
-/* Avoid long double prototypes.  */
-#define __NO_LONG_DOUBLE_MATH	1
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <printf.h>
-#include <wchar.h>
-#include <math.h>
-#include <monetary.h>
-#include <sys/syslog.h>
-
-
-/* Declare the __nldbl_NAME function the wrappers call that's in libc.so.  */
-#define NLDBL_DECL(name) extern __typeof (name) __nldbl_##name
-
-NLDBL_DECL (_IO_vfscanf);
-NLDBL_DECL (vfscanf);
-NLDBL_DECL (vfwscanf);
-NLDBL_DECL (obstack_vprintf);
-NLDBL_DECL (vasprintf);
-NLDBL_DECL (dprintf);
-NLDBL_DECL (vdprintf);
-NLDBL_DECL (fprintf);
-NLDBL_DECL (vfprintf);
-NLDBL_DECL (vfwprintf);
-NLDBL_DECL (vsnprintf);
-NLDBL_DECL (vsprintf);
-NLDBL_DECL (vsscanf);
-NLDBL_DECL (vswprintf);
-NLDBL_DECL (vswscanf);
-NLDBL_DECL (__asprintf);
-NLDBL_DECL (asprintf);
-NLDBL_DECL (__printf_fp);
-NLDBL_DECL (printf_size);
-NLDBL_DECL (syslog);
-NLDBL_DECL (vsyslog);
-NLDBL_DECL (qecvt);
-NLDBL_DECL (qfcvt);
-NLDBL_DECL (qgcvt);
-NLDBL_DECL (__vstrfmon_l);
-NLDBL_DECL (__isoc99_scanf);
-NLDBL_DECL (__isoc99_fscanf);
-NLDBL_DECL (__isoc99_sscanf);
-NLDBL_DECL (__isoc99_vscanf);
-NLDBL_DECL (__isoc99_vfscanf);
-NLDBL_DECL (__isoc99_vsscanf);
-NLDBL_DECL (__isoc99_wscanf);
-NLDBL_DECL (__isoc99_fwscanf);
-NLDBL_DECL (__isoc99_swscanf);
-NLDBL_DECL (__isoc99_vwscanf);
-NLDBL_DECL (__isoc99_vfwscanf);
-NLDBL_DECL (__isoc99_vswscanf);
-
-/* This one does not exist in the normal interface, only
-   __nldbl___vstrfmon really exists.  */
-extern ssize_t __nldbl___vstrfmon (char *, size_t, const char *, va_list)
-  __THROW;
-
-/* These don't use __typeof because they were not declared by the headers,
-   since we don't compile with _FORTIFY_SOURCE.  */
-extern int __nldbl___vfprintf_chk (FILE *__restrict, int,
-				   const char *__restrict, _G_va_list);
-extern int __nldbl___vfwprintf_chk (FILE *__restrict, int,
-				    const wchar_t *__restrict, __gnuc_va_list);
-extern int __nldbl___vsprintf_chk (char *__restrict, int, size_t,
-				   const char *__restrict, _G_va_list) __THROW;
-extern int __nldbl___vsnprintf_chk (char *__restrict, size_t, int, size_t,
-				    const char *__restrict, _G_va_list)
-  __THROW;
-extern int __nldbl___vswprintf_chk (wchar_t *__restrict, size_t, int, size_t,
-				    const wchar_t *__restrict, __gnuc_va_list)
-  __THROW;
-extern int __nldbl___vasprintf_chk (char **, int, const char *, _G_va_list)
-  __THROW;
-extern int __nldbl___vdprintf_chk (int, int, const char *, _G_va_list);
-extern int __nldbl___obstack_vprintf_chk (struct obstack *, int, const char *,
-					  _G_va_list) __THROW;
-extern void __nldbl___vsyslog_chk (int, int, const char *, va_list);
-
-
-#endif /* __NLDBL_COMPAT_H */
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-conj.c b/sysdeps/ieee754/ldbl-opt/nldbl-conj.c
deleted file mode 100644
index 8927ea9968..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-conj.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-conjl (double _Complex x)
-{
-  return conj (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-copysign.c b/sysdeps/ieee754/ldbl-opt/nldbl-copysign.c
deleted file mode 100644
index 045f00dda8..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-copysign.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-copysignl (double x, double y)
-{
-  return __copysign (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cos.c b/sysdeps/ieee754/ldbl-opt/nldbl-cos.c
deleted file mode 100644
index 08738af048..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cos.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-cosl (double x)
-{
-  return cos (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cosh.c b/sysdeps/ieee754/ldbl-opt/nldbl-cosh.c
deleted file mode 100644
index 0ab834ffd9..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cosh.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-coshl (double x)
-{
-  return cosh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cpow.c b/sysdeps/ieee754/ldbl-opt/nldbl-cpow.c
deleted file mode 100644
index 709e7d73b1..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cpow.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-cpowl (double _Complex x, double _Complex y)
-{
-  return cpow (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-cproj.c b/sysdeps/ieee754/ldbl-opt/nldbl-cproj.c
deleted file mode 100644
index 6f88b88bf2..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-cproj.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-cprojl (double _Complex x)
-{
-  return cproj (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-creal.c b/sysdeps/ieee754/ldbl-opt/nldbl-creal.c
deleted file mode 100644
index b02ce6e5e4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-creal.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double
-attribute_hidden
-creall (double _Complex x)
-{
-  return creal (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-csin.c b/sysdeps/ieee754/ldbl-opt/nldbl-csin.c
deleted file mode 100644
index b2e2c9c8ef..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-csin.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-csinl (double _Complex x)
-{
-  return csin (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-csinh.c b/sysdeps/ieee754/ldbl-opt/nldbl-csinh.c
deleted file mode 100644
index 2bcba920e3..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-csinh.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-csinhl (double _Complex x)
-{
-  return csinh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-csqrt.c b/sysdeps/ieee754/ldbl-opt/nldbl-csqrt.c
deleted file mode 100644
index ae00a29885..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-csqrt.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-csqrtl (double _Complex x)
-{
-  return csqrt (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ctan.c b/sysdeps/ieee754/ldbl-opt/nldbl-ctan.c
deleted file mode 100644
index 422c5cce94..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ctan.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-ctanl (double _Complex x)
-{
-  return ctan (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ctanh.c b/sysdeps/ieee754/ldbl-opt/nldbl-ctanh.c
deleted file mode 100644
index f3842ed26f..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ctanh.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-#include <complex.h>
-
-double _Complex
-attribute_hidden
-ctanhl (double _Complex x)
-{
-  return ctanh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-dprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-dprintf.c
deleted file mode 100644
index 6e26db2a24..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-dprintf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-attribute_hidden
-int
-dprintf (int d, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vdprintf (d, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-dprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-dprintf_chk.c
deleted file mode 100644
index b3e2359128..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-dprintf_chk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-attribute_hidden
-int
-__dprintf_chk (int d, int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vdprintf_chk (d, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-erf.c b/sysdeps/ieee754/ldbl-opt/nldbl-erf.c
deleted file mode 100644
index 0032c1febc..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-erf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-erfl (double x)
-{
-  return erf (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-erfc.c b/sysdeps/ieee754/ldbl-opt/nldbl-erfc.c
deleted file mode 100644
index 21d09680aa..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-erfc.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-erfcl (double x)
-{
-  return erfc (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-exp.c b/sysdeps/ieee754/ldbl-opt/nldbl-exp.c
deleted file mode 100644
index ad2c89b6d5..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-exp.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-expl (double x)
-{
-  return exp (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-exp10.c b/sysdeps/ieee754/ldbl-opt/nldbl-exp10.c
deleted file mode 100644
index 2d0ead686b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-exp10.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-exp10l (double x)
-{
-  return exp10 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-exp2.c b/sysdeps/ieee754/ldbl-opt/nldbl-exp2.c
deleted file mode 100644
index d5fce3970d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-exp2.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-exp2l (double x)
-{
-  return exp2 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-expm1.c b/sysdeps/ieee754/ldbl-opt/nldbl-expm1.c
deleted file mode 100644
index be5c6e51c4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-expm1.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-expm1l (double x)
-{
-  return expm1 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fabs.c b/sysdeps/ieee754/ldbl-opt/nldbl-fabs.c
deleted file mode 100644
index 10729a6ec0..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fabs.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fabsl (double x)
-{
-  return fabs (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fdim.c b/sysdeps/ieee754/ldbl-opt/nldbl-fdim.c
deleted file mode 100644
index 72896b63ed..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fdim.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fdiml (double x, double y)
-{
-  return fdim (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-finite.c b/sysdeps/ieee754/ldbl-opt/nldbl-finite.c
deleted file mode 100644
index fc51508f16..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-finite.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__finitel (double x)
-{
-  return isfinite (x);
-}
-extern __typeof (__finitel) finitel attribute_hidden;
-weak_alias (__finitel, finitel)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-floor.c b/sysdeps/ieee754/ldbl-opt/nldbl-floor.c
deleted file mode 100644
index c7e9f834b6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-floor.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-floorl (double x)
-{
-  return floor (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fma.c b/sysdeps/ieee754/ldbl-opt/nldbl-fma.c
deleted file mode 100644
index 9474483673..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fma.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fmal (double x, double y, double z)
-{
-  return fma (x, y, z);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fmax.c b/sysdeps/ieee754/ldbl-opt/nldbl-fmax.c
deleted file mode 100644
index f5a84776ed..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fmax.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fmaxl (double x, double y)
-{
-  return fmax (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fmaxmag.c b/sysdeps/ieee754/ldbl-opt/nldbl-fmaxmag.c
deleted file mode 100644
index 28aab5791a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fmaxmag.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for fmaxmag.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fmaxmagl (double x, double y)
-{
-  return fmaxmag (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fmin.c b/sysdeps/ieee754/ldbl-opt/nldbl-fmin.c
deleted file mode 100644
index a353cf9484..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fmin.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fminl (double x, double y)
-{
-  return fmin (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fminmag.c b/sysdeps/ieee754/ldbl-opt/nldbl-fminmag.c
deleted file mode 100644
index f1743acd4d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fminmag.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for fminmag.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fminmagl (double x, double y)
-{
-  return fminmag (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fmod.c b/sysdeps/ieee754/ldbl-opt/nldbl-fmod.c
deleted file mode 100644
index aa692b9f36..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fmod.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-fmodl (double x, double y)
-{
-  return fmod (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-fprintf.c
deleted file mode 100644
index 9df4c4bc34..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fprintf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "nldbl-compat.h"
-
-attribute_hidden
-int
-fprintf (FILE *stream, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfprintf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-extern __typeof (fprintf) _IO_fprintf attribute_hidden;
-weak_alias (fprintf, _IO_fprintf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-fprintf_chk.c
deleted file mode 100644
index 43a7618183..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fprintf_chk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__fprintf_chk (FILE *stream, int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfprintf_chk (stream, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-frexp.c b/sysdeps/ieee754/ldbl-opt/nldbl-frexp.c
deleted file mode 100644
index 0ec97e10e3..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-frexp.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-frexpl (double x, int *exponent)
-{
-  return frexp (x, exponent);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fromfp.c b/sysdeps/ieee754/ldbl-opt/nldbl-fromfp.c
deleted file mode 100644
index 6ef95f4ab4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fromfp.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for fromfp.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-intmax_t
-attribute_hidden
-fromfpl (double x, int round, unsigned int width)
-{
-  return fromfp (x, round, width);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fromfpx.c b/sysdeps/ieee754/ldbl-opt/nldbl-fromfpx.c
deleted file mode 100644
index 193d9b6ce1..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fromfpx.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for fromfpx.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-intmax_t
-attribute_hidden
-fromfpxl (double x, int round, unsigned int width)
-{
-  return fromfpx (x, round, width);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-fscanf.c
deleted file mode 100644
index 1b768e306f..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-fscanf (FILE *stream, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl__IO_vfscanf (stream, fmt, arg, NULL);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fwprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-fwprintf.c
deleted file mode 100644
index 18362af013..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fwprintf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-weak_function
-fwprintf (FILE *stream, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwprintf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fwprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-fwprintf_chk.c
deleted file mode 100644
index 09731cf29d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fwprintf_chk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__fwprintf_chk (FILE *stream, int flag, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfwprintf_chk (stream, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-fwscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-fwscanf.c
deleted file mode 100644
index 27fc1a7271..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-fwscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-fwscanf (FILE *stream, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwscanf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-gamma.c b/sysdeps/ieee754/ldbl-opt/nldbl-gamma.c
deleted file mode 100644
index 10dc640b92..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-gamma.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-gammal (double x)
-{
-  return gamma (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-getpayload.c b/sysdeps/ieee754/ldbl-opt/nldbl-getpayload.c
deleted file mode 100644
index f15f9231ec..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-getpayload.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for getpayload.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-getpayloadl (const double *x)
-{
-  return getpayload (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-hypot.c b/sysdeps/ieee754/ldbl-opt/nldbl-hypot.c
deleted file mode 100644
index 2105f3eba8..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-hypot.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-hypotl (double x, double y)
-{
-  return hypot (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ilogb.c b/sysdeps/ieee754/ldbl-opt/nldbl-ilogb.c
deleted file mode 100644
index e840b2a447..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ilogb.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-ilogbl (double x)
-{
-  return ilogb (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c
deleted file mode 100644
index 05581c0354..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-_IO_vfscanf (FILE *s, const char *fmt, _IO_va_list ap, int *errp)
-{
-  return __nldbl__IO_vfscanf (s, fmt, ap, errp);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isinf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isinf.c
deleted file mode 100644
index 577ab2db28..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isinf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isinfl (double x)
-{
-  return isinf (x);
-}
-extern __typeof (__isinfl) isinfl attribute_hidden;
-weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isnan.c b/sysdeps/ieee754/ldbl-opt/nldbl-isnan.c
deleted file mode 100644
index 2d87bf85fb..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isnan.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isnanl (double x)
-{
-  return isnan (x);
-}
-extern __typeof (__isnanl) isnanl attribute_hidden;
-weak_alias (__isnanl, isnanl)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fscanf.c
deleted file mode 100644
index 1d736668a4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_fscanf (FILE *stream, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfscanf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fwscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fwscanf.c
deleted file mode 100644
index dbea1512cf..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_fwscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_fwscanf (FILE *stream, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfwscanf (stream, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_scanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_scanf.c
deleted file mode 100644
index ec2ec53291..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_scanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_scanf (const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfscanf (stdin, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_sscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_sscanf.c
deleted file mode 100644
index 52e1bd5d2a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_sscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_sscanf (const char *s, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vsscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_swscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_swscanf.c
deleted file mode 100644
index 927d024923..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_swscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_swscanf (const wchar_t *s, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vswscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfscanf.c
deleted file mode 100644
index 55556c375c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_vfscanf (FILE *s, const char *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vfscanf (s, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfwscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfwscanf.c
deleted file mode 100644
index 4fd54cb176..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vfwscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_vfwscanf (FILE *s, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vfwscanf (s, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vscanf.c
deleted file mode 100644
index 6284c9339b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_vscanf (const char *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vfscanf (stdin, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vsscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vsscanf.c
deleted file mode 100644
index 0c19032b15..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vsscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_vsscanf (const char *string, const char *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vsscanf (string, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vswscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vswscanf.c
deleted file mode 100644
index 5f34221b62..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vswscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_vswscanf (const wchar_t *string, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vswscanf (string, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vwscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vwscanf.c
deleted file mode 100644
index a8a76ff54b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_vwscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_vwscanf (const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___isoc99_vfwscanf (stdin, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_wscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_wscanf.c
deleted file mode 100644
index fc2f6f8598..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isoc99_wscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__isoc99_wscanf (const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___isoc99_vfwscanf (stdin, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-j0.c b/sysdeps/ieee754/ldbl-opt/nldbl-j0.c
deleted file mode 100644
index 9d59f0a015..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-j0.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-j0l (double x)
-{
-  return j0 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-j1.c b/sysdeps/ieee754/ldbl-opt/nldbl-j1.c
deleted file mode 100644
index dba7366861..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-j1.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-j1l (double x)
-{
-  return j1 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-jn.c b/sysdeps/ieee754/ldbl-opt/nldbl-jn.c
deleted file mode 100644
index 3f19bbb1a8..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-jn.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-jnl (int n, double x)
-{
-  return jn (n, x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ldexp.c b/sysdeps/ieee754/ldbl-opt/nldbl-ldexp.c
deleted file mode 100644
index 360f8f0f6b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ldexp.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-ldexpl (double x, int exponent)
-{
-  return ldexp (x, exponent);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-lgamma.c b/sysdeps/ieee754/ldbl-opt/nldbl-lgamma.c
deleted file mode 100644
index 0055212628..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-lgamma.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-lgammal (double x)
-{
-  return lgamma (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-lgamma_r.c b/sysdeps/ieee754/ldbl-opt/nldbl-lgamma_r.c
deleted file mode 100644
index e1ab9a1d0a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-lgamma_r.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-lgammal_r (double x, int *signgamp)
-{
-  return lgamma_r (x, signgamp);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-llogb.c b/sysdeps/ieee754/ldbl-opt/nldbl-llogb.c
deleted file mode 100644
index 76042b2f48..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-llogb.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for llogb.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-long int
-attribute_hidden
-llogbl (double x)
-{
-  return llogb (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-llrint.c b/sysdeps/ieee754/ldbl-opt/nldbl-llrint.c
deleted file mode 100644
index 6dfce89d0d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-llrint.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-long long int
-attribute_hidden
-llrintl (double x)
-{
-  return llrint (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-llround.c b/sysdeps/ieee754/ldbl-opt/nldbl-llround.c
deleted file mode 100644
index 0157a079f4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-llround.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-long long int
-attribute_hidden
-llroundl (double x)
-{
-  return llround (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-log.c b/sysdeps/ieee754/ldbl-opt/nldbl-log.c
deleted file mode 100644
index a5a1ae7cd7..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-log.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-logl (double x)
-{
-  return log (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-log10.c b/sysdeps/ieee754/ldbl-opt/nldbl-log10.c
deleted file mode 100644
index 1477866dc6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-log10.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-log10l (double x)
-{
-  return log10 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-log1p.c b/sysdeps/ieee754/ldbl-opt/nldbl-log1p.c
deleted file mode 100644
index 455b25a9f4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-log1p.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-log1pl (double x)
-{
-  return log1p (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-log2.c b/sysdeps/ieee754/ldbl-opt/nldbl-log2.c
deleted file mode 100644
index 8c1ae344e5..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-log2.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-log2l (double x)
-{
-  return log2 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-logb.c b/sysdeps/ieee754/ldbl-opt/nldbl-logb.c
deleted file mode 100644
index d9ce8de075..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-logb.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-logbl (double x)
-{
-  return logb (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-lrint.c b/sysdeps/ieee754/ldbl-opt/nldbl-lrint.c
deleted file mode 100644
index 0acd3d4ae6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-lrint.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-long int
-attribute_hidden
-lrintl (double x)
-{
-  return lrint (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-lround.c b/sysdeps/ieee754/ldbl-opt/nldbl-lround.c
deleted file mode 100644
index aadb111f88..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-lround.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-long int
-attribute_hidden
-lroundl (double x)
-{
-  return lround (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-modf.c b/sysdeps/ieee754/ldbl-opt/nldbl-modf.c
deleted file mode 100644
index bcbe6bb435..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-modf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-modfl (double x, double *iptr)
-{
-  return modf (x, iptr);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-nan.c b/sysdeps/ieee754/ldbl-opt/nldbl-nan.c
deleted file mode 100644
index 8db157a0ea..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-nan.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-nanl (const char *tag)
-{
-  return nan (tag);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-nearbyint.c b/sysdeps/ieee754/ldbl-opt/nldbl-nearbyint.c
deleted file mode 100644
index fd4a24684d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-nearbyint.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-nearbyintl (double x)
-{
-  return nearbyint (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-nextafter.c b/sysdeps/ieee754/ldbl-opt/nldbl-nextafter.c
deleted file mode 100644
index b0bae43f49..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-nextafter.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-nextafterl (double x, double y)
-{
-  return nextafter (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-nextdown.c b/sysdeps/ieee754/ldbl-opt/nldbl-nextdown.c
deleted file mode 100644
index b20c788401..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-nextdown.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Compatibility routine for IEEE double as long double for nextdown.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-/* Return the greatest floating-point number less than X.  */
-double
-attribute_hidden
-nextdownl (double x)
-{
-  return nextdown (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-nexttoward.c b/sysdeps/ieee754/ldbl-opt/nldbl-nexttoward.c
deleted file mode 100644
index acbd01a0cf..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-nexttoward.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#define nexttoward nexttoward_XXX
-#define nexttowardl nexttowardl_XXX
-#include "nldbl-compat.h"
-#undef nexttoward
-#undef nexttowardl
-
-double
-attribute_hidden
-nexttoward (double x, double y)
-{
-  return nextafter (x, y);
-}
-extern __typeof (nexttoward) nexttowardl attribute_hidden;
-strong_alias (nexttoward, nexttowardl)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-nexttowardf.c b/sysdeps/ieee754/ldbl-opt/nldbl-nexttowardf.c
deleted file mode 100644
index 350b08d39e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-nexttowardf.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#define nexttowardf nexttowardf_XXX
-#include "nldbl-compat.h"
-#undef nexttowardf
-
-extern float __nldbl_nexttowardf (float x, double y);
-
-float
-attribute_hidden
-nexttowardf (float x, double y)
-{
-  return __nldbl_nexttowardf (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-nextup.c b/sysdeps/ieee754/ldbl-opt/nldbl-nextup.c
deleted file mode 100644
index 71dc8d4816..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-nextup.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Compatibility routine for IEEE double as long double for nextup.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-/* Return the least floating-point number greater than X.  */
-double
-attribute_hidden
-nextupl (double x)
-{
-  return nextup (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_printf.c b/sysdeps/ieee754/ldbl-opt/nldbl-obstack_printf.c
deleted file mode 100644
index 4abff2dc0d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_printf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-obstack_printf (struct obstack *obstack, const char *fmt, ...)
-{
-  int result;
-  va_list ap;
-  va_start (ap, fmt);
-  result = __nldbl_obstack_vprintf (obstack, fmt, ap);
-  va_end (ap);
-  return result;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_printf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-obstack_printf_chk.c
deleted file mode 100644
index 8e7d8eb4ad..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_printf_chk.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__obstack_printf_chk (struct obstack *obstack, int flag, const char *fmt, ...)
-{
-  int result;
-  va_list ap;
-  va_start (ap, fmt);
-  result = __nldbl___obstack_vprintf_chk (obstack, flag, fmt, ap);
-  va_end (ap);
-  return result;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_vprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-obstack_vprintf.c
deleted file mode 100644
index 228a50726b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_vprintf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-obstack_vprintf (struct obstack *obstack, const char *fmt, va_list ap)
-{
-  return __nldbl_obstack_vprintf (obstack, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_vprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-obstack_vprintf_chk.c
deleted file mode 100644
index a06f6bf9b4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-obstack_vprintf_chk.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__obstack_vprintf_chk (struct obstack *obstack, int flag, const char *fmt,
-		       va_list ap)
-{
-  return __nldbl___obstack_vprintf_chk (obstack, flag, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-pow.c b/sysdeps/ieee754/ldbl-opt/nldbl-pow.c
deleted file mode 100644
index a5cc446555..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-pow.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-powl (double x, double y)
-{
-  return pow (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-pow10.c b/sysdeps/ieee754/ldbl-opt/nldbl-pow10.c
deleted file mode 100644
index 20ebf8d1bb..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-pow10.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-pow10l (double x)
-{
-  return pow10 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-printf.c b/sysdeps/ieee754/ldbl-opt/nldbl-printf.c
deleted file mode 100644
index e4b0fbae0c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-printf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-printf (const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfprintf (stdout, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-extern __typeof (printf) _IO_printf attribute_hidden;
-strong_alias (printf, _IO_printf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-printf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-printf_chk.c
deleted file mode 100644
index 926db412f9..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-printf_chk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__printf_chk (int flag, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfprintf_chk (stdout, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-printf_fp.c b/sysdeps/ieee754/ldbl-opt/nldbl-printf_fp.c
deleted file mode 100644
index 057dfe0b8a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-printf_fp.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__printf_fp (FILE *fp, const struct printf_info *info,
-	     const void *const *args)
-{
-  return __nldbl___printf_fp (fp, info, args);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-printf_size.c b/sysdeps/ieee754/ldbl-opt/nldbl-printf_size.c
deleted file mode 100644
index d8b1fc9995..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-printf_size.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-printf_size (FILE *__restrict fp, const struct printf_info *info,
-	     const void *const *__restrict args)
-{
-  return __nldbl_printf_size (fp, info, args);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-qecvt.c b/sysdeps/ieee754/ldbl-opt/nldbl-qecvt.c
deleted file mode 100644
index 9f0b0a66a9..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-qecvt.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define qecvt qecvt_XXX
-#include "nldbl-compat.h"
-#undef qecvt
-
-attribute_hidden
-char *
-qecvt (double val, int ndigit, int *__restrict decpt, int *__restrict sign)
-{
-  return ecvt (val, ndigit, decpt, sign);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-qecvt_r.c b/sysdeps/ieee754/ldbl-opt/nldbl-qecvt_r.c
deleted file mode 100644
index 06f99146cc..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-qecvt_r.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#define qecvt_r qecvt_r_XXX
-#include "nldbl-compat.h"
-#undef qecvt_r
-
-int
-attribute_hidden
-qecvt_r (double val, int ndigit, int *__restrict decpt, int *__restrict sign,
-	 char *__restrict buf, size_t len)
-{
-  return ecvt_r (val, ndigit, decpt, sign, buf, len);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-qfcvt.c b/sysdeps/ieee754/ldbl-opt/nldbl-qfcvt.c
deleted file mode 100644
index 37fa7f0467..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-qfcvt.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define qfcvt qfcvt_XXX
-#include "nldbl-compat.h"
-#undef qfcvt
-
-attribute_hidden
-char *
-qfcvt (double val, int ndigit, int *__restrict decpt, int *__restrict sign)
-{
-  return fcvt (val, ndigit, decpt, sign);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-qfcvt_r.c b/sysdeps/ieee754/ldbl-opt/nldbl-qfcvt_r.c
deleted file mode 100644
index 03224fefa9..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-qfcvt_r.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#define qfcvt_r qfcvt_r_XXX
-#include "nldbl-compat.h"
-#undef qfcvt_r
-
-int
-attribute_hidden
-qfcvt_r (double val, int ndigit, int *__restrict decpt, int *__restrict sign,
-	 char *__restrict buf, size_t len)
-{
-  return fcvt_r (val, ndigit, decpt, sign, buf, len);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-qgcvt.c b/sysdeps/ieee754/ldbl-opt/nldbl-qgcvt.c
deleted file mode 100644
index b935d0962e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-qgcvt.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define qgcvt qgcvt_XXX
-#include "nldbl-compat.h"
-#undef qgcvt
-
-attribute_hidden
-char *
-qgcvt (double val, int ndigit, char *buf)
-{
-  return gcvt (val, ndigit, buf);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-remainder.c b/sysdeps/ieee754/ldbl-opt/nldbl-remainder.c
deleted file mode 100644
index 581dc78a4d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-remainder.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-remainderl (double x, double y)
-{
-  return remainder (x, y);
-}
-extern __typeof (remainderl) dreml attribute_hidden;
-weak_alias (remainderl, dreml)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-remquo.c b/sysdeps/ieee754/ldbl-opt/nldbl-remquo.c
deleted file mode 100644
index 592dadae8d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-remquo.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-remquol (double x, double y, int *quo)
-{
-  return remquo (x, y, quo);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-rint.c b/sysdeps/ieee754/ldbl-opt/nldbl-rint.c
deleted file mode 100644
index 00f942f1a7..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-rint.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-rintl (double x)
-{
-  return rint (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-round.c b/sysdeps/ieee754/ldbl-opt/nldbl-round.c
deleted file mode 100644
index be9bd5112e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-round.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-roundl (double x)
-{
-  return round (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-roundeven.c b/sysdeps/ieee754/ldbl-opt/nldbl-roundeven.c
deleted file mode 100644
index 1a46fa50d2..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-roundeven.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for roundeven.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-roundevenl (double x)
-{
-  return roundeven (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-scalb.c b/sysdeps/ieee754/ldbl-opt/nldbl-scalb.c
deleted file mode 100644
index 00d3e2e714..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-scalb.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-scalbl (double x, double n)
-{
-  return scalb (x, n);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-scalbln.c b/sysdeps/ieee754/ldbl-opt/nldbl-scalbln.c
deleted file mode 100644
index b5bd501250..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-scalbln.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-scalblnl (double x, long int n)
-{
-  return scalbln (x, n);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-scalbn.c b/sysdeps/ieee754/ldbl-opt/nldbl-scalbn.c
deleted file mode 100644
index b1914ebf49..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-scalbn.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-scalbnl (double x, int n)
-{
-  return scalbn (x, n);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-scanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-scanf.c
deleted file mode 100644
index bbab371cbe..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-scanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-scanf (const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl__IO_vfscanf (stdin, fmt, arg, NULL);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-setpayload.c b/sysdeps/ieee754/ldbl-opt/nldbl-setpayload.c
deleted file mode 100644
index df902cad99..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-setpayload.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for setpayload.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-setpayloadl (double *x, double payload)
-{
-  return setpayload (x, payload);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-setpayloadsig.c b/sysdeps/ieee754/ldbl-opt/nldbl-setpayloadsig.c
deleted file mode 100644
index 1ca497502c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-setpayloadsig.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for setpayloadsig.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-setpayloadsigl (double *x, double payload)
-{
-  return setpayloadsig (x, payload);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-signbit.c b/sysdeps/ieee754/ldbl-opt/nldbl-signbit.c
deleted file mode 100644
index 2e98c07396..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-signbit.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define __signbitl __signbitl_XXX
-#include "nldbl-compat.h"
-#undef __signbitl
-
-int
-attribute_hidden
-__signbitl (double x)
-{
-  return signbit (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-significand.c b/sysdeps/ieee754/ldbl-opt/nldbl-significand.c
deleted file mode 100644
index 624381dde7..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-significand.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-significandl (double x)
-{
-  return significand (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-sin.c b/sysdeps/ieee754/ldbl-opt/nldbl-sin.c
deleted file mode 100644
index 0e76e05e6b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-sin.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-sinl (double x)
-{
-  return sin (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-sincos.c b/sysdeps/ieee754/ldbl-opt/nldbl-sincos.c
deleted file mode 100644
index 9f2ab2b9fc..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-sincos.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-void
-attribute_hidden
-sincosl (double x, double *sinx, double *cosx)
-{
-  sincos (x, sinx, cosx);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-sinh.c b/sysdeps/ieee754/ldbl-opt/nldbl-sinh.c
deleted file mode 100644
index 99ea62e8dc..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-sinh.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-sinhl (double x)
-{
-  return sinh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-snprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-snprintf.c
deleted file mode 100644
index ef6fb96a2c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-snprintf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-weak_function
-snprintf (char *s, size_t maxlen, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vsnprintf (s, maxlen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-snprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-snprintf_chk.c
deleted file mode 100644
index 944d3de9db..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-snprintf_chk.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
-		const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vsnprintf_chk (s, maxlen, flag, slen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-sprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-sprintf.c
deleted file mode 100644
index 5d37a7e7f0..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-sprintf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-sprintf (char *s, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vsprintf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-extern __typeof (sprintf) _IO_sprintf attribute_hidden;
-strong_alias (sprintf, _IO_sprintf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-sprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-sprintf_chk.c
deleted file mode 100644
index 349b7c5c22..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-sprintf_chk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__sprintf_chk (char *s, int flag, size_t slen, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vsprintf_chk (s, flag, slen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-sqrt.c b/sysdeps/ieee754/ldbl-opt/nldbl-sqrt.c
deleted file mode 100644
index 4ae65665de..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-sqrt.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-sqrtl (double x)
-{
-  return sqrt (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-sscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-sscanf.c
deleted file mode 100644
index a771d49996..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-sscanf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-sscanf (const char *s, const char *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vsscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
-extern __typeof (sscanf) _IO_sscanf attribute_hidden;
-strong_alias (sscanf, _IO_sscanf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strfmon.c b/sysdeps/ieee754/ldbl-opt/nldbl-strfmon.c
deleted file mode 100644
index 38f4071278..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-strfmon.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "nldbl-compat.h"
-
-ssize_t
-attribute_hidden
-strfmon (char *s, size_t maxsize, const char *format, ...)
-{
-  va_list ap;
-  ssize_t res;
-
-  va_start (ap, format);
-  res = __nldbl___vstrfmon (s, maxsize, format, ap);
-  va_end (ap);
-  return res;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c b/sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c
deleted file mode 100644
index 0db0e8c42f..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "nldbl-compat.h"
-
-ssize_t
-attribute_hidden
-__strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...)
-{
-  va_list ap;
-  ssize_t res;
-
-  va_start (ap, format);
-  res = __nldbl___vstrfmon_l (s, maxsize, loc, format, ap);
-  va_end (ap);
-  return res;
-}
-extern __typeof (__strfmon_l) strfmon_l attribute_hidden;
-weak_alias (__strfmon_l, strfmon_l)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strfroml.c b/sysdeps/ieee754/ldbl-opt/nldbl-strfroml.c
deleted file mode 100644
index d6df69e418..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-strfroml.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-strfroml (char *dest, size_t size, const char *format, long double f)
-{
-  return strfromd (dest, size, format, f);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strtold.c b/sysdeps/ieee754/ldbl-opt/nldbl-strtold.c
deleted file mode 100644
index 99b907947b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-strtold.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define strtold strtold_XXX
-#include "nldbl-compat.h"
-#undef strtold
-
-double
-attribute_hidden
-strtold (const char *nptr, char **endptr)
-{
-  return strtod (nptr, endptr);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c b/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c
deleted file mode 100644
index 33ff1ca5b5..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#define strtold_l strtold_l_XXX
-#define __strtold_l __strtold_l_XXX
-#define __strtod_l __strtod_l_XXX
-#include "nldbl-compat.h"
-#undef strtold_l
-#undef __strtold_l
-#undef __strtod_l
-
-extern double
-__strtod_l (const char *__restrict __nptr, char **__restrict __endptr,
-	    __locale_t __loc);
-
-double
-attribute_hidden
-__strtold_l (const char *nptr, char **endptr, __locale_t loc)
-{
-  return __strtod_l (nptr, endptr, loc);
-}
-extern __typeof (__strtold_l) strtold_l attribute_hidden;
-weak_alias (__strtold_l, strtold_l)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strtoldint.c b/sysdeps/ieee754/ldbl-opt/nldbl-strtoldint.c
deleted file mode 100644
index 0bafabc6e4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-strtoldint.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define __strtold_internal __strtold_internal_XXX
-#include "nldbl-compat.h"
-#undef __strtold_internal
-
-double
-attribute_hidden
-__strtold_internal (const char *nptr, char **endptr, int group)
-{
-  return __strtod_internal (nptr, endptr, group);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-swprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-swprintf.c
deleted file mode 100644
index 7f4f7b04d3..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-swprintf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-swprintf (wchar_t *s, size_t n, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vswprintf (s, n, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-swprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-swprintf_chk.c
deleted file mode 100644
index 0373f6ebc2..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-swprintf_chk.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__swprintf_chk (wchar_t *s, size_t n, int flag, size_t slen,
-		const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vswprintf_chk (s, n, flag, slen, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-swscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-swscanf.c
deleted file mode 100644
index dd058f47ab..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-swscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-swscanf (const wchar_t *s, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vswscanf (s, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-syslog.c b/sysdeps/ieee754/ldbl-opt/nldbl-syslog.c
deleted file mode 100644
index 8687e9f540..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-syslog.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "nldbl-compat.h"
-
-void
-attribute_hidden
-syslog (int pri, const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  __nldbl_vsyslog (pri, fmt, ap);
-  va_end (ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-syslog_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-syslog_chk.c
deleted file mode 100644
index 31ea6a8b9d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-syslog_chk.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "nldbl-compat.h"
-
-void
-attribute_hidden
-__syslog_chk (int pri, int flag, const char *fmt, ...)
-{
-  va_list ap;
-
-  va_start (ap, fmt);
-  __nldbl___vsyslog_chk (pri, flag, fmt, ap);
-  va_end(ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-tan.c b/sysdeps/ieee754/ldbl-opt/nldbl-tan.c
deleted file mode 100644
index 1a27b6fbdd..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-tan.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-tanl (double x)
-{
-  return tan (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-tanh.c b/sysdeps/ieee754/ldbl-opt/nldbl-tanh.c
deleted file mode 100644
index fc2fd32eb8..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-tanh.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-tanhl (double x)
-{
-  return tanh (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-tgamma.c b/sysdeps/ieee754/ldbl-opt/nldbl-tgamma.c
deleted file mode 100644
index bbf613abe1..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-tgamma.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-tgammal (double x)
-{
-  return tgamma (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-totalorder.c b/sysdeps/ieee754/ldbl-opt/nldbl-totalorder.c
deleted file mode 100644
index c528d53555..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-totalorder.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for totalorder.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-totalorderl (double x, double y)
-{
-  return totalorder (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-totalordermag.c b/sysdeps/ieee754/ldbl-opt/nldbl-totalordermag.c
deleted file mode 100644
index 4bc78588ea..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-totalordermag.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for totalordermag.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-totalordermagl (double x, double y)
-{
-  return totalordermag (x, y);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-trunc.c b/sysdeps/ieee754/ldbl-opt/nldbl-trunc.c
deleted file mode 100644
index d0131e80a3..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-trunc.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-truncl (double x)
-{
-  return trunc (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ufromfp.c b/sysdeps/ieee754/ldbl-opt/nldbl-ufromfp.c
deleted file mode 100644
index 127225734c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ufromfp.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for ufromfp.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-uintmax_t
-attribute_hidden
-ufromfpl (double x, int round, unsigned int width)
-{
-  return ufromfp (x, round, width);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-ufromfpx.c b/sysdeps/ieee754/ldbl-opt/nldbl-ufromfpx.c
deleted file mode 100644
index 3294f00609..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-ufromfpx.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Compatibility routine for IEEE double as long double for ufromfpx.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "nldbl-compat.h"
-
-uintmax_t
-attribute_hidden
-ufromfpxl (double x, int round, unsigned int width)
-{
-  return ufromfpx (x, round, width);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vasprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vasprintf.c
deleted file mode 100644
index 52fa18ccee..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vasprintf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-weak_function
-vasprintf (char **result_ptr, const char *fmt, va_list ap)
-{
-  return __nldbl_vasprintf (result_ptr, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vasprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vasprintf_chk.c
deleted file mode 100644
index 4f5391a9d7..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vasprintf_chk.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vasprintf_chk (char **result_ptr, int flag, const char *fmt, va_list ap)
-{
-  return __nldbl___vasprintf_chk (result_ptr, flag, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vdprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vdprintf.c
deleted file mode 100644
index 1acbd40625..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vdprintf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-vdprintf (int d, const char *fmt, va_list arg)
-{
-  return __nldbl_vdprintf (d, fmt, arg);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vdprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vdprintf_chk.c
deleted file mode 100644
index ca1ce01878..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vdprintf_chk.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vdprintf_chk (int d, int flag, const char *fmt, va_list arg)
-{
-  return __nldbl___vdprintf_chk (d, flag, fmt, arg);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vfprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vfprintf.c
deleted file mode 100644
index 6ca8437b28..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vfprintf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-vfprintf (FILE *s, const char *fmt, va_list ap)
-{
-  return __nldbl_vfprintf (s, fmt, ap);
-}
-extern __typeof (vfprintf) _IO_vfprintf attribute_hidden;
-strong_alias (vfprintf, _IO_vfprintf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vfprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vfprintf_chk.c
deleted file mode 100644
index 0f6820af63..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vfprintf_chk.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vfprintf_chk (FILE *s, int flag, const char *fmt, va_list ap)
-{
-  return __nldbl___vfprintf_chk (s, flag, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vfscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vfscanf.c
deleted file mode 100644
index f23465ee95..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vfscanf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vfscanf (FILE *s, const char *fmt, va_list ap)
-{
-  return __nldbl__IO_vfscanf (s, fmt, ap, NULL);
-}
-extern __typeof (__vfscanf) vfscanf attribute_hidden;
-weak_alias (__vfscanf, vfscanf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vfwprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vfwprintf.c
deleted file mode 100644
index c3fe76a971..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vfwprintf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-weak_function
-vfwprintf (FILE *s, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vfwprintf (s, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vfwprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vfwprintf_chk.c
deleted file mode 100644
index b3b69f0571..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vfwprintf_chk.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vfwprintf_chk (FILE *s, int flag, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___vfwprintf_chk (s, flag, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vfwscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vfwscanf.c
deleted file mode 100644
index be9febc9a0..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vfwscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-vfwscanf (FILE *s, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vfwscanf (s, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vprintf.c
deleted file mode 100644
index ed0d27d9a0..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vprintf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-vprintf (const char *fmt, va_list ap)
-{
-  return __nldbl_vfprintf (stdout, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vprintf_chk.c
deleted file mode 100644
index 63b3e8f965..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vprintf_chk.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vprintf_chk (int flag, const char *fmt, va_list ap)
-{
-  return __nldbl___vfprintf_chk (stdout, flag, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vscanf.c
deleted file mode 100644
index e75907b905..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vscanf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-weak_function
-vscanf (const char *fmt, va_list ap)
-{
-  return __nldbl__IO_vfscanf (stdin, fmt, ap, NULL);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vsnprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vsnprintf.c
deleted file mode 100644
index 5a9bcbcaee..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vsnprintf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-vsnprintf (char *string, size_t maxlen, const char *fmt, va_list ap)
-{
-  return __nldbl_vsnprintf (string, maxlen, fmt, ap);
-}
-extern __typeof (vsnprintf) __vsnprintf attribute_hidden;
-weak_alias (vsnprintf, __vsnprintf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vsnprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vsnprintf_chk.c
deleted file mode 100644
index 19380291a3..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vsnprintf_chk.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vsnprintf_chk (char *string, size_t maxlen, int flag, size_t slen,
-		 const char *fmt, va_list ap)
-{
-  return __nldbl___vsnprintf_chk (string, maxlen, flag, slen, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vsprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vsprintf.c
deleted file mode 100644
index 04406d0f6e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vsprintf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-_IO_vsprintf (char *string, const char *fmt, va_list ap)
-{
-  return __nldbl_vsprintf (string, fmt, ap);
-}
-extern __typeof (_IO_vsprintf) vsprintf attribute_hidden;
-weak_alias (_IO_vsprintf, vsprintf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vsprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vsprintf_chk.c
deleted file mode 100644
index 9df143fcef..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vsprintf_chk.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vsprintf_chk (char *string, int flag, size_t slen, const char *fmt,
-		va_list ap)
-{
-  return __nldbl___vsprintf_chk (string, flag, slen, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vsscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vsscanf.c
deleted file mode 100644
index f5594c122c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vsscanf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vsscanf (const char *string, const char *fmt, va_list ap)
-{
-  return __nldbl_vsscanf (string, fmt, ap);
-}
-extern __typeof (__vsscanf) vsscanf attribute_hidden;
-weak_alias (__vsscanf, vsscanf)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vswprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vswprintf.c
deleted file mode 100644
index ff3415a072..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vswprintf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-weak_function
-vswprintf (wchar_t *string, size_t maxlen, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vswprintf (string, maxlen, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vswprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vswprintf_chk.c
deleted file mode 100644
index 0cd1f96bfe..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vswprintf_chk.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vswprintf_chk (wchar_t *string, size_t maxlen, int flag, size_t slen,
-		 const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___vswprintf_chk (string, maxlen, flag, slen, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vswscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vswscanf.c
deleted file mode 100644
index bd4bb5131b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vswscanf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-vswscanf (const wchar_t *string, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vswscanf (string, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vsyslog.c b/sysdeps/ieee754/ldbl-opt/nldbl-vsyslog.c
deleted file mode 100644
index eed1010eea..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vsyslog.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-attribute_hidden
-void
-vsyslog (int pri, const char *fmt, va_list ap)
-{
-  __nldbl_vsyslog (pri, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vsyslog_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vsyslog_chk.c
deleted file mode 100644
index 2221474f97..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vsyslog_chk.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-void
-attribute_hidden
-__vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
-{
-  __nldbl___vsyslog_chk (pri, flag, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vwprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vwprintf.c
deleted file mode 100644
index f46bdb3137..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vwprintf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-vwprintf (const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vfwprintf (stdout, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vwprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-vwprintf_chk.c
deleted file mode 100644
index f7e7185977..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vwprintf_chk.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__vwprintf_chk (int flag, const wchar_t *fmt, va_list ap)
-{
-  return __nldbl___vfwprintf_chk (stdout, flag, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-vwscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-vwscanf.c
deleted file mode 100644
index d39578ca4e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-vwscanf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-weak_function
-vwscanf (const wchar_t *fmt, va_list ap)
-{
-  return __nldbl_vfwscanf (stdin, fmt, ap);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-wcstold.c b/sysdeps/ieee754/ldbl-opt/nldbl-wcstold.c
deleted file mode 100644
index dbaffaa486..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-wcstold.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define wcstold wcstold_XXX
-#include "nldbl-compat.h"
-#undef wcstold
-
-double
-attribute_hidden
-wcstold (const wchar_t *nptr, wchar_t **endptr)
-{
-  return wcstod (nptr, endptr);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c b/sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c
deleted file mode 100644
index e32d13a94b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#define wcstold_l wcstold_l_XXX
-#define __wcstold_l __wcstold_l_XXX
-#include "nldbl-compat.h"
-#undef wcstold_l
-#undef __wcstold_l
-
-double
-attribute_hidden
-__wcstold_l (const wchar_t *nptr, wchar_t **endptr, __locale_t loc)
-{
-  return __wcstod_l (nptr, endptr, loc);
-}
-extern __typeof (__wcstold_l) wcstold_l attribute_hidden;
-weak_alias (__wcstold_l, wcstold_l)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-wcstoldint.c b/sysdeps/ieee754/ldbl-opt/nldbl-wcstoldint.c
deleted file mode 100644
index b638a399ad..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-wcstoldint.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define __wcstold_internal __wcstold_internal_XXX
-#include "nldbl-compat.h"
-#undef __wcstold_internal
-
-double
-attribute_hidden
-__wcstold_internal (const wchar_t *nptr, wchar_t **endptr, int group)
-{
-  return __wcstod_internal (nptr, endptr, group);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-wprintf.c b/sysdeps/ieee754/ldbl-opt/nldbl-wprintf.c
deleted file mode 100644
index 2aa1a7475a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-wprintf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-wprintf (const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwprintf (stdout, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-wprintf_chk.c b/sysdeps/ieee754/ldbl-opt/nldbl-wprintf_chk.c
deleted file mode 100644
index 39191e123b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-wprintf_chk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-__wprintf_chk (int flag, const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl___vfwprintf_chk (stdout, flag, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-wscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-wscanf.c
deleted file mode 100644
index 4ee3fdc15f..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-wscanf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "nldbl-compat.h"
-
-int
-attribute_hidden
-wscanf (const wchar_t *fmt, ...)
-{
-  va_list arg;
-  int done;
-
-  va_start (arg, fmt);
-  done = __nldbl_vfwscanf (stdin, fmt, arg);
-  va_end (arg);
-
-  return done;
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-y0.c b/sysdeps/ieee754/ldbl-opt/nldbl-y0.c
deleted file mode 100644
index e35621f60f..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-y0.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-y0l (double x)
-{
-  return y0 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-y1.c b/sysdeps/ieee754/ldbl-opt/nldbl-y1.c
deleted file mode 100644
index c47abcd3c5..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-y1.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-y1l (double x)
-{
-  return y1 (x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-yn.c b/sysdeps/ieee754/ldbl-opt/nldbl-yn.c
deleted file mode 100644
index 7623d4513b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/nldbl-yn.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "nldbl-compat.h"
-
-double
-attribute_hidden
-ynl (int n, double x)
-{
-  return yn (n, x);
-}
diff --git a/sysdeps/ieee754/ldbl-opt/s_asinh.c b/sysdeps/ieee754/ldbl-opt/s_asinh.c
deleted file mode 100644
index e9bcfaea62..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_asinh.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_asinh.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __asinh, asinhl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_atan.c b/sysdeps/ieee754/ldbl-opt/s_atan.c
deleted file mode 100644
index 5fbd5e62d6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_atan.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_atan.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, atan, atanl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_cbrt.c b/sysdeps/ieee754/ldbl-opt/s_cbrt.c
deleted file mode 100644
index cdc635771e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_cbrt.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_cbrt.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __cbrt, cbrtl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_ceil.c b/sysdeps/ieee754/ldbl-opt/s_ceil.c
deleted file mode 100644
index 6e4b70795d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_ceil.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_ceil.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __ceil, ceill, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_clog10l.c b/sysdeps/ieee754/ldbl-opt/s_clog10l.c
deleted file mode 100644
index 15dc3ed891..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_clog10l.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* clog10l alias overrides for platforms where long double
-   was previously not unique.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#define M_DECL_FUNC(x) __clog10l_internal
-#include <math-type-macros-ldouble.h>
-
-#undef declare_mgen_alias
-#define declare_mgen_alias(from, to)
-
-#include <s_clog10_template.c>
-
-/* __clog10l is also a public symbol.  */
-strong_alias (__clog10l_internal, __clog10l__internal)
-long_double_symbol (libm, __clog10l_internal, __clog10l);
-long_double_symbol (libm, __clog10l__internal, clog10l);
diff --git a/sysdeps/ieee754/ldbl-opt/s_copysign.c b/sysdeps/ieee754/ldbl-opt/s_copysign.c
deleted file mode 100644
index f4303f5768..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_copysign.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_copysign.c>
-#if IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
-# endif
-#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __copysign, copysignl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_erf.c b/sysdeps/ieee754/ldbl-opt/s_erf.c
deleted file mode 100644
index 76f1baa5ca..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_erf.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_erf.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __erf, erfl, GLIBC_2_0);
-compat_symbol (libm, __erfc, erfcl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_expm1.c b/sysdeps/ieee754/ldbl-opt/s_expm1.c
deleted file mode 100644
index ef9b5956db..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_expm1.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_expm1.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __expm1, expm1l, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_fabs.c b/sysdeps/ieee754/ldbl-opt/s_fabs.c
deleted file mode 100644
index e7c92187e9..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_fabs.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_fabs.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __fabs, fabsl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_finite.c b/sysdeps/ieee754/ldbl-opt/s_finite.c
deleted file mode 100644
index 7d3ab0068d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_finite.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_finite.c>
-weak_alias (__finite, ___finite)
-#if IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __finite, __finitel, GLIBC_2_1);
-# endif
-# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, ___finite, finitel, GLIBC_2_0);
-# endif
-#else
-# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libm, __finite, __finitel, GLIBC_2_0);
-# endif
-# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, ___finite, finitel, GLIBC_2_0);
-# endif
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_floor.c b/sysdeps/ieee754/ldbl-opt/s_floor.c
deleted file mode 100644
index 7797944e9e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_floor.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_floor.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __floor, floorl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_fma.c b/sysdeps/ieee754/ldbl-opt/s_fma.c
deleted file mode 100644
index 1723c5c306..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_fma.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_fma.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __fma, fmal, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_fmal.c b/sysdeps/ieee754/ldbl-opt/s_fmal.c
deleted file mode 100644
index bd12dabcbe..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_fmal.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/s_fmal.c>
-long_double_symbol (libm, __fmal, fmal);
diff --git a/sysdeps/ieee754/ldbl-opt/s_frexp.c b/sysdeps/ieee754/ldbl-opt/s_frexp.c
deleted file mode 100644
index 0e3a5e0830..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_frexp.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_frexp.c>
-#if IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __frexp, frexpl, GLIBC_2_0);
-# endif
-#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __frexp, frexpl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_isinf.c b/sysdeps/ieee754/ldbl-opt/s_isinf.c
deleted file mode 100644
index 1f760a0320..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_isinf.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_isinf.c>
-#if !IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
-compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
-# endif
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_isnan.c b/sysdeps/ieee754/ldbl-opt/s_isnan.c
deleted file mode 100644
index 33f57f1955..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_isnan.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_isnan.c>
-#if !IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
-compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
-# endif
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexp.c b/sysdeps/ieee754/ldbl-opt/s_ldexp.c
deleted file mode 100644
index 809080a149..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_ldexp.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ldexp alias overrides for platforms where long double
-   was previously not unique.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#define M_LIBM_NEED_COMPAT(f) 0
-#include <math-type-macros-double.h>
-#include <s_ldexp_template.c>
-
-#if IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __ldexp, ldexpl, GLIBC_2_0);
-# endif
-#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __ldexp, ldexpl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
deleted file mode 100644
index 85f34fa2c4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ldexpl alias overrides for platforms where long double
-   was previously not unique.
-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#define declare_mgen_alias(f,t)
-#include <math-type-macros-ldouble.h>
-#include <s_ldexp_template.c>
-
-strong_alias (__ldexpl, __ldexpl_2)
-#if IS_IN (libm)
-long_double_symbol (libm, __ldexpl, ldexpl);
-long_double_symbol (libm, __ldexpl_2, scalbnl);
-#else
-long_double_symbol (libc, __ldexpl, ldexpl);
-long_double_symbol (libc, __ldexpl_2, scalbnl);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_llrint.c b/sysdeps/ieee754/ldbl-opt/s_llrint.c
deleted file mode 100644
index e6311972e1..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_llrint.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_llrint.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __llrint, llrintl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_llround.c b/sysdeps/ieee754/ldbl-opt/s_llround.c
deleted file mode 100644
index 36c7e6edac..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_llround.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_llround.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __llround, llroundl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_log1p.c b/sysdeps/ieee754/ldbl-opt/s_log1p.c
deleted file mode 100644
index 495fa32e35..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_log1p.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_log1p.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __log1p, log1pl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_logb.c b/sysdeps/ieee754/ldbl-opt/s_logb.c
deleted file mode 100644
index 4d7a6db275..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_logb.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_logb.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __logb, logbl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_lrint.c b/sysdeps/ieee754/ldbl-opt/s_lrint.c
deleted file mode 100644
index b7af812846..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_lrint.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_lrint.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __lrint, lrintl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_lround.c b/sysdeps/ieee754/ldbl-opt/s_lround.c
deleted file mode 100644
index f3a27fa9c9..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_lround.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_lround.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __lround, lroundl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_modf.c b/sysdeps/ieee754/ldbl-opt/s_modf.c
deleted file mode 100644
index 93acb43ae6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_modf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_modf.c>
-#if IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __modf, modfl, GLIBC_2_0);
-# endif
-#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __modf, modfl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_nearbyint.c b/sysdeps/ieee754/ldbl-opt/s_nearbyint.c
deleted file mode 100644
index a8b7973acd..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_nearbyint.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_nearbyint.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_nextafter.c b/sysdeps/ieee754/ldbl-opt/s_nextafter.c
deleted file mode 100644
index 78e2c0ff37..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_nextafter.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <math/s_nextafter.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __nextafter, nextafterl, GLIBC_2_0);
-#endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-strong_alias (__nextafter, __nexttowardd)
-strong_alias (__nextafter, __nexttowardld)
-#undef nexttoward
-compat_symbol (libm, __nexttowardd, nexttoward, GLIBC_2_1);
-compat_symbol (libm, __nexttowardld, nexttowardl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c b/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
deleted file mode 100644
index 07e9375b78..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Single precision version of nexttoward.c.
-   Conversion to IEEE single float by Jakub Jelinek, jj@ultra.linux.cz. */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/* IEEE functions
- *	__nexttowardfd(x,y)
- *	return the next machine floating-point number of x in the
- *	direction toward y.
- * This is for machines which use different binary type for double and
- * long double conditionally, y is long double equal to double.
- *   Special cases:
- */
-
-#include <errno.h>
-#include <math.h>
-#include <math_private.h>
-#include <math_ldbl_opt.h>
-#include <float.h>
-
-float __nldbl_nexttowardf(float x, double y);
-
-float __nldbl_nexttowardf(float x, double y)
-{
-	int32_t hx,hy,ix,iy;
-	u_int32_t ly;
-
-	GET_FLOAT_WORD(hx,x);
-	EXTRACT_WORDS(hy,ly,y);
-	ix = hx&0x7fffffff;		/* |x| */
-	iy = hy&0x7fffffff;		/* |y| */
-
-	if((ix>0x7f800000) ||				   /* x is nan */
-	   ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0))    /* y is nan */
-	   return x+y;
-	if((double) x==y) return y;		/* x=y, return y */
-	if(ix==0) {				/* x == 0 */
-	    float u;
-	    SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
-	    u = math_opt_barrier (x);
-	    u = u * u;
-	    math_force_eval (u);		/* raise underflow flag */
-	    return x;
-	}
-	if(hx>=0) {				/* x > 0 */
-	    if(x > y)				/* x -= ulp */
-		hx -= 1;
-	    else				/* x < y, x += ulp */
-		hx += 1;
-	} else {				/* x < 0 */
-	    if(x < y)				/* x -= ulp */
-		hx -= 1;
-	    else				/* x > y, x += ulp */
-		hx += 1;
-	}
-	hy = hx&0x7f800000;
-	if(hy>=0x7f800000) {
-	  float u = x+x;			/* overflow  */
-	  math_force_eval (u);
-	  __set_errno (ERANGE);
-	}
-	if(hy<0x00800000) {
-	    float u = x*x;			/* underflow */
-	    math_force_eval (u);		/* raise underflow flag */
-	    __set_errno (ERANGE);
-	}
-	SET_FLOAT_WORD(x,hx);
-	return x;
-}
-
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __nldbl_nexttowardf, nexttowardf, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_remquo.c b/sysdeps/ieee754/ldbl-opt/s_remquo.c
deleted file mode 100644
index 9f3d7ba368..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_remquo.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_remquo.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __remquo, remquol, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_rint.c b/sysdeps/ieee754/ldbl-opt/s_rint.c
deleted file mode 100644
index d9b156ea27..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_rint.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_rint.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __rint, rintl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_round.c b/sysdeps/ieee754/ldbl-opt/s_round.c
deleted file mode 100644
index edff2f017b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_round.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_round.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __round, roundl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_scalbln.c b/sysdeps/ieee754/ldbl-opt/s_scalbln.c
deleted file mode 100644
index 391142b769..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_scalbln.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_scalbln.c>
-#if IS_IN (libm)
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __scalbln, scalblnl, GLIBC_2_1);
-#endif
-#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_1)
-compat_symbol (libc, __scalbln, scalblnl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_scalbn.c b/sysdeps/ieee754/ldbl-opt/s_scalbn.c
deleted file mode 100644
index 1ad81b199e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_scalbn.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_scalbn.c>
-#if IS_IN (libm)
-# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __scalbn, scalbnl, GLIBC_2_0);
-# endif
-#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
-compat_symbol (libc, __scalbn, scalbnl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_significand.c b/sysdeps/ieee754/ldbl-opt/s_significand.c
deleted file mode 100644
index 5287c09066..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_significand.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <math/s_significand.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __significand, significandl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_significandl.c b/sysdeps/ieee754/ldbl-opt/s_significandl.c
deleted file mode 100644
index 9339b4780d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_significandl.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/s_significandl.c>
-long_double_symbol (libm, __significandl, significandl);
diff --git a/sysdeps/ieee754/ldbl-opt/s_sin.c b/sysdeps/ieee754/ldbl-opt/s_sin.c
deleted file mode 100644
index 6932ccc080..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_sin.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* dbl-64/s_sin.c uses NAN and sincos identifiers internally.  */
-#define sincos sincos_disable
-/* These definitions needed for proper unfolding of __MATHDECL_VEC.  */
-#define __DECL_SIMD_sincos_disable
-#define __DECL_SIMD_sincos_disablef
-#define __DECL_SIMD_sincos_disablel
-#define __DECL_SIMD_sincos_disablef128
-#include <math_ldbl_opt.h>
-#undef NAN
-#undef sincos
-#include <sysdeps/ieee754/dbl-64/s_sin.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __sin, sinl, GLIBC_2_0);
-compat_symbol (libm, __cos, cosl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_sincos.c b/sysdeps/ieee754/ldbl-opt/s_sincos.c
deleted file mode 100644
index 6d2a48f25b..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_sincos.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_sincos.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __sincos, sincosl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_tan.c b/sysdeps/ieee754/ldbl-opt/s_tan.c
deleted file mode 100644
index 6b0fec0063..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_tan.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_tan.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, tan, tanl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_tanh.c b/sysdeps/ieee754/ldbl-opt/s_tanh.c
deleted file mode 100644
index e763bbde77..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_tanh.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_tanh.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __tanh, tanhl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_trunc.c b/sysdeps/ieee754/ldbl-opt/s_trunc.c
deleted file mode 100644
index 9d90a2bd73..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_trunc.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_trunc.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __trunc, truncl, GLIBC_2_1);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_acos_compat.c b/sysdeps/ieee754/ldbl-opt/w_acos_compat.c
deleted file mode 100644
index 1e6d1b37ec..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_acos_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_acosh_compat.c
deleted file mode 100644
index 40da339a7a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_acosh_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c
deleted file mode 100644
index df4338d9fa..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_acoshl_compat.c>
-long_double_symbol (libm, __acoshl, acoshl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c b/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c
deleted file mode 100644
index 5efc99024c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_acosl_compat.c>
-long_double_symbol (libm, __acosl, acosl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_asin_compat.c b/sysdeps/ieee754/ldbl-opt/w_asin_compat.c
deleted file mode 100644
index 1c52cc22ad..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_asin_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c
deleted file mode 100644
index 087fab25bb..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_asinl_compat.c>
-long_double_symbol (libm, __asinl, asinl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_atan2_compat.c b/sysdeps/ieee754/ldbl-opt/w_atan2_compat.c
deleted file mode 100644
index d3f7964d7c..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_atan2_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c
deleted file mode 100644
index 6b12209625..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_atan2l_compat.c>
-long_double_symbol (libm, __atan2l, atan2l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_atanh_compat.c b/sysdeps/ieee754/ldbl-opt/w_atanh_compat.c
deleted file mode 100644
index e15ef1f93d..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_atanh_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c
deleted file mode 100644
index 49bae1ee8f..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_atanhl_compat.c>
-long_double_symbol (libm, __atanhl, atanhl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_cosh_compat.c b/sysdeps/ieee754/ldbl-opt/w_cosh_compat.c
deleted file mode 100644
index af29735e10..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_cosh_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c
deleted file mode 100644
index a8808778ba..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_coshl_compat.c>
-long_double_symbol (libm, __coshl, coshl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_exp10_compat.c b/sysdeps/ieee754/ldbl-opt/w_exp10_compat.c
deleted file mode 100644
index 142a70bcd6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_exp10_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#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);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c b/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c
deleted file mode 100644
index 8f2ccd3441..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#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_exp_compat.c b/sysdeps/ieee754/ldbl-opt/w_exp_compat.c
deleted file mode 100644
index 686c9c26d0..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_exp_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/w_exp_compat.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __exp, expl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_fmod_compat.c b/sysdeps/ieee754/ldbl-opt/w_fmod_compat.c
deleted file mode 100644
index 9280d39d70..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_fmod_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c
deleted file mode 100644
index 88fe0ac4d2..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_fmodl_compat.c>
-long_double_symbol (libm, __fmodl, fmodl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_hypot_compat.c b/sysdeps/ieee754/ldbl-opt/w_hypot_compat.c
deleted file mode 100644
index b3979ff0f4..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_hypot_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c
deleted file mode 100644
index 68e3997489..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_hypotl_compat.c>
-long_double_symbol (libm, __hypotl, hypotl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_j0_compat.c b/sysdeps/ieee754/ldbl-opt/w_j0_compat.c
deleted file mode 100644
index 45b4d14764..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_j0_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#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);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c b/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c
deleted file mode 100644
index 9050657e03..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_j1_compat.c
deleted file mode 100644
index 1071c8fd6a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_j1_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#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);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c b/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c
deleted file mode 100644
index 4ed9e2dd12..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_jn_compat.c
deleted file mode 100644
index be29a36041..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_jn_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#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);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c b/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c
deleted file mode 100644
index d22ee54997..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#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_lgamma_compat.c b/sysdeps/ieee754/ldbl-opt/w_lgamma_compat.c
deleted file mode 100644
index f268e65a88..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_lgamma_compat.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <math/w_lgamma_compat.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-strong_alias (__lgamma_compat, __lgammal_dbl_compat)
-compat_symbol (libm, __lgammal_dbl_compat, lgammal, GLIBC_2_0);
-compat_symbol (libm, __gamma, gammal, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_lgamma_compatl.c b/sysdeps/ieee754/ldbl-opt/w_lgamma_compatl.c
deleted file mode 100644
index f60b3d7bcf..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_lgamma_compatl.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#define USE_AS_COMPAT 1
-#include <math/lgamma-compat.h>
-#undef LGAMMA_OLD_VER
-#define LGAMMA_OLD_VER LONG_DOUBLE_COMPAT_VERSION
-#include <math/w_lgamma_compatl.c>
-#if GAMMA_ALIAS
-long_double_symbol (libm, __gammal, gammal);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_lgamma_r_compat.c b/sysdeps/ieee754/ldbl-opt/w_lgamma_r_compat.c
deleted file mode 100644
index 673954cd1a..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_lgamma_r_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <math/w_lgamma_r_compat.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __lgamma_r, lgammal_r, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c b/sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c
deleted file mode 100644
index 6fdf2bba87..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_lgammal_r_compat.c>
-long_double_symbol (libm, __lgammal_r, lgammal_r);
diff --git a/sysdeps/ieee754/ldbl-opt/w_log10_compat.c b/sysdeps/ieee754/ldbl-opt/w_log10_compat.c
deleted file mode 100644
index 5ec6a2b2b6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_log10_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c
deleted file mode 100644
index 17de3e7856..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_log10l_compat.c>
-long_double_symbol (libm, __log10l, log10l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_log2_compat.c b/sysdeps/ieee754/ldbl-opt/w_log2_compat.c
deleted file mode 100644
index dffd2c183e..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_log2_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c
deleted file mode 100644
index 3c5e734573..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_log2l_compat.c>
-long_double_symbol (libm, __log2l, log2l);
diff --git a/sysdeps/ieee754/ldbl-opt/w_log_compat.c b/sysdeps/ieee754/ldbl-opt/w_log_compat.c
deleted file mode 100644
index d2a2bcadde..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_log_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_logl_compat.c
deleted file mode 100644
index 2b55842139..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_logl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_logl_compat.c>
-long_double_symbol (libm, __logl, logl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_pow_compat.c b/sysdeps/ieee754/ldbl-opt/w_pow_compat.c
deleted file mode 100644
index c2a7942019..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_pow_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_powl_compat.c
deleted file mode 100644
index 1897cf1c63..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_powl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_powl_compat.c>
-long_double_symbol (libm, __powl, powl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_remainder_compat.c b/sysdeps/ieee754/ldbl-opt/w_remainder_compat.c
deleted file mode 100644
index c823dcb8e7..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_remainder_compat.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math_ldbl_opt.h>
-#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)
-compat_symbol (libm, __drem, dreml, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c b/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c
deleted file mode 100644
index b2ce5c9563..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_scalb_compat.c
deleted file mode 100644
index f6d53a5ba5..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_scalb_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_scalbl_compat.c
deleted file mode 100644
index c8feb654a2..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_scalbl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_scalbl_compat.c>
-long_double_symbol (libm, __scalbl, scalbl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_sinh_compat.c b/sysdeps/ieee754/ldbl-opt/w_sinh_compat.c
deleted file mode 100644
index b47182c017..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_sinh_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c
deleted file mode 100644
index 305ed82357..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_sinhl_compat.c>
-long_double_symbol (libm, __sinhl, sinhl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_sqrt_compat.c b/sysdeps/ieee754/ldbl-opt/w_sqrt_compat.c
deleted file mode 100644
index 355d1c20db..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_sqrt_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c
deleted file mode 100644
index 1e4526f2c6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_sqrtl_compat.c>
-long_double_symbol (libm, __sqrtl, sqrtl);
diff --git a/sysdeps/ieee754/ldbl-opt/w_tgamma_compat.c b/sysdeps/ieee754/ldbl-opt/w_tgamma_compat.c
deleted file mode 100644
index 082ce8aaff..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_tgamma_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#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_compat.c b/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c
deleted file mode 100644
index aaf5403522..0000000000
--- a/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <math/w_tgammal_compat.c>
-long_double_symbol (libm, __tgammal, tgammal);