From 86f9568af6facdd5b32e64d98624daefbe8b4931 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 5 Oct 2017 21:13:40 +0000
Subject: [PATCH] Use libm_alias_ldouble for ldbl-96 functions.

This patch makes ldbl-96 functions use libm_alias_ldouble to define
function aliases.

Tested for x86_64, and tested with build-many-glibcs.py that installed
stripped shared libraries are unchanged by the patch.

	* sysdeps/ieee754/ldbl-96/s_asinhl.c: Include
	<libm-alias-ldouble.h>.
	(asinhl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_cbrtl.c: Include
	<libm-alias-ldouble.h>.
	(cbrtl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_copysignl.c: Include
	<libm-alias-ldouble.h>.
	(copysignl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_cosl.c: Include
	<libm-alias-ldouble.h>.
	(cosl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_erfl.c: Include
	<libm-alias-ldouble.h>.
	(erfl): Define using libm_alias_ldouble.
	(erfcl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_fmal.c: Include
	<libm-alias-ldouble.h>.
	(fmal): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_frexpl.c: Include
	<libm-alias-ldouble.h>.
	(frexpl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_fromfpl.c (fromfpl): Define using
	libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_fromfpl_main.c: Include
	<libm-alias-ldouble.h>.
	* sysdeps/ieee754/ldbl-96/s_fromfpxl.c (fromfpxl): Define using
	libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_getpayloadl.c: Include
	<libm-alias-ldouble.h>.
	(getpayloadl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_llrintl.c: Include
	<libm-alias-ldouble.h>.
	(llrintl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_llroundl.c: Include
	<libm-alias-ldouble.h>.
	(llroundl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_lrintl.c: Include
	<libm-alias-ldouble.h>.
	(lrintl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_lroundl.c: Include
	<libm-alias-ldouble.h>.
	(lroundl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_modfl.c: Include
	<libm-alias-ldouble.h>.
	(modfl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_nextupl.c: Include
	<libm-alias-ldouble.h>.
	(nextupl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_remquol.c: Include
	<libm-alias-ldouble.h>.
	(remquol): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_roundevenl.c: Include
	<libm-alias-ldouble.h>.
	(roundevenl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_roundl.c: Include
	<libm-alias-ldouble.h>.
	(roundl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_setpayloadl.c (setpayloadl): Define
	using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_setpayloadl_main.c: Include
	<libm-alias-ldouble.h>.
	* sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c: Include
	<libm-alias-ldouble.h>.
	(setpayloadsigl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_sincosl.c: Include
	<libm-alias-ldouble.h>.
	(sincosl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_sinl.c: Include
	<libm-alias-ldouble.h>.
	(sinl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_tanhl.c: Include
	<libm-alias-ldouble.h>.
	(tanhl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_tanl.c: Include
	<libm-alias-ldouble.h>.
	(tanl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_totalorderl.c: Include
	<libm-alias-ldouble.h>.
	(totalorderl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_totalordermagl.c: Include
	<libm-alias-ldouble.h>.
	(totalordermagl): Define using libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_ufromfpl.c (ufromfpl): Define using
	libm_alias_ldouble.
	* sysdeps/ieee754/ldbl-96/s_ufromfpxl.c (ufromfpxl): Define using
	libm_alias_ldouble.
---
 ChangeLog                                    | 90 ++++++++++++++++++++
 sysdeps/ieee754/ldbl-96/s_asinhl.c           |  3 +-
 sysdeps/ieee754/ldbl-96/s_cbrtl.c            |  3 +-
 sysdeps/ieee754/ldbl-96/s_copysignl.c        |  3 +-
 sysdeps/ieee754/ldbl-96/s_cosl.c             |  3 +-
 sysdeps/ieee754/ldbl-96/s_erfl.c             |  5 +-
 sysdeps/ieee754/ldbl-96/s_fmal.c             |  3 +-
 sysdeps/ieee754/ldbl-96/s_frexpl.c           |  3 +-
 sysdeps/ieee754/ldbl-96/s_fromfpl.c          |  2 +-
 sysdeps/ieee754/ldbl-96/s_fromfpl_main.c     |  1 +
 sysdeps/ieee754/ldbl-96/s_fromfpxl.c         |  2 +-
 sysdeps/ieee754/ldbl-96/s_getpayloadl.c      |  3 +-
 sysdeps/ieee754/ldbl-96/s_llrintl.c          |  3 +-
 sysdeps/ieee754/ldbl-96/s_llroundl.c         |  3 +-
 sysdeps/ieee754/ldbl-96/s_lrintl.c           |  3 +-
 sysdeps/ieee754/ldbl-96/s_lroundl.c          |  3 +-
 sysdeps/ieee754/ldbl-96/s_modfl.c            |  3 +-
 sysdeps/ieee754/ldbl-96/s_nextupl.c          |  3 +-
 sysdeps/ieee754/ldbl-96/s_remquol.c          |  3 +-
 sysdeps/ieee754/ldbl-96/s_roundevenl.c       |  3 +-
 sysdeps/ieee754/ldbl-96/s_roundl.c           |  3 +-
 sysdeps/ieee754/ldbl-96/s_setpayloadl.c      |  2 +-
 sysdeps/ieee754/ldbl-96/s_setpayloadl_main.c |  1 +
 sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c   |  2 +-
 sysdeps/ieee754/ldbl-96/s_sincosl.c          |  3 +-
 sysdeps/ieee754/ldbl-96/s_sinl.c             |  3 +-
 sysdeps/ieee754/ldbl-96/s_tanhl.c            |  3 +-
 sysdeps/ieee754/ldbl-96/s_tanl.c             |  3 +-
 sysdeps/ieee754/ldbl-96/s_totalorderl.c      |  3 +-
 sysdeps/ieee754/ldbl-96/s_totalordermagl.c   |  3 +-
 sysdeps/ieee754/ldbl-96/s_ufromfpl.c         |  2 +-
 sysdeps/ieee754/ldbl-96/s_ufromfpxl.c        |  2 +-
 32 files changed, 145 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74c51ea400..0743ed6e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,93 @@
+2017-10-05  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/ieee754/ldbl-96/s_asinhl.c: Include
+	<libm-alias-ldouble.h>.
+	(asinhl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_cbrtl.c: Include
+	<libm-alias-ldouble.h>.
+	(cbrtl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_copysignl.c: Include
+	<libm-alias-ldouble.h>.
+	(copysignl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_cosl.c: Include
+	<libm-alias-ldouble.h>.
+	(cosl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_erfl.c: Include
+	<libm-alias-ldouble.h>.
+	(erfl): Define using libm_alias_ldouble.
+	(erfcl): Likewise.
+	* sysdeps/ieee754/ldbl-96/s_fmal.c: Include
+	<libm-alias-ldouble.h>.
+	(fmal): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_frexpl.c: Include
+	<libm-alias-ldouble.h>.
+	(frexpl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_fromfpl.c (fromfpl): Define using
+	libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_fromfpl_main.c: Include
+	<libm-alias-ldouble.h>.
+	* sysdeps/ieee754/ldbl-96/s_fromfpxl.c (fromfpxl): Define using
+	libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_getpayloadl.c: Include
+	<libm-alias-ldouble.h>.
+	(getpayloadl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_llrintl.c: Include
+	<libm-alias-ldouble.h>.
+	(llrintl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_llroundl.c: Include
+	<libm-alias-ldouble.h>.
+	(llroundl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_lrintl.c: Include
+	<libm-alias-ldouble.h>.
+	(lrintl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_lroundl.c: Include
+	<libm-alias-ldouble.h>.
+	(lroundl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_modfl.c: Include
+	<libm-alias-ldouble.h>.
+	(modfl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_nextupl.c: Include
+	<libm-alias-ldouble.h>.
+	(nextupl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_remquol.c: Include
+	<libm-alias-ldouble.h>.
+	(remquol): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_roundevenl.c: Include
+	<libm-alias-ldouble.h>.
+	(roundevenl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_roundl.c: Include
+	<libm-alias-ldouble.h>.
+	(roundl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_setpayloadl.c (setpayloadl): Define
+	using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_setpayloadl_main.c: Include
+	<libm-alias-ldouble.h>.
+	* sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c: Include
+	<libm-alias-ldouble.h>.
+	(setpayloadsigl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_sincosl.c: Include
+	<libm-alias-ldouble.h>.
+	(sincosl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_sinl.c: Include
+	<libm-alias-ldouble.h>.
+	(sinl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_tanhl.c: Include
+	<libm-alias-ldouble.h>.
+	(tanhl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_tanl.c: Include
+	<libm-alias-ldouble.h>.
+	(tanl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_totalorderl.c: Include
+	<libm-alias-ldouble.h>.
+	(totalorderl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_totalordermagl.c: Include
+	<libm-alias-ldouble.h>.
+	(totalordermagl): Define using libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_ufromfpl.c (ufromfpl): Define using
+	libm_alias_ldouble.
+	* sysdeps/ieee754/ldbl-96/s_ufromfpxl.c (ufromfpxl): Define using
+	libm_alias_ldouble.
+
 2017-10-05  Siddhesh Poyarekar  <siddhesh@sourceware.org>
 
 	* sysdeps/aarch64/multiarch/Makefile (sysdep_routines): Add
diff --git a/sysdeps/ieee754/ldbl-96/s_asinhl.c b/sysdeps/ieee754/ldbl-96/s_asinhl.c
index da49ea5988..8f7db4ccf9 100644
--- a/sysdeps/ieee754/ldbl-96/s_asinhl.c
+++ b/sysdeps/ieee754/ldbl-96/s_asinhl.c
@@ -32,6 +32,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <float.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 static const long double
 one =  1.000000000000000000000e+00L, /* 0x3FFF, 0x00000000, 0x00000000 */
@@ -62,4 +63,4 @@ long double __asinhl(long double x)
 	}
 	return __copysignl(w, x);
 }
-weak_alias (__asinhl, asinhl)
+libm_alias_ldouble (__asinh, asinh)
diff --git a/sysdeps/ieee754/ldbl-96/s_cbrtl.c b/sysdeps/ieee754/ldbl-96/s_cbrtl.c
index 5712fce2e9..8ee9f41b13 100644
--- a/sysdeps/ieee754/ldbl-96/s_cbrtl.c
+++ b/sysdeps/ieee754/ldbl-96/s_cbrtl.c
@@ -20,6 +20,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 
 #define CBRT2 1.2599210498948731648		/* 2^(1/3) */
@@ -67,4 +68,4 @@ __cbrtl (long double x)
   u -= (u - (x / (u * u))) * third;
   return u;
 }
-weak_alias (__cbrtl, cbrtl)
+libm_alias_ldouble (__cbrt, cbrt)
diff --git a/sysdeps/ieee754/ldbl-96/s_copysignl.c b/sysdeps/ieee754/ldbl-96/s_copysignl.c
index 5cd3fbf193..3c16d54783 100644
--- a/sysdeps/ieee754/ldbl-96/s_copysignl.c
+++ b/sysdeps/ieee754/ldbl-96/s_copysignl.c
@@ -26,6 +26,7 @@ static char rcsid[] = "$NetBSD: $";
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 long double __copysignl(long double x, long double y)
 {
@@ -35,4 +36,4 @@ long double __copysignl(long double x, long double y)
 	SET_LDOUBLE_EXP(x,(es1&0x7fff)|(es2&0x8000));
         return x;
 }
-weak_alias (__copysignl, copysignl)
+libm_alias_ldouble (__copysign, copysign)
diff --git a/sysdeps/ieee754/ldbl-96/s_cosl.c b/sysdeps/ieee754/ldbl-96/s_cosl.c
index 8b0b7d3cc2..324e5b9663 100644
--- a/sysdeps/ieee754/ldbl-96/s_cosl.c
+++ b/sysdeps/ieee754/ldbl-96/s_cosl.c
@@ -52,6 +52,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <errno.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 long double __cosl(long double x)
 {
@@ -85,4 +86,4 @@ long double __cosl(long double x)
 	    }
 	}
 }
-weak_alias (__cosl, cosl)
+libm_alias_ldouble (__cos, cos)
diff --git a/sysdeps/ieee754/ldbl-96/s_erfl.c b/sysdeps/ieee754/ldbl-96/s_erfl.c
index 9b6cd3fad0..0f8974085b 100644
--- a/sysdeps/ieee754/ldbl-96/s_erfl.c
+++ b/sysdeps/ieee754/ldbl-96/s_erfl.c
@@ -108,6 +108,7 @@
 #include <float.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 static const long double
 tiny = 1e-4931L,
@@ -335,7 +336,7 @@ __erfl (long double x)
     return r / x - one;
 }
 
-weak_alias (__erfl, erfl)
+libm_alias_ldouble (__erf, erf)
 long double
 __erfcl (long double x)
 {
@@ -448,4 +449,4 @@ __erfcl (long double x)
     }
 }
 
-weak_alias (__erfcl, erfcl)
+libm_alias_ldouble (__erfc, erfc)
diff --git a/sysdeps/ieee754/ldbl-96/s_fmal.c b/sysdeps/ieee754/ldbl-96/s_fmal.c
index 1f3fa1ea1e..459a605603 100644
--- a/sysdeps/ieee754/ldbl-96/s_fmal.c
+++ b/sysdeps/ieee754/ldbl-96/s_fmal.c
@@ -22,6 +22,7 @@
 #include <fenv.h>
 #include <ieee754.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 #include <tininess.h>
 
 /* This implementation uses rounding to odd to avoid problems with
@@ -293,4 +294,4 @@ __fmal (long double x, long double y, long double z)
       return v.d * 0x1p-130L;
     }
 }
-weak_alias (__fmal, fmal)
+libm_alias_ldouble (__fma, fma)
diff --git a/sysdeps/ieee754/ldbl-96/s_frexpl.c b/sysdeps/ieee754/ldbl-96/s_frexpl.c
index 488b236ad6..7c31ed9936 100644
--- a/sysdeps/ieee754/ldbl-96/s_frexpl.c
+++ b/sysdeps/ieee754/ldbl-96/s_frexpl.c
@@ -31,6 +31,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <float.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 static const long double
 #if LDBL_MANT_DIG == 64
@@ -58,4 +59,4 @@ long double __frexpl(long double x, int *eptr)
 	SET_LDOUBLE_EXP(x,se);
 	return x;
 }
-weak_alias (__frexpl, frexpl)
+libm_alias_ldouble (__frexp, frexp)
diff --git a/sysdeps/ieee754/ldbl-96/s_fromfpl.c b/sysdeps/ieee754/ldbl-96/s_fromfpl.c
index f3fdba33c1..bcedceea8e 100644
--- a/sysdeps/ieee754/ldbl-96/s_fromfpl.c
+++ b/sysdeps/ieee754/ldbl-96/s_fromfpl.c
@@ -2,4 +2,4 @@
 #define INEXACT 0
 #define FUNC __fromfpl
 #include <s_fromfpl_main.c>
-weak_alias (__fromfpl, fromfpl)
+libm_alias_ldouble (__fromfp, fromfp)
diff --git a/sysdeps/ieee754/ldbl-96/s_fromfpl_main.c b/sysdeps/ieee754/ldbl-96/s_fromfpl_main.c
index 05de1fa6c0..2dc548497c 100644
--- a/sysdeps/ieee754/ldbl-96/s_fromfpl_main.c
+++ b/sysdeps/ieee754/ldbl-96/s_fromfpl_main.c
@@ -20,6 +20,7 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/sysdeps/ieee754/ldbl-96/s_fromfpxl.c b/sysdeps/ieee754/ldbl-96/s_fromfpxl.c
index 9477cc2ea7..0a342a22d1 100644
--- a/sysdeps/ieee754/ldbl-96/s_fromfpxl.c
+++ b/sysdeps/ieee754/ldbl-96/s_fromfpxl.c
@@ -2,4 +2,4 @@
 #define INEXACT 1
 #define FUNC __fromfpxl
 #include <s_fromfpl_main.c>
-weak_alias (__fromfpxl, fromfpxl)
+libm_alias_ldouble (__fromfpx, fromfpx)
diff --git a/sysdeps/ieee754/ldbl-96/s_getpayloadl.c b/sysdeps/ieee754/ldbl-96/s_getpayloadl.c
index 2c4dab2f58..d2deab62ce 100644
--- a/sysdeps/ieee754/ldbl-96/s_getpayloadl.c
+++ b/sysdeps/ieee754/ldbl-96/s_getpayloadl.c
@@ -18,6 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 #include <stdint.h>
 
 long double
@@ -30,4 +31,4 @@ __getpayloadl (const long double *x)
   uint64_t ix = ((uint64_t) hx << 32) | lx;
   return (long double) ix;
 }
-weak_alias (__getpayloadl, getpayloadl)
+libm_alias_ldouble (__getpayload, getpayload)
diff --git a/sysdeps/ieee754/ldbl-96/s_llrintl.c b/sysdeps/ieee754/ldbl-96/s_llrintl.c
index dc115124ac..23287c1554 100644
--- a/sysdeps/ieee754/ldbl-96/s_llrintl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llrintl.c
@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 static const long double two63[2] =
 {
@@ -88,4 +89,4 @@ __llrintl (long double x)
   return sx ? -result : result;
 }
 
-weak_alias (__llrintl, llrintl)
+libm_alias_ldouble (__llrint, llrint)
diff --git a/sysdeps/ieee754/ldbl-96/s_llroundl.c b/sysdeps/ieee754/ldbl-96/s_llroundl.c
index a64768556c..e82d03c033 100644
--- a/sysdeps/ieee754/ldbl-96/s_llroundl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llroundl.c
@@ -22,6 +22,7 @@
 #include <math.h>
 
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 
 long long int
@@ -86,4 +87,4 @@ __llroundl (long double x)
   return sign * result;
 }
 
-weak_alias (__llroundl, llroundl)
+libm_alias_ldouble (__llround, llround)
diff --git a/sysdeps/ieee754/ldbl-96/s_lrintl.c b/sysdeps/ieee754/ldbl-96/s_lrintl.c
index ae53a19e93..a1846c5d6f 100644
--- a/sysdeps/ieee754/ldbl-96/s_lrintl.c
+++ b/sysdeps/ieee754/ldbl-96/s_lrintl.c
@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 static const long double two63[2] =
 {
@@ -123,4 +124,4 @@ __lrintl (long double x)
   return sx ? -result : result;
 }
 
-weak_alias (__lrintl, lrintl)
+libm_alias_ldouble (__lrint, lrint)
diff --git a/sysdeps/ieee754/ldbl-96/s_lroundl.c b/sysdeps/ieee754/ldbl-96/s_lroundl.c
index b8288a9f28..ddfe9fba68 100644
--- a/sysdeps/ieee754/ldbl-96/s_lroundl.c
+++ b/sysdeps/ieee754/ldbl-96/s_lroundl.c
@@ -22,6 +22,7 @@
 #include <math.h>
 
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 
 long int
@@ -108,4 +109,4 @@ __lroundl (long double x)
   return sign * result;
 }
 
-weak_alias (__lroundl, lroundl)
+libm_alias_ldouble (__lround, lround)
diff --git a/sysdeps/ieee754/ldbl-96/s_modfl.c b/sysdeps/ieee754/ldbl-96/s_modfl.c
index 72cea62b0d..380b6f0389 100644
--- a/sysdeps/ieee754/ldbl-96/s_modfl.c
+++ b/sysdeps/ieee754/ldbl-96/s_modfl.c
@@ -26,6 +26,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 static const long double one = 1.0;
 
@@ -70,4 +71,4 @@ __modfl(long double x, long double *iptr)
 	    }
 	}
 }
-weak_alias (__modfl, modfl)
+libm_alias_ldouble (__modf, modf)
diff --git a/sysdeps/ieee754/ldbl-96/s_nextupl.c b/sysdeps/ieee754/ldbl-96/s_nextupl.c
index beea0475a8..a3a8d1b7d7 100644
--- a/sysdeps/ieee754/ldbl-96/s_nextupl.c
+++ b/sysdeps/ieee754/ldbl-96/s_nextupl.c
@@ -18,6 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 /* Return the least floating-point number greater than X.  */
 long double
@@ -81,4 +82,4 @@ __nextupl (long double x)
   return x;
 }
 
-weak_alias (__nextupl, nextupl)
+libm_alias_ldouble (__nextup, nextup)
diff --git a/sysdeps/ieee754/ldbl-96/s_remquol.c b/sysdeps/ieee754/ldbl-96/s_remquol.c
index bd1aaf73ba..3bf43025da 100644
--- a/sysdeps/ieee754/ldbl-96/s_remquol.c
+++ b/sysdeps/ieee754/ldbl-96/s_remquol.c
@@ -20,6 +20,7 @@
 #include <math.h>
 
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 
 static const long double zero = 0.0;
@@ -108,4 +109,4 @@ __remquol (long double x, long double p, int *quo)
     x = -x;
   return x;
 }
-weak_alias (__remquol, remquol)
+libm_alias_ldouble (__remquo, remquo)
diff --git a/sysdeps/ieee754/ldbl-96/s_roundevenl.c b/sysdeps/ieee754/ldbl-96/s_roundevenl.c
index de09535fa6..4f3877d76b 100644
--- a/sysdeps/ieee754/ldbl-96/s_roundevenl.c
+++ b/sysdeps/ieee754/ldbl-96/s_roundevenl.c
@@ -19,6 +19,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 #include <stdint.h>
 
 #define BIAS 0x3fff
@@ -122,4 +123,4 @@ __roundevenl (long double x)
   SET_LDOUBLE_WORDS (x, se, hx, lx);
   return x;
 }
-weak_alias (__roundevenl, roundevenl)
+libm_alias_ldouble (__roundeven, roundeven)
diff --git a/sysdeps/ieee754/ldbl-96/s_roundl.c b/sysdeps/ieee754/ldbl-96/s_roundl.c
index af7215a663..f6b2f24ed2 100644
--- a/sysdeps/ieee754/ldbl-96/s_roundl.c
+++ b/sysdeps/ieee754/ldbl-96/s_roundl.c
@@ -20,6 +20,7 @@
 #include <math.h>
 
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 
 long double
@@ -89,4 +90,4 @@ __roundl (long double x)
   SET_LDOUBLE_WORDS (x, se, i0, i1);
   return x;
 }
-weak_alias (__roundl, roundl)
+libm_alias_ldouble (__round, round)
diff --git a/sysdeps/ieee754/ldbl-96/s_setpayloadl.c b/sysdeps/ieee754/ldbl-96/s_setpayloadl.c
index bb07a3533a..9f43c259ec 100644
--- a/sysdeps/ieee754/ldbl-96/s_setpayloadl.c
+++ b/sysdeps/ieee754/ldbl-96/s_setpayloadl.c
@@ -1,4 +1,4 @@
 #define SIG 0
 #define FUNC __setpayloadl
 #include <s_setpayloadl_main.c>
-weak_alias (__setpayloadl, setpayloadl)
+libm_alias_ldouble (__setpayload, setpayload)
diff --git a/sysdeps/ieee754/ldbl-96/s_setpayloadl_main.c b/sysdeps/ieee754/ldbl-96/s_setpayloadl_main.c
index c2fd0401d7..eda8944635 100644
--- a/sysdeps/ieee754/ldbl-96/s_setpayloadl_main.c
+++ b/sysdeps/ieee754/ldbl-96/s_setpayloadl_main.c
@@ -18,6 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 #include <nan-high-order-bit.h>
 #include <stdint.h>
 
diff --git a/sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c b/sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c
index 4e920360d4..cd82f295aa 100644
--- a/sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c
+++ b/sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c
@@ -1,4 +1,4 @@
 #define SIG 1
 #define FUNC __setpayloadsigl
 #include <s_setpayloadl_main.c>
-weak_alias (__setpayloadsigl, setpayloadsigl)
+libm_alias_ldouble (__setpayloadsig, setpayloadsig)
diff --git a/sysdeps/ieee754/ldbl-96/s_sincosl.c b/sysdeps/ieee754/ldbl-96/s_sincosl.c
index 7d33c97162..d56d22299e 100644
--- a/sysdeps/ieee754/ldbl-96/s_sincosl.c
+++ b/sysdeps/ieee754/ldbl-96/s_sincosl.c
@@ -21,6 +21,7 @@
 #include <math.h>
 
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 
 void
@@ -73,4 +74,4 @@ __sincosl (long double x, long double *sinx, long double *cosx)
 	}
     }
 }
-weak_alias (__sincosl, sincosl)
+libm_alias_ldouble (__sincos, sincos)
diff --git a/sysdeps/ieee754/ldbl-96/s_sinl.c b/sysdeps/ieee754/ldbl-96/s_sinl.c
index 11e1899822..cfbe9bf153 100644
--- a/sysdeps/ieee754/ldbl-96/s_sinl.c
+++ b/sysdeps/ieee754/ldbl-96/s_sinl.c
@@ -52,6 +52,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <errno.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 long double __sinl(long double x)
 {
@@ -85,4 +86,4 @@ long double __sinl(long double x)
 	    }
 	}
 }
-weak_alias (__sinl, sinl)
+libm_alias_ldouble (__sin, sin)
diff --git a/sysdeps/ieee754/ldbl-96/s_tanhl.c b/sysdeps/ieee754/ldbl-96/s_tanhl.c
index 10c3449c41..b0578fffb5 100644
--- a/sysdeps/ieee754/ldbl-96/s_tanhl.c
+++ b/sysdeps/ieee754/ldbl-96/s_tanhl.c
@@ -45,6 +45,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <float.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 static const long double one=1.0, two=2.0, tiny = 1.0e-4900L;
 
@@ -87,4 +88,4 @@ long double __tanhl(long double x)
 	}
 	return (se&0x8000)? -z: z;
 }
-weak_alias (__tanhl, tanhl)
+libm_alias_ldouble (__tanh, tanh)
diff --git a/sysdeps/ieee754/ldbl-96/s_tanl.c b/sysdeps/ieee754/ldbl-96/s_tanl.c
index 3fbe4a8f6b..b4163792c5 100644
--- a/sysdeps/ieee754/ldbl-96/s_tanl.c
+++ b/sysdeps/ieee754/ldbl-96/s_tanl.c
@@ -51,6 +51,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <errno.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 
 long double __tanl(long double x)
 {
@@ -78,4 +79,4 @@ long double __tanl(long double x)
 							-1 -- n odd */
 	}
 }
-weak_alias (__tanl, tanl)
+libm_alias_ldouble (__tan, tan)
diff --git a/sysdeps/ieee754/ldbl-96/s_totalorderl.c b/sysdeps/ieee754/ldbl-96/s_totalorderl.c
index 2d3b3b7d05..b94842f73b 100644
--- a/sysdeps/ieee754/ldbl-96/s_totalorderl.c
+++ b/sysdeps/ieee754/ldbl-96/s_totalorderl.c
@@ -19,6 +19,7 @@
 #include <float.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 #include <nan-high-order-bit.h>
 #include <stdint.h>
 
@@ -55,4 +56,4 @@ __totalorderl (long double x, long double y)
   ly ^= y_sign;
   return expx < expy || (expx == expy && (hx < hy || (hx == hy && lx <= ly)));
 }
-weak_alias (__totalorderl, totalorderl)
+libm_alias_ldouble (__totalorder, totalorder)
diff --git a/sysdeps/ieee754/ldbl-96/s_totalordermagl.c b/sysdeps/ieee754/ldbl-96/s_totalordermagl.c
index 2d22a0c518..b771a2c28e 100644
--- a/sysdeps/ieee754/ldbl-96/s_totalordermagl.c
+++ b/sysdeps/ieee754/ldbl-96/s_totalordermagl.c
@@ -19,6 +19,7 @@
 #include <float.h>
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-ldouble.h>
 #include <nan-high-order-bit.h>
 #include <stdint.h>
 
@@ -49,4 +50,4 @@ __totalordermagl (long double x, long double y)
 #endif
   return expx < expy || (expx == expy && (hx < hy || (hx == hy && lx <= ly)));
 }
-weak_alias (__totalordermagl, totalordermagl)
+libm_alias_ldouble (__totalordermag, totalordermag)
diff --git a/sysdeps/ieee754/ldbl-96/s_ufromfpl.c b/sysdeps/ieee754/ldbl-96/s_ufromfpl.c
index 2176aa0cdd..22935e6ef7 100644
--- a/sysdeps/ieee754/ldbl-96/s_ufromfpl.c
+++ b/sysdeps/ieee754/ldbl-96/s_ufromfpl.c
@@ -2,4 +2,4 @@
 #define INEXACT 0
 #define FUNC __ufromfpl
 #include <s_fromfpl_main.c>
-weak_alias (__ufromfpl, ufromfpl)
+libm_alias_ldouble (__ufromfp, ufromfp)
diff --git a/sysdeps/ieee754/ldbl-96/s_ufromfpxl.c b/sysdeps/ieee754/ldbl-96/s_ufromfpxl.c
index 2901151312..77a5423de8 100644
--- a/sysdeps/ieee754/ldbl-96/s_ufromfpxl.c
+++ b/sysdeps/ieee754/ldbl-96/s_ufromfpxl.c
@@ -2,4 +2,4 @@
 #define INEXACT 1
 #define FUNC __ufromfpxl
 #include <s_fromfpl_main.c>
-weak_alias (__ufromfpxl, ufromfpxl)
+libm_alias_ldouble (__ufromfpx, ufromfpx)