From 1aae75ef80aaa6129fb3f2a68fdfba60a945c4df Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 13 Sep 2017 22:17:23 +0000 Subject: Define and use libm_alias_ldouble. Continuing the process of setting up common macros for libm function aliases, with a view to using them to define _FloatN / _FloatNx aliases in future, this patch adds a libm_alias_ldouble macro and uses it in the type-generic templates. Since math-type-macros-ldouble.h already did the appropriate thing for each symbol (weak_alias or long_double_symbol), this is just a straightforward rearrangement of code, to make the required logic available in a place that can also be used outside of the type-generic templates in future (in particular, to eliminate various wrappers for functions in ldbl-opt and ldbl-64-128). Tested for x86_64. Also tested with build-many-glibcs.py that installed stripped shared libraries are unchanged by the patch. * sysdeps/generic/libm-alias-ldouble.h: New file. * sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h: Likewise. * sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h: Remove. * sysdeps/generic/math-type-macros-ldouble.h: Include . [!declare_mgen_alias] (declare_mgen_alias): Define to use libm_alias_ldouble. --- sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h | 41 ++++++++++++++++++++++ .../ieee754/ldbl-opt/math-type-macros-ldouble.h | 38 -------------------- 2 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h delete mode 100644 sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h (limited to 'sysdeps/ieee754') diff --git a/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h b/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h new file mode 100644 index 0000000000..ae3202747f --- /dev/null +++ b/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h @@ -0,0 +1,41 @@ +/* Define aliases for libm long double functions. ldbl-opt version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _LIBM_ALIAS_LDOUBLE_H +#define _LIBM_ALIAS_LDOUBLE_H + +#include +#include + +/* 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 + long double. This should only be used for functions where such + public names exist for _FloatN types, not for + implementation-namespace exported names (where there is one name + per format, not per type) or for obsolescent functions not provided + for _FloatN types. */ +#define libm_alias_ldouble_r(from, to, r) \ + LONG_DOUBLE_COMPAT_CHOOSE_libm_ ## to ## l ## r \ + (long_double_symbol (libm, from ## l ## r, to ## l ## r), \ + weak_alias (from ## l ## r, to ## l ## r)); + +/* Likewise, but without the R suffix. */ +#define libm_alias_ldouble(from, to) libm_alias_ldouble_r (from, to, ) + +#endif diff --git a/sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h b/sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h deleted file mode 100644 index 20873ae6b5..0000000000 --- a/sysdeps/ieee754/ldbl-opt/math-type-macros-ldouble.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Overrides for ldbl-opt versioning for long double types. - Copyright (C) 2016-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _MATH_TYPE_MACROS_LDOUBLE - -#include -#include - -#define maybe_long_double_symbol(lib, from, to) \ - LONG_DOUBLE_COMPAT_CHOOSE_ ## lib ## _ ## to (long_double_symbol (lib, \ - from, \ - to), \ - weak_alias (from, to)) - -/* Use properly versioned symbols for long double on platforms where - it was not always a distinct type. */ -#if !defined declare_mgen_alias -# define declare_mgen_alias(from, to) \ - maybe_long_double_symbol (libm, from ## l, to ## l); -#endif - -#include_next -#endif -- cgit 1.4.1