Add libm_alias_finite for _finite symbols

This patch adds a new macro, libm_alias_finite, to define all _finite
symbol.  It sets all _finite symbol as compat symbol based on its first
version (obtained from the definition at built generated first-versions.h).

The <fn>f128_finite symbols were introduced in GLIBC 2.26 and so need
special treatment in code that is shared between long double and float128.
It is done by adding a list, similar to internal symbol redifinition,
on sysdeps/ieee754/float128/float128_private.h.

Alpha also needs some tricky changes to ensure we still emit 2 compat
symbols for sqrt(f).

Passes buildmanyglibc.

Co-authored-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>

47 files changed, 58 insertions, 49 deletions

diff --git a/sysdeps/m68k/coldfire/fpu/e_sqrt.c b/sysdeps/m68k/coldfire/fpu/e_sqrt.c
index 02ad2ac383..c67630d1b8 100644
--- a/sysdeps/m68k/coldfire/fpu/e_sqrt.c
+++ b/sysdeps/m68k/coldfire/fpu/e_sqrt.c
@@ -15,10 +15,12 @@
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-finite.h>
+
 double
 __ieee754_sqrt (double x)
 {
   asm ("fdsqrt.d %1,%0" : "=f" (x) : "fm" (x));
   return x;
 }
-strong_alias (__ieee754_sqrt, __sqrt_finite)
+libm_alias_finite (__ieee754_sqrt, __sqrt)
diff --git a/sysdeps/m68k/coldfire/fpu/e_sqrtf.c b/sysdeps/m68k/coldfire/fpu/e_sqrtf.c
index d3079f38f1..c2e4928957 100644
--- a/sysdeps/m68k/coldfire/fpu/e_sqrtf.c
+++ b/sysdeps/m68k/coldfire/fpu/e_sqrtf.c
@@ -15,6 +15,8 @@
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-finite.h>
+
 float
 __ieee754_sqrtf (float x)
 {
@@ -22,4 +24,4 @@ __ieee754_sqrtf (float x)
   asm ("fssqrt.s %1,%0" : "=f" (result) : "dm" (x));
   return result;
 }
-strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+libm_alias_finite (__ieee754_sqrtf, __sqrtf)
diff --git a/sysdeps/m68k/m680x0/fpu/e_acos.c b/sysdeps/m68k/m680x0/fpu/e_acos.c
index 870f190cd0..7fbd123847 100644
--- a/sysdeps/m68k/m680x0/fpu/e_acos.c
+++ b/sysdeps/m68k/m680x0/fpu/e_acos.c
@@ -18,10 +18,11 @@
 #include <math.h>
 #include <math_private.h>
 #include "mathimpl.h"
+#include <libm-alias-finite.h>
 
 #ifndef	FUNC
 # define FUNC __ieee754_acos
-# define FUNC_FINITE __acos_finite
+# define FUNC_FINITE __acos
 #endif
 #ifndef float_type
 # define float_type double
@@ -33,5 +34,5 @@ FUNC (float_type x)
   return __m81_u(FUNC)(x);
 }
 #ifdef FUNC_FINITE
-strong_alias (FUNC, FUNC_FINITE)
+libm_alias_finite (FUNC, FUNC_FINITE)
 #endif
diff --git a/sysdeps/m68k/m680x0/fpu/e_acosf.c b/sysdeps/m68k/m680x0/fpu/e_acosf.c
index 300fff601e..b21d8b715d 100644
--- a/sysdeps/m68k/m680x0/fpu/e_acosf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_acosf.c
@@ -1,6 +1,6 @@
 #ifndef	FUNC
 # define FUNC __ieee754_acosf
-# define FUNC_FINITE __acosf_finite
+# define FUNC_FINITE __acosf
 #endif
 #define float_type float
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_acosl.c b/sysdeps/m68k/m680x0/fpu/e_acosl.c
index 35767f4e23..b1c2c70b5d 100644
--- a/sysdeps/m68k/m680x0/fpu/e_acosl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_acosl.c
@@ -1,6 +1,6 @@
 #ifndef FUNC
 # define FUNC __ieee754_acosl
-# define FUNC_FINITE __acosl_finite
+# define FUNC_FINITE __acosl
 #endif
 #define float_type long double
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_asin.c b/sysdeps/m68k/m680x0/fpu/e_asin.c
index 271a1f23d2..76f28680cb 100644
--- a/sysdeps/m68k/m680x0/fpu/e_asin.c
+++ b/sysdeps/m68k/m680x0/fpu/e_asin.c
@@ -1,3 +1,3 @@
 #define	FUNC	__ieee754_asin
