aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/Makefile5
-rw-r--r--math/w_log1p_template.c (renamed from math/w_log1p.c)17
-rw-r--r--math/w_log1pf.c36
-rw-r--r--math/w_log1pl.c36
4 files changed, 9 insertions, 85 deletions
diff --git a/math/Makefile b/math/Makefile
index b5d498819c..1e96100120 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -52,7 +52,8 @@ gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF \
k_casinhF s_csinhF k_casinhF s_csinhF s_catanhF s_catanF \
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
+ s_nanF s_iseqsigF s_canonicalizeF w_ilogbF w_llogbF \
+ w_log1pF
libm-calls = \
e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \
@@ -61,7 +62,7 @@ libm-calls = \
e_ilogbF \
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 w_log1pF s_logbF \
+ s_floorF s_log1pF s_logbF \
s_nextafterF s_nexttowardF s_rintF s_scalblnF w_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 \
diff --git a/math/w_log1p.c b/math/w_log1p_template.c
index 282c85cb5c..1ac345029a 100644
--- a/math/w_log1p.c
+++ b/math/w_log1p_template.c
@@ -20,22 +20,17 @@
#include <math.h>
#include <math_private.h>
-double
-__w_log1p (double x)
+FLOAT
+M_DECL_FUNC (__w_log1p) (FLOAT x)
{
- if (__glibc_unlikely (islessequal (x, -1.0)))
+ if (__glibc_unlikely (islessequal (x, M_LIT (-1.0))))
{
- if (x == -1.0)
+ if (x == -1)
__set_errno (ERANGE);
else
__set_errno (EDOM);
}
- return __log1p (x);
+ return M_SUF (__log1p) (x);
}
-weak_alias (__w_log1p, log1p)
-
-#ifdef NO_LONG_DOUBLE
-strong_alias (__w_log1p, __log1pl)
-weak_alias (__w_log1p, log1pl)
-#endif
+declare_mgen_alias (__w_log1p, log1p)
diff --git a/math/w_log1pf.c b/math/w_log1pf.c
deleted file mode 100644
index ed9992a0a7..0000000000
--- a/math/w_log1pf.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Wrapper for __log1pf that handles setting errno.
- Copyright (C) 2015-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_log1pf (float x)
-{
- if (__glibc_unlikely (islessequal (x, -1.0f)))
- {
- if (x == -1.0f)
- __set_errno (ERANGE);
- else
- __set_errno (EDOM);
- }
-
- return __log1pf (x);
-}
-weak_alias (__w_log1pf, log1pf)
diff --git a/math/w_log1pl.c b/math/w_log1pl.c
deleted file mode 100644
index 3478c1c859..0000000000
--- a/math/w_log1pl.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Wrapper for __log1pl that handles setting errno.
- Copyright (C) 2015-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_log1pl (long double x)
-{
- if (__glibc_unlikely (islessequal (x, -1.0L)))
- {
- if (x == -1.0L)
- __set_errno (ERANGE);
- else
- __set_errno (EDOM);
- }
-
- return __log1pl (x);
-}
-weak_alias (__w_log1pl, log1pl)