diff options
author | Paul E. Murphy <murphyp@linux.vnet.ibm.com> | 2016-09-08 08:48:08 -0500 |
---|---|---|
committer | Paul E. Murphy <murphyp@linux.vnet.ibm.com> | 2016-09-20 14:37:40 -0500 |
commit | 9f9834f582f87cc84bfaa11cff5f98fb661c288d (patch) | |
tree | 871f7a56da332d8fadb01fb81eae95a7ed6545c2 /sysdeps | |
parent | 8837917cf17b083ac4178352c740b0bfeada4d7f (diff) | |
download | glibc-9f9834f582f87cc84bfaa11cff5f98fb661c288d.zip glibc-9f9834f582f87cc84bfaa11cff5f98fb661c288d.tar.gz glibc-9f9834f582f87cc84bfaa11cff5f98fb661c288d.tar.bz2 |
Make ldexpF generic.
This one is a little more tricky since it is built both for
libm and libc, and exports multiple aliases.
To simplify aliasing, a new macro is introduced which handles
aliasing to two symbols. By default, it just applies
declare_mgen_alias to both target symbols.
Likewise, the makefile is tweaked a little to generate
templates for shared files too, and a new rule is added
to build m_*.c objects from the objpfx directory.
Verified there are no symbol or code changes using a script
to diff the *_ldexp* object files on s390x, aarch64, arm,
x86_64, and ppc64.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/math-type-macros-double.h | 10 | ||||
-rw-r--r-- | sysdeps/generic/math-type-macros.h | 12 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_ldexp.c | 25 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_ldexpl.c | 27 |
4 files changed, 65 insertions, 9 deletions
diff --git a/sysdeps/generic/math-type-macros-double.h b/sysdeps/generic/math-type-macros-double.h index 154f416..284a6a4 100644 --- a/sysdeps/generic/math-type-macros-double.h +++ b/sysdeps/generic/math-type-macros-double.h @@ -34,9 +34,13 @@ weak_alias (from, to) \ strong_alias (from, from ## l) \ weak_alias (from, to ## l) -#elif !defined declare_mgen_alias -# define declare_mgen_alias(from, to) \ - weak_alias (M_SUF (from), M_SUF (to)) +#endif + +#if defined NO_LONG_DOUBLE && !defined declare_mgen_alias_2 +# define declare_mgen_alias_2(from, to, to2) \ + declare_mgen_alias (from, to) \ + weak_alias (from, to2) \ + weak_alias (from, to2 ## l) #endif /* Supply the generic macros. */ diff --git a/sysdeps/generic/math-type-macros.h b/sysdeps/generic/math-type-macros.h index 259cb94..bd9e25a 100644 --- a/sysdeps/generic/math-type-macros.h +++ b/sysdeps/generic/math-type-macros.h @@ -38,6 +38,11 @@ This exposes the appropriate symbol(s) for a function f of type FLOAT. + declare_mgen_alias_2(from,to,to2) + This exposes the appropriate symbol(s) for a + function f of type FLOAT when it is aliased + to two symbols. + M_LIBM_NEED_COMPAT(func) This is utilized in macro context to indicate whether func should declare compat symbols. @@ -112,6 +117,13 @@ # define declare_mgen_alias(from, to) weak_alias (M_SUF (from), M_SUF (to)) #endif +/* Likewise, if two aliases are derived from the same symbol. */ +#ifndef declare_mgen_alias_2 +# define declare_mgen_alias_2(from, to, to2) \ + declare_mgen_alias (from, to) \ + declare_mgen_alias (from, to2) +#endif + /* Do not generate anything for compat symbols by default. */ #ifndef M_LIBM_NEED_COMPAT # define M_LIBM_NEED_COMPAT(func) 0 diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexp.c b/sysdeps/ieee754/ldbl-opt/s_ldexp.c index 20e107b..65f96e0 100644 --- a/sysdeps/ieee754/ldbl-opt/s_ldexp.c +++ b/sysdeps/ieee754/ldbl-opt/s_ldexp.c @@ -1,5 +1,26 @@ -#include <math_ldbl_opt.h> -#include <math/s_ldexp.c> +/* ldexp alias overrides for platforms where long double + was previously not unique. + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#define M_LIBM_NEED_COMPAT(f) 0 +#include <math-type-macros-double.h> +#include <s_ldexp_template.c> + #if IS_IN (libm) # if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) compat_symbol (libm, __ldexp, ldexpl, GLIBC_2_0); diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c index ed87a92..7a26437 100644 --- a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c +++ b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c @@ -1,7 +1,26 @@ -#include <math_ldbl_opt.h> -#undef weak_alias -#define weak_alias(n,a) -#include <math/s_ldexpl.c> +/* ldexpl alias overrides for platforms where long double + was previously not unique. + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#define declare_mgen_alias(f,t) +#include <math-type-macros-ldouble.h> +#include <s_ldexp_template.c> + strong_alias (__ldexpl, __ldexpl_2) #if IS_IN (libm) long_double_symbol (libm, __ldexpl, ldexpl); |