-#define	FUNC_FINITE __asin_finite
+#define	FUNC_FINITE __asin
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_asinf.c b/sysdeps/m68k/m680x0/fpu/e_asinf.c
index ece691c6fb..db051be884 100644
--- a/sysdeps/m68k/m680x0/fpu/e_asinf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_asinf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_asinf
-#define FUNC_FINITE __asinf_finite
+#define FUNC_FINITE __asinf
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_asinl.c b/sysdeps/m68k/m680x0/fpu/e_asinl.c
index 0c136f30eb..d0aa4fa658 100644
--- a/sysdeps/m68k/m680x0/fpu/e_asinl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_asinl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_asinl
-#define FUNC_FINITE __asinl_finite
+#define FUNC_FINITE __asinl
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_atan2.c b/sysdeps/m68k/m680x0/fpu/e_atan2.c
index d3b2bd1ecf..74b9c55180 100644
--- a/sysdeps/m68k/m680x0/fpu/e_atan2.c
+++ b/sysdeps/m68k/m680x0/fpu/e_atan2.c
@@ -18,6 +18,7 @@
 #include <math.h>
 #include <math_private.h>
 #include "mathimpl.h"
+#include <libm-alias-finite.h>
 
 #ifndef SUFF
 #define SUFF
@@ -101,4 +102,4 @@ s(__ieee754_atan2) (float_type y, float_type x)
     }
   return z;
 }
