From f2d64d621e620b3b11fc4ed55f3e753ed6dc31e7 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 5 Dec 2017 16:59:34 +0000 Subject: [PATCH] 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 . (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 . (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. --- ChangeLog | 16 ++++++++++++++++ sysdeps/generic/libm-alias-double.h | 24 +++++++++++++++++++++--- sysdeps/ieee754/ldbl-opt/libm-alias-double.h | 19 ++++++++++++++++++- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5636a571fa..afe13d3f8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2017-12-05 Joseph Myers + + * sysdeps/generic/libm-alias-double.h: Include . + (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 + . + (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 * 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 0593ad9886..f222cf8c55 100644 --- 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 + +#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 f98e9d5cba..37ef612689 100644 --- 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 #include #include #include +#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) \ -- 2.11.4.GIT