24 files changed, 51 insertions, 130 deletions

diff --git a/math/s_fma.c b/math/s_fma.c
index dc1cc65bbe..929ca581db 100644
--- a/math/s_fma.c
+++ b/math/s_fma.c
@@ -18,6 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include <libm-alias-double.h>
 
 double
 __fma (double x, double y, double z)
@@ -25,10 +26,5 @@ __fma (double x, double y, double z)
   return (x * y) + z;
 }
 #ifndef __fma
-weak_alias (__fma, fma)
-#endif
-
-#ifdef NO_LONG_DOUBLE
-strong_alias (__fma, __fmal)
-weak_alias (__fmal, fmal)
+libm_alias_double (__fma, fma)
 #endif
diff --git a/math/s_nextafter.c b/math/s_nextafter.c
index 72419cbe9a..fbf440e519 100644
--- a/math/s_nextafter.c
+++ b/math/s_nextafter.c
@@ -29,6 +29,7 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp
 #include <math.h>
 #include <math_private.h>
 #include <float.h>
+#include <libm-alias-double.h>
 
 double __nextafter(double x, double y)
 {
@@ -83,10 +84,8 @@ double __nextafter(double x, double y)
 	INSERT_WORDS(x,hx,lx);
 	return x;
 }
-weak_alias (__nextafter, nextafter)
+libm_alias_double (__nextafter, nextafter)
 #ifdef NO_LONG_DOUBLE
-strong_alias (__nextafter, __nextafterl)
-weak_alias (__nextafter, nextafterl)
 strong_alias (__nextafter, __nexttowardl)
 weak_alias (__nexttowardl, nexttowardl)
 #undef __nexttoward
diff --git a/math/w_acos_compat.c b/math/w_acos_compat.c
index 1930105153..113e1d7a83 100644
--- a/math/w_acos_compat.c
+++ b/math/w_acos_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -37,9 +38,5 @@ __acos (double x)
 
   return __ieee754_acos (x);
 }
-weak_alias (__acos, acos)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__acos, __acosl)
-weak_alias (__acos, acosl)
-# endif
+libm_alias_double (__acos, acos)
 #endif
diff --git a/math/w_acosh_compat.c b/math/w_acosh_compat.c
index f6d298e17b..882537ab83 100644
--- a/math/w_acosh_compat.c
+++ b/math/w_acosh_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -32,9 +33,5 @@ __acosh (double x)
 
   return __ieee754_acosh (x);
 }
-weak_alias (__acosh, acosh)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__acosh, __acoshl)
-weak_alias (__acosh, acoshl)
-# endif
+libm_alias_double (__acosh, acosh)
 #endif
diff --git a/math/w_asin_compat.c b/math/w_asin_compat.c
index 7780f85883..0c19564f18 100644
--- a/math/w_asin_compat.c
+++ b/math/w_asin_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -37,9 +38,5 @@ __asin (double x)
 
   return __ieee754_asin (x);
 }
-weak_alias (__asin, asin)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__asin, __asinl)
-weak_alias (__asin, asinl)
-# endif
+libm_alias_double (__asin, asin)
 #endif
diff --git a/math/w_atan2_compat.c b/math/w_atan2_compat.c
index 1ca3349207..8162e7b28c 100644
--- a/math/w_atan2_compat.c
+++ b/math/w_atan2_compat.c
@@ -24,6 +24,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -40,9 +41,5 @@ __atan2 (double y, double x)
     __set_errno (ERANGE);
   return z;
 }
-weak_alias (__atan2, atan2)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__atan2, __atan2l)
-weak_alias (__atan2, atan2l)
-# endif
+libm_alias_double (__atan2, atan2)
 #endif
diff --git a/math/w_atanh_compat.c b/math/w_atanh_compat.c
index c2cbb2ee5f..4b29a66243 100644
--- a/math/w_atanh_compat.c
+++ b/math/w_atanh_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -35,9 +36,5 @@ __atanh (double x)
 
   return __ieee754_atanh (x);
 }
-weak_alias (__atanh, atanh)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__atanh, __atanhl)
-weak_alias (__atanh, atanhl)
-# endif
+libm_alias_double (__atanh, atanh)
 #endif
diff --git a/math/w_cosh_compat.c b/math/w_cosh_compat.c
index d0cb6b165f..6941807d9b 100644
--- a/math/w_cosh_compat.c
+++ b/math/w_cosh_compat.c
@@ -17,6 +17,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 #if LIBM_SVID_COMPAT
 double
@@ -29,9 +30,5 @@ __cosh (double x)
 
 	return z;
 }
-weak_alias (__cosh, cosh)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__cosh, __coshl)
-weak_alias (__cosh, coshl)
-# endif
+libm_alias_double (__cosh, cosh)
 #endif