-strong_alias (s(__ieee754_atan2), CONCATX (s (__atan2), _finite))
+libm_alias_finite (s(__ieee754_atan2), s (__atan2))
diff --git a/sysdeps/m68k/m680x0/fpu/e_atanh.c b/sysdeps/m68k/m680x0/fpu/e_atanh.c
index f5f7e7b520..50978bed34 100644
--- a/sysdeps/m68k/m680x0/fpu/e_atanh.c
+++ b/sysdeps/m68k/m680x0/fpu/e_atanh.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_atanh
-#define FUNC_FINITE __atanh_finite
+#define FUNC_FINITE __atanh
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_atanhf.c b/sysdeps/m68k/m680x0/fpu/e_atanhf.c
index cb464cbb7d..d46ca735a0 100644
--- a/sysdeps/m68k/m680x0/fpu/e_atanhf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_atanhf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_atanhf
-#define	FUNC_FINITE __atanhf_finite
+#define	FUNC_FINITE __atanhf
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_atanhl.c b/sysdeps/m68k/m680x0/fpu/e_atanhl.c
index 8f276f5fad..0e58e14b3d 100644
--- a/sysdeps/m68k/m680x0/fpu/e_atanhl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_atanhl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_atanhl
-#define FUNC_FINITE __atanhl_finite
+#define FUNC_FINITE __atanhl
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_cosh.c b/sysdeps/m68k/m680x0/fpu/e_cosh.c
index aaba11be3a..2da818bc6c 100644
--- a/sysdeps/m68k/m680x0/fpu/e_cosh.c
+++ b/sysdeps/m68k/m680x0/fpu/e_cosh.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_cosh
-#define FUNC_FINITE __cosh_finite
+#define FUNC_FINITE __cosh
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_coshf.c b/sysdeps/m68k/m680x0/fpu/e_coshf.c
index 0884741c5c..11f3a20c61 100644
--- a/sysdeps/m68k/m680x0/fpu/e_coshf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_coshf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_coshf
-#define FUNC_FINITE __coshf_finite
+#define FUNC_FINITE __coshf
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_coshl.c b/sysdeps/m68k/m680x0/fpu/e_coshl.c
index 7fc9b7b91c..7fdc933787 100644
--- a/sysdeps/m68k/m680x0/fpu/e_coshl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_coshl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_coshl
-#define FUNC_FINITE __coshl_finite
+#define FUNC_FINITE __coshl
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_exp.c b/sysdeps/m68k/m680x0/fpu/e_exp.c
index 9f228034a1..a302e26ea4 100644
--- a/sysdeps/m68k/m680x0/fpu/e_exp.c
+++ b/sysdeps/m68k/m680x0/fpu/e_exp.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_exp
-#define FUNC_FINITE __exp_finite
+#define FUNC_FINITE __exp
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_exp10.c b/sysdeps/m68k/m680x0/fpu/e_exp10.c
index e66a80599c..a2224acbe6 100644
--- a/sysdeps/m68k/m680x0/fpu/e_exp10.c
+++ b/sysdeps/m68k/m680x0/fpu/e_exp10.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_exp10
-#define FUNC_FINITE __exp10_finite
+#define FUNC_FINITE __exp10
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_exp10f.c b/sysdeps/m68k/m680x0/fpu/e_exp10f.c
index 7a3bdd4186..f58fddd8a6 100644
--- a/sysdeps/m68k/m680x0/fpu/e_exp10f.c
+++ b/sysdeps/m68k/m680x0/fpu/e_exp10f.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_exp10f
-#define FUNC_FINITE __exp10f_finite
+#define FUNC_FINITE __exp10f
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_exp10l.c b/sysdeps/m68k/m680x0/fpu/e_exp10l.c
index e2a6255a76..2051ed4971 100644
--- a/sysdeps/m68k/m680x0/fpu/e_exp10l.c
+++ b/sysdeps/m68k/m680x0/fpu/e_exp10l.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_exp10l
-#define FUNC_FINITE __exp10l_finite
+#define FUNC_FINITE __exp10l
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_exp2.c b/sysdeps/m68k/m680x0/fpu/e_exp2.c
index 35e29ae653..7ff26f0dc8 100644
--- a/sysdeps/m68k/m680x0/fpu/e_exp2.c
+++ b/sysdeps/m68k/m680x0/fpu/e_exp2.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_exp2
-#define FUNC_FINITE __exp2_finite
+#define FUNC_FINITE __exp2
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_exp2f.c b/sysdeps/m68k/m680x0/fpu/e_exp2f.c
index e57ddb5365..68557e41ee 100644
--- a/sysdeps/m68k/m680x0/fpu/e_exp2f.c
+++ b/sysdeps/m68k/m680x0/fpu/e_exp2f.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_exp2f
-#define FUNC_FINITE __exp2f_finite
+#define FUNC_FINITE __exp2f
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_exp2l.c b/sysdeps/m68k/m680x0/fpu/e_exp2l.c
index c5854ae427..e3b191d8ff 100644
--- a/sysdeps/m68k/m680x0/fpu/e_exp2l.c
+++ b/sysdeps/m68k/m680x0/fpu/e_exp2l.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_exp2l
-#define FUNC_FINITE __exp2l_finite
+#define FUNC_FINITE __exp2l
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_expf.c b/sysdeps/m68k/m680x0/fpu/e_expf.c
index af1e019504..76aa5ff3d6 100644
--- a/sysdeps/m68k/m680x0/fpu/e_expf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_expf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_expf
-#define FUNC_FINITE __expf_finite
+#define FUNC_FINITE __expf
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_expl.c b/sysdeps/m68k/m680x0/fpu/e_expl.c
index 543eb0edf5..b807c51bf5 100644
--- a/sysdeps/m68k/m680x0/fpu/e_expl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_expl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_expl
-#define FUNC_FINITE __expl_finite
+#define FUNC_FINITE __expl
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_fmod.c b/sysdeps/m68k/m680x0/fpu/e_fmod.c
index 1fb40eda95..08418f6e30 100644
--- a/sysdeps/m68k/m680x0/fpu/e_fmod.c
+++ b/sysdeps/m68k/m680x0/fpu/e_fmod.c
@@ -18,10 +18,11 @@
 #include <math.h>
 #include <math_private.h>
 #include "mathimpl.h"
+#include <libm-alias-finite.h>
 
 #ifndef FUNC
 # define FUNC __ieee754_fmod
-# define FUNC_FINITE __fmod_finite
+# define FUNC_FINITE __fmod
 #endif
 #ifndef float_type
 # define float_type double
@@ -33,5 +34,5 @@ FUNC (float_type x, float_type y)
   return __m81_u(FUNC)(x, y);
 }
 #ifdef FUNC_FINITE
-strong_alias (FUNC, FUNC_FINITE)
+libm_alias_finite (FUNC, FUNC_FINITE)
 #endif
diff --git a/sysdeps/m68k/m680x0/fpu/e_fmodf.c b/sysdeps/m68k/m680x0/fpu/e_fmodf.c
index 38995c3768..ffae68f17f 100644
--- a/sysdeps/m68k/m680x0/fpu/e_fmodf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_fmodf.c
@@ -1,6 +1,6 @@
 #ifndef FUNC
 # define FUNC __ieee754_fmodf
-# define FUNC_FINITE __fmodf_finite
+# define FUNC_FINITE __fmodf
 #endif
 #define float_type float
 #include <e_fmod.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_fmodl.c b/sysdeps/m68k/m680x0/fpu/e_fmodl.c
index 8d793b2de7..8f1cbabda6 100644
--- a/sysdeps/m68k/m680x0/fpu/e_fmodl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_fmodl.c
@@ -1,6 +1,6 @@
 #ifndef FUNC
 # define FUNC __ieee754_fmodl
