lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Make ldexpF generic.

Browse Source 
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.
This commit is contained in:
Paul E. Murphy
2016-09-08 08:48:08 -05:00
parent 8837917cf1
commit 9f9834f582
9 changed files with 115 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@@ -1,3 +1,29 @@
2016-09-20 Paul E. Murphy <murphyp@linux.vnet.ibm.com>
* math/Makefile (gen-all-calls): New variable.
(generated): Replace gen-libm-calls with gen-all-calls.
(gen-libm-templates.stmp): Likewise. Also, ensure
the output directory exists or is created and add
dependency on the Makefile.
(calls): Move s_ldexpF into gen-calls.
(gen-calls): New variable.
* math/s_ldexpf.c: Removed.
* math/s_ldexpl.c: Removed.
* math/s_ldexp.c: Refactored into ...
* math/s_ldexp_template.c: New file.
* sysdeps/generic/math-type-macros-double.h: Remove
redundant fall-through definition of declare_mgen_alias.
(declare_mgen_alias_2): New macro.
* sysdeps/generc/math-type-macros.h (declare_mgen_alias_2):
New macro for function aliased to two exported symbols.
* sysdeps/ieee754/ldbl-opt/s_ldexp.c: Update to use
new template file.
sysdeps/ieee754/ldbl-opt/s_ldexpl.c: Likewise.
2016-09-20 Florian Weimer <fweimer@redhat.com> 2016-09-20 Florian Weimer <fweimer@redhat.com>
* Makeconfig (all-object-suffixes): Remove .og. * Makeconfig (all-object-suffixes): Remove .og.

20
math/Makefile
View File

