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
	<libm-alias-ldouble.h>.
	[!declare_mgen_alias] (declare_mgen_alias): Define to use
	libm_alias_ldouble.
This commit is contained in:
Joseph Myers 2017-09-13 22:17:23 +00:00
parent bcea7ad608
commit 1aae75ef80
5 changed files with 93 additions and 38 deletions

View File

@ -1,3 +1,13 @@
2017-09-13 Joseph Myers <joseph@codesourcery.com>
* 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
<libm-alias-ldouble.h>.
[!declare_mgen_alias] (declare_mgen_alias): Define to use
libm_alias_ldouble.
2017-09-13 Szabolcs Nagy <szabolcs.nagy@arm.com>
* sysdeps/ieee754/dbl-64/w_exp_compat.c: Move to...

View File

@ -0,0 +1,36 @@
/* Define aliases for libm long double functions.
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
<http://www.gnu.org/licenses/>. */
#ifndef _LIBM_ALIAS_LDOUBLE_H
#define _LIBM_ALIAS_LDOUBLE_H
/* 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) \
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

View File

@ -27,6 +27,12 @@
#define CFLOAT _Complex long double
#define M_STRTO_NAN __strtold_nan
#include <libm-alias-ldouble.h>
#ifndef declare_mgen_alias
# define declare_mgen_alias(from, to) libm_alias_ldouble (from, to)
#endif
/* Supply the generic macros. */
#include <math-type-macros.h>

View File

@ -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
<http://www.gnu.org/licenses/>. */
#ifndef _LIBM_ALIAS_LDOUBLE_H
#define _LIBM_ALIAS_LDOUBLE_H
#include <math_ldbl_opt.h>
#include <ldbl-compat-choose.h>
/* 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

View File

@ -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
<http://www.gnu.org/licenses/>. */
#ifndef _MATH_TYPE_MACROS_LDOUBLE
#include <math_ldbl_opt.h>
#include <ldbl-compat-choose.h>
#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 <math-type-macros-ldouble.h>
#endif