Support _Float64, _Float32x in libm_alias_double.

This patch makes the libm_alias_double macros support creating
_Float64 and _Float32x aliases, in preparation for enabling glibc
support for those types.

Tested for x86_64; also tested with build-many-glibcs.py in
conjunction with other _Float64 / _Float32x changes.

	* sysdeps/generic/libm-alias-double.h: Include <bits/floatn.h>.
	(libm_alias_double_other_r_f64): New macro.
	(libm_alias_double_other_r_f32x): Likewise.
	(libm_alias_double_other_r): Use libm_alias_double_other_r_f64 and
	libm_alias_double_other_r_f32x.
	(libm_alias_double_r): Use semicolon before call to
	libm_alias_double_other_r.
	* sysdeps/ieee754/ldbl-opt/libm-alias-double.h: Include
	<bits/floatn.h>.
	(libm_alias_double_other_r_f64): New macro.
	(libm_alias_double_other_r_f32x): Likewise.
	(libm_alias_double_other_r): Use libm_alias_double_other_r_f64 and
	libm_alias_double_other_r_f32x.

diff --git a/ChangeLog b/ChangeLog
index 5636a571fa838c610646d60159eed6a369ec5a85..afe13d3f8ff368e7e2fe00aeb7183a172e5ac035 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2017-12-05  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/generic/libm-alias-double.h: Include <bits/floatn.h>.
+       (libm_alias_double_other_r_f64): New macro.
+       (libm_alias_double_other_r_f32x): Likewise.
+       (libm_alias_double_other_r): Use libm_alias_double_other_r_f64 and
+       libm_alias_double_other_r_f32x.
+       (libm_alias_double_r): Use semicolon before call to
+       libm_alias_double_other_r.
+       * sysdeps/ieee754/ldbl-opt/libm-alias-double.h: Include
+       <bits/floatn.h>.
+       (libm_alias_double_other_r_f64): New macro.
+       (libm_alias_double_other_r_f32x): Likewise.
+       (libm_alias_double_other_r): Use libm_alias_double_other_r_f64 and
+       libm_alias_double_other_r_f32x.
+
 2017-12-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/ieee754/flt-32/s_sinf.c (reduced): Replace long with

diff --git a/sysdeps/generic/libm-alias-double.h b/sysdeps/generic/libm-alias-double.h
index 0593ad98864085b0058d273ee869e25af9e4feb5..f222cf8c55e40a0edee0c414c8db29a25b684915 100644 (file)
--- a/sysdeps/generic/libm-alias-double.h
+++ b/sysdeps/generic/libm-alias-double.h
@@ -19,11 +19,29 @@
 #ifndef _LIBM_ALIAS_DOUBLE_H
 #define _LIBM_ALIAS_DOUBLE_H
 
+#include <bits/floatn.h>
+
+#if __HAVE_FLOAT64 && !__HAVE_DISTINCT_FLOAT64
+# define libm_alias_double_other_r_f64(from, to, r)    \
+  weak_alias (from ## r, to ## f64 ## r)
+#else
+# define libm_alias_double_other_r_f64(from, to, r)
+#endif
+
+#if __HAVE_FLOAT32X && !__HAVE_DISTINCT_FLOAT32X
+# define libm_alias_double_other_r_f32x(from, to, r)   \
+  weak_alias (from ## r, to ## f32x ## r)
+#else
+# define libm_alias_double_other_r_f32x(from, to, r)
+#endif
+
 /* 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)
+#define libm_alias_double_other_r(from, to, r) \
+  libm_alias_double_other_r_f64 (from, to, r); \
+  libm_alias_double_other_r_f32x (from, to, r)
 
 /* Likewise, but without the R suffix.  */
 #define libm_alias_double_other(from, to)      \
@@ -40,11 +58,11 @@
 # 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
 

diff --git a/sysdeps/ieee754/ldbl-opt/libm-alias-double.h b/sysdeps/ieee754/ldbl-opt/libm-alias-double.h
index f98e9d5cbadd472b118c1e6f510ee3535cdf798e..37ef612689000ec4adc777f2ae8794f3bc54609c 100644 (file)
--- a/sysdeps/ieee754/ldbl-opt/libm-alias-double.h
+++ b/sysdeps/ieee754/ldbl-opt/libm-alias-double.h
@@ -19,15 +19,32 @@
 #ifndef _LIBM_ALIAS_DOUBLE_H
 #define _LIBM_ALIAS_DOUBLE_H
 
+#include <bits/floatn.h>
 #include <math_ldbl_opt.h>
 #include <first-versions.h>
 #include <ldbl-compat-choose.h>
 
+#if __HAVE_FLOAT64 && !__HAVE_DISTINCT_FLOAT64
+# define libm_alias_double_other_r_f64(from, to, r)    \
+  weak_alias (from ## r, to ## f64 ## r)
+#else
+# define libm_alias_double_other_r_f64(from, to, r)
+#endif
+
+#if __HAVE_FLOAT32X && !__HAVE_DISTINCT_FLOAT32X
+# define libm_alias_double_other_r_f32x(from, to, r)   \
+  weak_alias (from ## r, to ## f32x ## r)
+#else
+# define libm_alias_double_other_r_f32x(from, to, r)
+#endif
+
 /* 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)
+#define libm_alias_double_other_r(from, to, r) \
+  libm_alias_double_other_r_f64 (from, to, r); \
+  libm_alias_double_other_r_f32x (from, to, r)
 
 /* Likewise, but without the R suffix.  */
 #define libm_alias_double_other(from, to)      \