-# define FUNC_FINITE __fmodl_finite
+# define FUNC_FINITE __fmodl
 #endif
 #define float_type long double
 #include <e_fmod.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_log.c b/sysdeps/m68k/m680x0/fpu/e_log.c
index 628c62b31a..acc113b952 100644
--- a/sysdeps/m68k/m680x0/fpu/e_log.c
+++ b/sysdeps/m68k/m680x0/fpu/e_log.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_log
-#define FUNC_FINITE __log_finite
+#define FUNC_FINITE __log
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_log10.c b/sysdeps/m68k/m680x0/fpu/e_log10.c
index 78e0693e9d..11ff6c2801 100644
--- a/sysdeps/m68k/m680x0/fpu/e_log10.c
+++ b/sysdeps/m68k/m680x0/fpu/e_log10.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_log10
-#define FUNC_FINITE __log10_finite
+#define FUNC_FINITE __log10
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_log10f.c b/sysdeps/m68k/m680x0/fpu/e_log10f.c
index 452a75ec15..fd54c47da4 100644
--- a/sysdeps/m68k/m680x0/fpu/e_log10f.c
+++ b/sysdeps/m68k/m680x0/fpu/e_log10f.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_log10f
-#define FUNC_FINITE __log10f_finite
+#define FUNC_FINITE __log10f
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_log10l.c b/sysdeps/m68k/m680x0/fpu/e_log10l.c
index 7c5dcb8e18..5807d3d50a 100644
--- a/sysdeps/m68k/m680x0/fpu/e_log10l.c
+++ b/sysdeps/m68k/m680x0/fpu/e_log10l.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_log10l
-#define FUNC_FINITE __log10l_finite
+#define FUNC_FINITE __log10l
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_log2.c b/sysdeps/m68k/m680x0/fpu/e_log2.c
index a00ddbdc96..74610e58f6 100644
--- a/sysdeps/m68k/m680x0/fpu/e_log2.c
+++ b/sysdeps/m68k/m680x0/fpu/e_log2.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_log2
-#define FUNC_FINITE __log2_finite
+#define FUNC_FINITE __log2
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_log2f.c b/sysdeps/m68k/m680x0/fpu/e_log2f.c
index 670b69c8a9..77ea067429 100644
--- a/sysdeps/m68k/m680x0/fpu/e_log2f.c
+++ b/sysdeps/m68k/m680x0/fpu/e_log2f.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_log2f
-#define FUNC_FINITE __log2f_finite
+#define FUNC_FINITE __log2f
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_log2l.c b/sysdeps/m68k/m680x0/fpu/e_log2l.c
index 4a97a00235..72e6bf4fad 100644
--- a/sysdeps/m68k/m680x0/fpu/e_log2l.c
+++ b/sysdeps/m68k/m680x0/fpu/e_log2l.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_log2l
-#define FUNC_FINITE __log2l_finite
+#define FUNC_FINITE __log2l
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_logf.c b/sysdeps/m68k/m680x0/fpu/e_logf.c
index 1989a95431..0fa0311dde 100644
--- a/sysdeps/m68k/m680x0/fpu/e_logf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_logf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_logf
-#define FUNC_FINITE __logf_finite
+#define FUNC_FINITE __logf
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_logl.c b/sysdeps/m68k/m680x0/fpu/e_logl.c
index 9ab842c3fc..322ebdab85 100644
--- a/sysdeps/m68k/m680x0/fpu/e_logl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_logl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_logl
-#define FUNC_FINITE __logl_finite
+#define FUNC_FINITE __logl
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_pow.c b/sysdeps/m68k/m680x0/fpu/e_pow.c
index d30d8452dc..b073d88037 100644
--- a/sysdeps/m68k/m680x0/fpu/e_pow.c
+++ b/sysdeps/m68k/m680x0/fpu/e_pow.c
@@ -18,6 +18,7 @@
 #include <math.h>
 #include <math_private.h>
 #include "mathimpl.h"
+#include <libm-alias-finite.h>
 
 #ifndef SUFF
 #define SUFF
@@ -123,4 +124,4 @@ s(__ieee754_pow) (float_type x, float_type y)
     z = m81(__ieee754_exp) (y * m81(__ieee754_log) (x));
   return z;
 }