diff --git a/math/w_exp10_compat.c b/math/w_exp10_compat.c
index 42dc312ee8..a91b98ff22 100644
--- a/math/w_exp10_compat.c
+++ b/math/w_exp10_compat.c
@@ -24,6 +24,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 #if LIBM_SVID_COMPAT
 double
@@ -37,14 +38,12 @@ __exp10 (double x)
 
   return z;
 }
-weak_alias (__exp10, exp10)
+libm_alias_double (__exp10, exp10)
 # if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
 strong_alias (__exp10, __pow10)
 compat_symbol (libm, __pow10, pow10, GLIBC_2_1);
 # endif
 # ifdef NO_LONG_DOUBLE
-strong_alias (__exp10, __exp10l)
-weak_alias (__exp10, exp10l)
 #  if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
 strong_alias (__exp10l, __pow10l)
 compat_symbol (libm, __pow10l, pow10l, GLIBC_2_1);
diff --git a/math/w_exp2_compat.c b/math/w_exp2_compat.c
index 5739547859..7ab618292f 100644
--- a/math/w_exp2_compat.c
+++ b/math/w_exp2_compat.c
@@ -5,6 +5,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 #if LIBM_SVID_COMPAT
 double
@@ -18,9 +19,5 @@ __exp2 (double x)
 
   return z;
 }
-weak_alias (__exp2, exp2)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__exp2, __exp2l)
-weak_alias (__exp2, exp2l)
-# endif
+libm_alias_double (__exp2, exp2)
 #endif
diff --git a/math/w_exp_compat.c b/math/w_exp_compat.c
index 98aa5b76a0..d5666b7cf7 100644
--- a/math/w_exp_compat.c
+++ b/math/w_exp_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 #if LIBM_SVID_COMPAT
 /* wrapper exp */
@@ -33,9 +34,5 @@ __exp (double x)
   return z;
 }
 hidden_def (__exp)
-weak_alias (__exp, exp)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__exp, __expl)
-weak_alias (__exp, expl)
-# endif
+libm_alias_double (__exp, exp)
 #endif
diff --git a/math/w_fmod_compat.c b/math/w_fmod_compat.c
index f75b8615d0..a4d2ebefea 100644
--- a/math/w_fmod_compat.c
+++ b/math/w_fmod_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 #if LIBM_SVID_COMPAT
 /* wrapper fmod */
@@ -32,9 +33,5 @@ __fmod (double x, double y)
 
   return __ieee754_fmod (x, y);
 }
-weak_alias (__fmod, fmod)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__fmod, __fmodl)
-weak_alias (__fmod, fmodl)
-# endif
+libm_alias_double (__fmod, fmod)
 #endif
diff --git a/math/w_hypot_compat.c b/math/w_hypot_compat.c
index 21c7e65c5e..f07039cc51 100644
--- a/math/w_hypot_compat.c
+++ b/math/w_hypot_compat.c
@@ -17,6 +17,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -30,9 +31,5 @@ __hypot (double x, double y)
 
 	return z;
 }
-weak_alias (__hypot, hypot)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__hypot, __hypotl)
-weak_alias (__hypot, hypotl)
-# endif
+libm_alias_double (__hypot, hypot)
 #endif
diff --git a/math/w_j0_compat.c b/math/w_j0_compat.c
index b08688e131..03f0d8e118 100644
--- a/math/w_j0_compat.c
+++ b/math/w_j0_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -34,11 +35,7 @@ __j0 (double x)
 
   return __ieee754_j0 (x);
 }
-weak_alias (__j0, j0)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__j0, __j0l)
-weak_alias (__j0, j0l)
-# endif
+libm_alias_double (__j0, j0)
 
 
 /* wrapper y0 */
@@ -67,9 +64,5 @@ __y0 (double x)
 
   return __ieee754_y0 (x);
 }
-weak_alias (__y0, y0)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__y0, __y0l)
-weak_alias (__y0, y0l)
-# endif
+libm_alias_double (__y0, y0)
 #endif
diff --git a/math/w_j1_compat.c b/math/w_j1_compat.c
index bf0922d588..4f99ad1c37 100644
--- a/math/w_j1_compat.c
+++ b/math/w_j1_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -34,11 +35,7 @@ __j1 (double x)
 
   return __ieee754_j1 (x);
 }
-weak_alias (__j1, j1)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__j1, __j1l)
-weak_alias (__j1, j1l)
-# endif
+libm_alias_double (__j1, j1)
 
 
 /* wrapper y1 */
@@ -67,9 +64,5 @@ __y1 (double x)
 
   return __ieee754_y1 (x);
 }
-weak_alias (__y1, y1)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__y1, __y1l)
-weak_alias (__y1, y1l)
-# endif
+libm_alias_double (__y1, y1)
 #endif
diff --git a/math/w_jn_compat.c b/math/w_jn_compat.c
index 955996a2e6..767d904c74 100644
--- a/math/w_jn_compat.c
+++ b/math/w_jn_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -34,11 +35,7 @@ __jn (int n, double x)
 
   return __ieee754_jn (n, x);
 }
