Make w_scalbln type-generic

This patch converts the wrapper scalbln (which set errno directly
rather than doing anything with __kernel_standard) to use the
type-generic template machinery, in the same way that has been done
for ldexp.

Tested for powerpc64le, s390, and x86_64.
This commit is contained in:
Gabriel F. T. Gomes 2016-12-09 17:08:14 -02:00
parent 0a2546cdaa
commit e4d6a83565
7 changed files with 27 additions and 110 deletions

View File

@ -1,3 +1,15 @@
2016-12-16 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
* math/Makefile (gen-libm-calls): Remove w_scalblnF.
(libm-calls): Add w_scalblnF.
* math/w_scalbln.c: Remove.
* math/w_scalblnf.c: Likewise.
* math/w_scalblnl.c: Likewise.
* math/w_scalbln_template.c: New file with type-generic
implementation based on math/w_scalbln.c.
* sysdeps/ieee754/ldbl-128ibm/w_scalblnl.c: Remove.
* sysdeps/ieee754/ldbl-64-128/w_scalblnl.c: Use new template.
2016-12-15 Joseph Myers <joseph@codesourcery.com>
[BZ #20947]

View File

@ -54,7 +54,7 @@ gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF \
s_ctanF s_ctanhF s_cexpF s_clogF s_cprojF s_csqrtF \
s_cpowF s_clog10F s_fdimF s_nextdownF s_fmaxF s_fminF \
s_nanF s_iseqsigF s_canonicalizeF w_ilogbF w_llogbF \
w_log1pF
w_log1pF w_scalblnF
libm-calls = \
e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \
@ -64,7 +64,7 @@ libm-calls = \
k_cosF k_sinF k_tanF s_asinhF s_atanF s_cbrtF \
s_ceilF s_cosF s_erfF s_expm1F s_fabsF \
s_floorF s_log1pF s_logbF \
s_nextafterF s_nexttowardF s_rintF s_scalblnF w_scalblnF \
s_nextafterF s_nexttowardF s_rintF s_scalblnF \
s_significandF s_sinF s_tanF s_tanhF w_acosF w_acoshF w_asinF \
w_atan2F w_atanhF w_coshF w_expF w_exp2F w_exp10F w_fmodF \
w_tgammaF w_hypotF w_j0F w_j1F w_jnF w_lgammaF w_lgammaF_r \

View File

@ -20,21 +20,22 @@
#include <math.h>
#include <math_private.h>
double
__w_scalbln (double x, long int n)
FLOAT
M_DECL_FUNC (__w_scalbln) (FLOAT x, long int n)
{
if (!isfinite (x) || x == 0.0)
if (!isfinite (x) || x == 0)
return x + x;
x = __scalbln (x, n);
x = M_SUF (__scalbln) (x, n);
if (!isfinite (x) || x == 0.0)
if (!isfinite (x) || x == 0)
__set_errno (ERANGE);
return x;
}
weak_alias (__w_scalbln, scalbln)
#ifdef NO_LONG_DOUBLE
weak_alias (__w_scalbln, scalblnl)
#endif
/* Define strong_alias to nothing because we don't want
declare_mgen_alias to create a strong alias for scalblnl. */
#undef strong_alias
#define strong_alias(name, alias_name)
declare_mgen_alias (__w_scalbln, scalbln)

View File

@ -1,36 +0,0 @@
/* Wrapper for __scalblnf handles setting errno.
Copyright (C) 2014-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/>. */
#include <errno.h>
#include <math.h>
#include <math_private.h>
float
__w_scalblnf (float x, long int n)
{
if (!isfinite (x) || x == 0.0f)
return x + x;
x = __scalblnf (x, n);
if (!isfinite (x) || x == 0.0f)
__set_errno (ERANGE);
return x;
}
weak_alias (__w_scalblnf, scalblnf)

View File

@ -1,36 +0,0 @@
/* Wrapper for __scalblnl handles setting errno.
Copyright (C) 2014-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/>. */
#include <errno.h>
#include <math.h>
#include <math_private.h>
long double
__w_scalblnl (long double x, long int n)
{
if (!isfinite (x) || x == 0.0L)
return x + x;
x = __scalblnl (x, n);
if (!isfinite (x) || x == 0.0L)
__set_errno (ERANGE);
return x;
}
weak_alias (__w_scalblnl, scalblnl)

View File

@ -1,23 +0,0 @@
/* Wrapper for __scalblnl handles setting errno.
Copyright (C) 2014-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/>. */
#include <math_ldbl_opt.h>
#undef weak_alias
#define weak_alias(name, alias)
#include <math/w_scalblnl.c>
long_double_symbol (libm, __w_scalblnl, scalblnl);

View File

@ -16,10 +16,9 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <math_ldbl_opt.h>
#undef weak_alias
#define weak_alias(name, alias)
#include <math/w_scalblnl.c>
#define declare_mgen_alias(from, to)
#include <math-type-macros-ldouble.h>
#include <w_scalbln_template.c>
#if IS_IN (libm)
long_double_symbol (libm, __w_scalblnl, scalblnl);
#else