-strong_alias (s(__ieee754_pow), CONCATX (s(__pow), _finite))
+libm_alias_finite (s(__ieee754_pow), s (__pow))
diff --git a/sysdeps/m68k/m680x0/fpu/e_remainder.c b/sysdeps/m68k/m680x0/fpu/e_remainder.c
index f7732af8c5..cc1422c48b 100644
--- a/sysdeps/m68k/m680x0/fpu/e_remainder.c
+++ b/sysdeps/m68k/m680x0/fpu/e_remainder.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_remainder
-#define FUNC_FINITE __remainder_finite
+#define FUNC_FINITE __remainder
 #include <e_fmod.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_remainderf.c b/sysdeps/m68k/m680x0/fpu/e_remainderf.c
index 94b53e7a80..77f1f029b0 100644
--- a/sysdeps/m68k/m680x0/fpu/e_remainderf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_remainderf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_remainderf
-#define FUNC_FINITE __remainderf_finite
+#define FUNC_FINITE __remainderf
 #include <e_fmodf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_remainderl.c b/sysdeps/m68k/m680x0/fpu/e_remainderl.c
index d5b59607ab..ce3490a5ec 100644
--- a/sysdeps/m68k/m680x0/fpu/e_remainderl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_remainderl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_remainderl
-#define FUNC_FINITE __remainderl_finite
+#define FUNC_FINITE __remainderl
 #include <e_fmodl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_scalb.c b/sysdeps/m68k/m680x0/fpu/e_scalb.c
index eea705cfde..b1be8607cb 100644
--- a/sysdeps/m68k/m680x0/fpu/e_scalb.c
+++ b/sysdeps/m68k/m680x0/fpu/e_scalb.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <math_private.h>
 #include "mathimpl.h"
+#include <libm-alias-finite.h>
 
 #ifndef SUFF
 #define SUFF
@@ -57,4 +58,4 @@ s(__ieee754_scalb) (float_type x, float_type fn)
   __asm ("fscale%.x %1, %0" : "=f" (retval) : "f" (fn), "0" (x));
   return retval;
 }
-strong_alias (s(__ieee754_scalb), CONCATX (s(__scalb), _finite))
+libm_alias_finite (s(__ieee754_scalb), s (__scalb))
diff --git a/sysdeps/m68k/m680x0/fpu/e_sinh.c b/sysdeps/m68k/m680x0/fpu/e_sinh.c
index 1e1b1c1180..3ab63c52da 100644
--- a/sysdeps/m68k/m680x0/fpu/e_sinh.c
+++ b/sysdeps/m68k/m680x0/fpu/e_sinh.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_sinh
-#define FUNC_FINITE __sinh_finite
+#define FUNC_FINITE __sinh
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_sinhf.c b/sysdeps/m68k/m680x0/fpu/e_sinhf.c
index 13c79f9d96..20f460b8bf 100644
--- a/sysdeps/m68k/m680x0/fpu/e_sinhf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_sinhf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_sinhf
-#define FUNC_FINITE __sinhf_finite
+#define FUNC_FINITE __sinhf
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_sinhl.c b/sysdeps/m68k/m680x0/fpu/e_sinhl.c
index 47f0f24401..bf85464405 100644
--- a/sysdeps/m68k/m680x0/fpu/e_sinhl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_sinhl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_sinhl
-#define FUNC_FINITE __sinhl_finite
+#define FUNC_FINITE __sinhl
 #include <e_acosl.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_sqrt.c b/sysdeps/m68k/m680x0/fpu/e_sqrt.c
index 9a250cbc25..57a90d853d 100644
--- a/sysdeps/m68k/m680x0/fpu/e_sqrt.c
+++ b/sysdeps/m68k/m680x0/fpu/e_sqrt.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_sqrt
-#define FUNC_FINITE __sqrt_finite
+#define FUNC_FINITE __sqrt
 #include <e_acos.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_sqrtf.c b/sysdeps/m68k/m680x0/fpu/e_sqrtf.c
index 372c3eb2f4..8681e29fae 100644
--- a/sysdeps/m68k/m680x0/fpu/e_sqrtf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_sqrtf.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_sqrtf
-#define FUNC_FINITE __sqrtf_finite
+#define FUNC_FINITE __sqrtf
 #include <e_acosf.c>
diff --git a/sysdeps/m68k/m680x0/fpu/e_sqrtl.c b/sysdeps/m68k/m680x0/fpu/e_sqrtl.c
index df5f44e6a7..6a109d2410 100644
--- a/sysdeps/m68k/m680x0/fpu/e_sqrtl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_sqrtl.c
@@ -1,3 +1,3 @@
 #define FUNC __ieee754_sqrtl
-#define FUNC_FINITE __sqrtl_finite
+#define FUNC_FINITE __sqrtl
 #include <e_acosl.c>