-weak_alias (__jn, jn)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__jn, __jnl)
-weak_alias (__jn, jnl)
-# endif
+libm_alias_double (__jn, jn)
 
 
 /* wrapper yn */
@@ -67,9 +64,5 @@ __yn (int n, double x)
 
   return __ieee754_yn (n, x);
 }
-weak_alias (__yn, yn)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__yn, __ynl)
-weak_alias (__yn, ynl)
-# endif
+libm_alias_double (__yn, yn)
 #endif
diff --git a/math/w_log10_compat.c b/math/w_log10_compat.c
index b8247aa886..edfbe8b1d7 100644
--- a/math/w_log10_compat.c
+++ b/math/w_log10_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -43,9 +44,5 @@ __log10 (double x)
 
   return  __ieee754_log10 (x);
 }
-weak_alias (__log10, log10)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__log10, __log10l)
-weak_alias (__log10, log10l)
-# endif
+libm_alias_double (__log10, log10)
 #endif
diff --git a/math/w_log2_compat.c b/math/w_log2_compat.c
index 6d1f9f2159..ed7076875f 100644
--- a/math/w_log2_compat.c
+++ b/math/w_log2_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -43,9 +44,5 @@ __log2 (double x)
 
   return  __ieee754_log2 (x);
 }
-weak_alias (__log2, log2)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__log2, __log2l)
-weak_alias (__log2, log2l)
-# endif
+libm_alias_double (__log2, log2)
 #endif
diff --git a/math/w_log_compat.c b/math/w_log_compat.c
index 80750b4371..66cce2d55f 100644
--- a/math/w_log_compat.c
+++ b/math/w_log_compat.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -43,9 +44,5 @@ __log (double x)
 
   return  __ieee754_log (x);
 }
-weak_alias (__log, log)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__log, __logl)
-weak_alias (__log, logl)
-# endif
+libm_alias_double (__log, log)
 #endif
diff --git a/math/w_pow_compat.c b/math/w_pow_compat.c
index 4865f4d0d6..929de92fae 100644
--- a/math/w_pow_compat.c
+++ b/math/w_pow_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -59,9 +60,5 @@ __pow (double x, double y)
 
   return z;
 }
-weak_alias (__pow, pow)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__pow, __powl)
-weak_alias (__pow, powl)
-# endif
+libm_alias_double (__pow, pow)
 #endif
diff --git a/math/w_remainder_compat.c b/math/w_remainder_compat.c
index 68e322efdc..2b7f8620e8 100644
--- a/math/w_remainder_compat.c
+++ b/math/w_remainder_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -33,11 +34,9 @@ __remainder (double x, double y)
 
   return __ieee754_remainder (x, y);
 }
-weak_alias (__remainder, remainder)
+libm_alias_double (__remainder, remainder)
 weak_alias (__remainder, drem)
 # ifdef NO_LONG_DOUBLE
-strong_alias (__remainder, __remainderl)
-weak_alias (__remainder, remainderl)
 weak_alias (__remainder, dreml)
 # endif
 #endif
diff --git a/math/w_sinh_compat.c b/math/w_sinh_compat.c
index e5c3724763..e964614f72 100644
--- a/math/w_sinh_compat.c
+++ b/math/w_sinh_compat.c
@@ -17,6 +17,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 #if LIBM_SVID_COMPAT
 double
@@ -29,9 +30,5 @@ __sinh (double x)
 
 	return z;
 }
-weak_alias (__sinh, sinh)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__sinh, __sinhl)
-weak_alias (__sinh, sinhl)
-# endif
+libm_alias_double (__sinh, sinh)
 #endif
diff --git a/math/w_sqrt_compat.c b/math/w_sqrt_compat.c
index aeead2e49c..3280d2fbb8 100644
--- a/math/w_sqrt_compat.c
+++ b/math/w_sqrt_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 
 #if LIBM_SVID_COMPAT
@@ -31,9 +32,5 @@ __sqrt (double x)
 
   return __ieee754_sqrt (x);
 }
-weak_alias (__sqrt, sqrt)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__sqrt, __sqrtl)
-weak_alias (__sqrt, sqrtl)
-# endif
+libm_alias_double (__sqrt, sqrt)
 #endif
diff --git a/math/w_tgamma_compat.c b/math/w_tgamma_compat.c
index f843475f10..219aa10862 100644
--- a/math/w_tgamma_compat.c
+++ b/math/w_tgamma_compat.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include <math-svid-compat.h>
+#include <libm-alias-double.h>
 
 #if LIBM_SVID_COMPAT
 double
@@ -41,9 +42,5 @@ __tgamma(double x)
 	}
 	return local_signgam < 0 ? -y : y;
 }
-weak_alias (__tgamma, tgamma)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__tgamma, __tgammal)
-weak_alias (__tgamma, tgammal)
-# endif
+libm_alias_double (__tgamma, tgamma)
 #endif