aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorGabriel F. T. Gomes <gftg@linux.vnet.ibm.com>2016-12-09 17:08:14 -0200
committerGabriel F. T. Gomes <gftg@linux.vnet.ibm.com>2016-12-16 08:44:19 -0200
commite4d6a83565479c533aabae9046377a59712a5b22 (patch)
treec941a9ff0c4e409fc1848cd0ce1befbd396b4140 /math
parent0a2546cdaa4284cc6ed6af06835fd858ba341838 (diff)
downloadglibc-e4d6a83565479c533aabae9046377a59712a5b22.tar
glibc-e4d6a83565479c533aabae9046377a59712a5b22.tar.gz
glibc-e4d6a83565479c533aabae9046377a59712a5b22.tar.bz2
glibc-e4d6a83565479c533aabae9046377a59712a5b22.zip
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.
Diffstat (limited to 'math')
-rw-r--r--math/Makefile4
-rw-r--r--math/w_scalbln_template.c (renamed from math/w_scalbln.c)19
-rw-r--r--math/w_scalblnf.c36
-rw-r--r--math/w_scalblnl.c36
4 files changed, 12 insertions, 83 deletions
diff --git a/math/Makefile b/math/Makefile
index 84d061f124..076fd34213 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -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 \
diff --git a/math/w_scalbln.c b/math/w_scalbln_template.c
index bcc33191d9..11c9afe37d 100644
--- a/math/w_scalbln.c
+++ b/math/w_scalbln_template.c
@@ -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)
diff --git a/math/w_scalblnf.c b/math/w_scalblnf.c
deleted file mode 100644
index 2a0b237352..0000000000
--- a/math/w_scalblnf.c
+++ /dev/null
@@ -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)
diff --git a/math/w_scalblnl.c b/math/w_scalblnl.c
deleted file mode 100644
index 8ee8130d72..0000000000
--- a/math/w_scalblnl.c
+++ /dev/null
@@ -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)