@@ -120,7 +120,8 @@ libm-routines = $(strip $(libm-support) $(libm-compat-calls) \
# In libm-calls (above), list m_foo in place of s_foo for any # In libm-calls (above), list m_foo in place of s_foo for any
# routine that should be compiled separately for its libc and libm versions. # routine that should be compiled separately for its libc and libm versions.
calls = s_isinfF s_isnanF s_finiteF s_copysignF s_modfF s_scalbnF s_frexpF \ calls = s_isinfF s_isnanF s_finiteF s_copysignF s_modfF s_scalbnF s_frexpF \
s_ldexpF s_signbitF s_signbitF $(gen-calls)
gen-calls = s_ldexpF
generated += $(foreach s,.c .S,$(call type-foreach, $(calls:s_%=m_%$(s)))) generated += $(foreach s,.c .S,$(call type-foreach, $(calls:s_%=m_%$(s))))
routines = $(call type-foreach, $(calls)) routines = $(call type-foreach, $(calls))
@@ -272,12 +273,15 @@ extra-objs += libieee.a ieee-math.o
include ../Rules include ../Rules
generated += $(addsuffix .c,$(call type-foreach,$(gen-libm-calls))) \ gen-all-calls = $(gen-libm-calls) $(gen-calls)
generated += $(addsuffix .c,$(call type-foreach,$(gen-all-calls))) \
gen-libm-templates.stmp gen-libm-templates.stmp
# Create wrappers in the math build directory. # Create wrappers in the math build directory.
$(objpfx)gen-libm-templates.stmp: $(objpfx)gen-libm-templates.stmp: Makefile
for gcall in $(gen-libm-calls); do \ $(make-target-directory)
for gcall in $(gen-all-calls); do \
func=$${gcall%F*}$${gcall#*F}; \ func=$${gcall%F*}$${gcall#*F}; \
for type in $(foreach t,$(types),$(t)__$(type-$(t)-suffix)); do \ for type in $(foreach t,$(types),$(t)__$(type-$(t)-suffix)); do \
suff=$${type#*__}; \ suff=$${type#*__}; \
@@ -292,7 +296,7 @@ $(objpfx)gen-libm-templates.stmp:
echo > $(@) echo > $(@)
# Add dependency to ensure the generator runs prior. # Add dependency to ensure the generator runs prior.
$(foreach t, $(call type-foreach, $(gen-libm-calls)), \ $(foreach t, $(call type-foreach, $(gen-all-calls)), \
$(objpfx)$(t).c): $(objpfx)gen-libm-templates.stmp $(objpfx)$(t).c): $(objpfx)gen-libm-templates.stmp
ifneq (no,$(PERL)) ifneq (no,$(PERL))
@@ -334,6 +338,12 @@ endef
object-suffixes-left := $(all-object-suffixes) object-suffixes-left := $(all-object-suffixes)
include $(o-iterator) include $(o-iterator)
# Likewise, for those generated files shared with libc.
define o-iterator-doit
$(objpfx)m_%$o: $(objpfx)s_%.c $(before-compile); $$(compile-command.c)
endef
object-suffixes-left := $(all-object-suffixes)
include $(o-iterator)
# This file defines the default _LIB_VERSION variable that controls # This file defines the default _LIB_VERSION variable that controls
# the error return conventions for the math functions. # the error return conventions for the math functions.

20
math/s_ldexp.c → math/s_ldexp_template.c
View File

@@ -18,17 +18,15 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $";
#include <math_private.h> #include <math_private.h>
#include <errno.h> #include <errno.h>
double __ldexp(double value, int exp) FLOAT
M_SUF (__ldexp) (FLOAT value, int exp)
{ {
if(!isfinite(value)||value==0.0) return value + value; if(!isfinite(value)||value==0) return value + value;
value = __scalbn(value,exp); value = M_SCALBN(value,exp);
if(!isfinite(value)||value==0.0) __set_errno (ERANGE); if(!isfinite(value)||value==0) __set_errno (ERANGE);
return value; return value;
} }
weak_alias (__ldexp, ldexp)
weak_alias (__ldexp, scalbn) declare_mgen_alias_2 (__ldexp, ldexp, scalbn);
#ifdef NO_LONG_DOUBLE
strong_alias (__ldexp, __ldexpl) /* Note, versioning issues are punted to ldbl-opt in this case. */
weak_alias (__ldexp, ldexpl)
weak_alias (__ldexp, scalbnl)
#endif

32
math/s_ldexpf.c
View File

@@ -1,32 +0,0 @@
/* s_ldexpf.c -- float version of s_ldexp.c.
* Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
*/
/*
* ====================================================
* Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
*
* Developed at SunPro, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
* software is freely granted, provided that this notice
* is preserved.
* ====================================================
*/
#if defined(LIBM_SCCS) && !defined(lint)
static char rcsid[] = "$NetBSD: s_ldexpf.c,v 1.3 1995/05/10 20:47:42 jtc Exp $";
#endif
#include <math.h>
#include <math_private.h>
#include <errno.h>
float __ldexpf(float value, int exp)
{
if(!isfinite(value)||value==(float)0.0) return value + value;
value = __scalbnf(value,exp);
if(!isfinite(value)||value==(float)0.0) __set_errno (ERANGE);
return value;
}
weak_alias (__ldexpf, ldexpf)
weak_alias (__ldexpf, scalbnf)

33
math/s_ldexpl.c
View File

@@ -1,33 +0,0 @@
/* s_ldexpl.c -- long double version of s_ldexp.c.
* Conversion to long double by Ulrich Drepper,
* Cygnus Support, drepper@cygnus.com.
*/
/*
* ====================================================
* Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
*
* Developed at SunPro, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
* software is freely granted, provided that this notice
* is preserved.
* ====================================================
*/
#if defined(LIBM_SCCS) && !defined(lint)
static char rcsid[] = "$NetBSD: $";
#endif
#include <math.h>
#include <math_private.h>
#include <errno.h>
long double __ldexpl(long double value, int exp)
{
if(!isfinite(value)||value==0.0) return value + value;
value = __scalbnl(value,exp);
if(!isfinite(value)||value==0.0) __set_errno (ERANGE);
return value;
}
weak_alias (__ldexpl, ldexpl)
weak_alias (__ldexpl, scalbnl)

10
sysdeps/generic/math-type-macros-double.h
View File

@@ -34,9 +34,13 @@
weak_alias (from, to) \ weak_alias (from, to) \
strong_alias (from, from ## l) \ strong_alias (from, from ## l) \
weak_alias (from, to ## l) weak_alias (from, to ## l)
#elif !defined declare_mgen_alias #endif
# define declare_mgen_alias(from, to) \
weak_alias (M_SUF (from), M_SUF (to)) #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 #endif
/* Supply the generic macros. */ /* Supply the generic macros. */

12
sysdeps/generic/math-type-macros.h
View File

@@ -38,6 +38,11 @@
This exposes the appropriate symbol(s) for a This exposes the appropriate symbol(s) for a
function f of type FLOAT. 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) M_LIBM_NEED_COMPAT(func)
This is utilized in macro context to indicate This is utilized in macro context to indicate
whether func should declare compat symbols. whether func should declare compat symbols.
@@ -112,6 +117,13 @@
# define declare_mgen_alias(from, to) weak_alias (M_SUF (from), M_SUF (to)) # define declare_mgen_alias(from, to) weak_alias (M_SUF (from), M_SUF (to))
#endif #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. */ /* Do not generate anything for compat symbols by default. */
#ifndef M_LIBM_NEED_COMPAT #ifndef M_LIBM_NEED_COMPAT
# define M_LIBM_NEED_COMPAT(func) 0 # define M_LIBM_NEED_COMPAT(func) 0

25
sysdeps/ieee754/ldbl-opt/s_ldexp.c
View File

@@ -1,5 +1,26 @@
#include <math_ldbl_opt.h> /* ldexp alias overrides for platforms where long double
#include <math/s_ldexp.c> 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 IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) # if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __ldexp, ldexpl, GLIBC_2_0); compat_symbol (libm, __ldexp, ldexpl, GLIBC_2_0);

27
sysdeps/ieee754/ldbl-opt/s_ldexpl.c
View File

@@ -1,7 +1,26 @@
#include <math_ldbl_opt.h> /* ldexpl alias overrides for platforms where long double
#undef weak_alias was previously not unique.
#define weak_alias(n,a) Copyright (C) 2016 Free Software Foundation, Inc.
#include <math/s_ldexpl.c> 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) strong_alias (__ldexpl, __ldexpl_2)
#if IS_IN (libm) #if IS_IN (libm)
long_double_symbol (libm, __ldexpl, ldexpl); long_double_symbol (libm, __ldexpl, ldexpl);