4 files changed, 51 insertions, 5 deletions
diff --git a/sysdeps/generic/libm-alias-double.h b/sysdeps/generic/libm-alias-double.h
index 23b5990e36..0593ad9886 100644
--- a/sysdeps/generic/libm-alias-double.h
+++ b/sysdeps/generic/libm-alias-double.h
@@ -19,6 +19,16 @@
 #ifndef _LIBM_ALIAS_DOUBLE_H
 #define _LIBM_ALIAS_DOUBLE_H
 
+/* Define _FloatN / _FloatNx aliases for a double libm function that
+   has internal name FROM ## R and public names TO ## suffix ## R for
+   each suffix of a supported _FloatN / _FloatNx floating-point type
+   with the same format as double.  */
+#define libm_alias_double_other_r(from, to, r)
+
+/* Likewise, but without the R suffix.  */
+#define libm_alias_double_other(from, to)	\
+  libm_alias_double_other_r (from, to, )
+
 /* Define aliases for a double libm function that has internal name
    FROM ## R and public names TO ## suffix ## R for each suffix of a
    supported floating-point type with the same format as double.  This
@@ -30,10 +40,12 @@
 # define libm_alias_double_r(from, to, r)	\
   weak_alias (from ## r, to ## r)		\
   strong_alias (from ## r, from ## l ## r)	\
-  weak_alias (from ## r, to ## l ## r)
+  weak_alias (from ## r, to ## l ## r)		\
+  libm_alias_double_other_r (from, to, r)
 #else
 # define libm_alias_double_r(from, to, r)	\
-  weak_alias (from ## r, to ## r)
+  weak_alias (from ## r, to ## r)		\
+  libm_alias_double_other_r (from, to, r)
 #endif
 
 /* Likewise, but without the R suffix.  */
diff --git a/sysdeps/generic/libm-alias-float.h b/sysdeps/generic/libm-alias-float.h
index 23f0166697..11bd472a53 100644
--- a/sysdeps/generic/libm-alias-float.h
+++ b/sysdeps/generic/libm-alias-float.h
@@ -19,6 +19,16 @@
 #ifndef _LIBM_ALIAS_FLOAT_H
 #define _LIBM_ALIAS_FLOAT_H
 
+/* Define _FloatN / _FloatNx aliases for a float libm function that
+   has internal name FROM ## f ## R and public names TO ## suffix ## R
+   for each suffix of a supported _FloatN / _FloatNx floating-point
+   type with the same format as float.  */
+#define libm_alias_float_other_r(from, to, r)
+
+/* Likewise, but without the R suffix.  */
+#define libm_alias_float_other(from, to)	\
+  libm_alias_float_other_r (from, to, )
+
 /* Define aliases for a float libm function that has internal name
    FROM ## f ## R and public names TO ## suffix ## R for each suffix
    of a supported floating-point type with the same format as float.
@@ -27,7 +37,8 @@
    names (where there is one name per format, not per type) or for
    obsolescent functions not provided for _FloatN types.  */
 #define libm_alias_float_r(from, to, r)		\
-  weak_alias (from ## f ## r, to ## f ## r)
+  weak_alias (from ## f ## r, to ## f ## r)	\
+  libm_alias_float_other_r (from, to, r)
 
 /* Likewise, but without the R suffix.  */
 #define libm_alias_float(from, to) libm_alias_float_r (from, to, )
diff --git a/sysdeps/generic/libm-alias-float128.h b/sysdeps/generic/libm-alias-float128.h
index 6bb1cb1117..8a7ebf32ac 100644
--- a/sysdeps/generic/libm-alias-float128.h
+++ b/sysdeps/generic/libm-alias-float128.h
@@ -19,6 +19,17 @@
 #ifndef _LIBM_ALIAS_FLOAT128_H
 #define _LIBM_ALIAS_FLOAT128_H
 
+/* Define _FloatN / _FloatNx aliases (other than that for _Float128)
+   for a _Float128 libm function that has internal name FROM ## f128
+   ## R and public names TO ## suffix ## R for each suffix of a
+   supported _FloatN / _FloatNx floating-point type with the same
+   format as _Float128.  */
+#define libm_alias_float128_other_r(from, to, r)
+
+/* Likewise, but without the R suffix.  */
+#define libm_alias_float128_other(from, to)	\
+  libm_alias_float128_other_r (from, to, )
+
 /* Define aliases for a _Float128 libm function that has internal name
    FROM ## f128 ## R and public names TO ## suffix ## R for each
    suffix of a supported floating-point type with the same format as
@@ -28,7 +39,8 @@
    per format, not per type) or for obsolescent functions not provided
    for _FloatN types.  */
 #define libm_alias_float128_r(from, to, r)		\
-  weak_alias (from ## f128 ## r, to ## f128 ## r)
+  weak_alias (from ## f128 ## r, to ## f128 ## r)	\
+  libm_alias_float128_other_r (from, to, r)
 
 /* Likewise, but without the R suffix.  */
 #define libm_alias_float128(from, to) libm_alias_float128_r (from, to, )
diff --git a/sysdeps/generic/libm-alias-ldouble.h b/sysdeps/generic/libm-alias-ldouble.h
index 7414b922e1..82dafd513e 100644
--- a/sysdeps/generic/libm-alias-ldouble.h
+++ b/sysdeps/generic/libm-alias-ldouble.h
@@ -19,6 +19,16 @@
 #ifndef _LIBM_ALIAS_LDOUBLE_H
 #define _LIBM_ALIAS_LDOUBLE_H
 
+/* Define _FloatN / _FloatNx aliases for a long double libm function
+   that has internal name FROM ## l ## R and public names TO ## suffix
+   ## R for each suffix of a supported _FloatN / _FloatNx
+   floating-point type with the same format as long double.  */
+#define libm_alias_ldouble_other_r(from, to, r)
+
+/* Likewise, but without the R suffix.  */
+#define libm_alias_ldouble_other(from, to)	\
+  libm_alias_ldouble_other_r (from, to, )
+
 /* Define aliases for a long double libm function that has internal
    name FROM ## l ## R and public names TO ## suffix ## R for each
    suffix of a supported floating-point type with the same format as
@@ -28,7 +38,8 @@
    per format, not per type) or for obsolescent functions not provided
    for _FloatN types.  */
 #define libm_alias_ldouble_r(from, to, r)	\
-  weak_alias (from ## l ## r, to ## l ## r)
+  weak_alias (from ## l ## r, to ## l ## r)	\
+  libm_alias_ldouble_other_r (from, to, r)
 
 /* Likewise, but without the R suffix.  */
 #define libm_alias_ldouble(from, to) libm_alias_ldouble_r (from, to, )