diff options
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | math/Makefile | 5 | ||||
| -rw-r--r-- | math/s_nan_template.c (renamed from math/s_nan.c) | 15 | ||||
| -rw-r--r-- | math/s_nanf.c | 32 | ||||
| -rw-r--r-- | math/s_nanl.c | 32 | ||||
| -rw-r--r-- | sysdeps/generic/math-type-macros-double.h | 1 | ||||
| -rw-r--r-- | sysdeps/generic/math-type-macros-float.h | 1 | ||||
| -rw-r--r-- | sysdeps/generic/math-type-macros-ldouble.h | 1 | ||||
| -rw-r--r-- | sysdeps/generic/math-type-macros.h | 3 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/math-type-macros-double.h | 1 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_nan.c | 5 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_nanl.c | 5 |
12 files changed, 42 insertions, 83 deletions
diff --git a/ChangeLog b/ChangeLog index 8423f60979..338777b9c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,29 @@ 2016-09-20 Paul E. Murphy <murphyp@linux.vnet.ibm.com> + * math/Makefile (libm-calls): Remove s_nanF. + (gen-libm-calls): Add s_nanF. + + * math/s_nan.c: Refactor into ... + * math/s_nan_template.c: New file. + + * math/s_nanf.c: Removed. + * math/s_nanl.c: Removed. + * sysdeps/ieee754/ldbl-opt/s_nan.c: Removed. + * sysdeps/ieee754/ldbl-opt/s_nanl.c: Removed. + + * sysdeps/ieee754/ldbl-opt/math-type-macros-double.h: + (LDOUBLE_nanl_libm_version): New macro. + + * sysdeps/generic/math-type-macros-double.h: + (M_STRTO_NAN): New macro. + * sysdeps/generic/math-type-macros-float.h: Likewise. + * sysdeps/generic/math-type-macros-ldouble.h: Likewise. + + * sysdeps/generic/math-type-macros.h: Document + M_STRTO_NAN. + +2016-09-20 Paul E. Murphy <murphyp@linux.vnet.ibm.com> + * math/s_nanf.c: Remove __nanf undef. * math/s_nan.c: Remove __nan undef. * math/s_nanl.c: Remove __nanl undef. diff --git a/math/Makefile b/math/Makefile index 367f73e227..6c58b970d6 100644 --- a/math/Makefile +++ b/math/Makefile @@ -50,7 +50,8 @@ gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF \ s_cacoshF s_ccosF s_ccoshF s_casinF s_csinF s_casinhF \ 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_cpowF s_clog10F s_fdimF s_nextdownF s_fmaxF s_fminF \ + s_nanF libm-calls = \ e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \ @@ -66,7 +67,7 @@ libm-calls = \ w_tgammaF w_hypotF w_j0F w_j1F w_jnF w_lgammaF w_lgammaF_r \ w_logF w_log10F w_powF w_remainderF w_scalbF w_sinhF w_sqrtF \ w_ilogbF \ - s_fpclassifyF s_nanF s_truncF \ + s_fpclassifyF s_truncF \ s_remquoF e_log2F e_exp2F s_roundF s_nearbyintF s_sincosF \ s_fmaF s_lrintF s_llrintF s_lroundF s_llroundF e_exp10F w_log2F \ s_issignalingF $(calls:s_%=m_%) x2y2m1F \ diff --git a/math/s_nan.c b/math/s_nan_template.c index 03e95f56ad..cf47a2f07f 100644 --- a/math/s_nan.c +++ b/math/s_nan_template.c @@ -24,13 +24,14 @@ #include <ieee754.h> -double -__nan (const char *tagp) +FLOAT +M_DECL_FUNC (__nan) (const char *tagp) { - return __strtod_nan (tagp, NULL, 0); + return M_STRTO_NAN (tagp, NULL, 0); } -weak_alias (__nan, nan) -#ifdef NO_LONG_DOUBLE -strong_alias (__nan, __nanl) -weak_alias (__nan, nanl) + +declare_mgen_alias (__nan, nan) + +#if M_LIBM_NEED_COMPAT (nan) +declare_mgen_libm_compat (__nan, nan) #endif diff --git a/math/s_nanf.c b/math/s_nanf.c deleted file mode 100644 index 3046720a11..0000000000 --- a/math/s_nanf.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Return quiet nan. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - - 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.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ieee754.h> - - -float -__nanf (const char *tagp) -{ - return __strtof_nan (tagp, NULL, 0); -} -weak_alias (__nanf, nanf) diff --git a/math/s_nanl.c b/math/s_nanl.c deleted file mode 100644 index 4b7b3d563c..0000000000 --- a/math/s_nanl.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Return quiet nan. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - - 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.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ieee754.h> - - -long double -__nanl (const char *tagp) -{ - return __strtold_nan (tagp, NULL, 0); -} -weak_alias (__nanl, nanl) diff --git a/sysdeps/generic/math-type-macros-double.h b/sysdeps/generic/math-type-macros-double.h index 284a6a48db..6d0f20635a 100644 --- a/sysdeps/generic/math-type-macros-double.h +++ b/sysdeps/generic/math-type-macros-double.h @@ -25,6 +25,7 @@ #define M_SUF(c) c #define FLOAT double #define CFLOAT _Complex double +#define M_STRTO_NAN __strtod_nan /* Machines without a distinct long double type alias long double functions to their double diff --git a/sysdeps/generic/math-type-macros-float.h b/sysdeps/generic/math-type-macros-float.h index aab88fdfa5..33f51304a1 100644 --- a/sysdeps/generic/math-type-macros-float.h +++ b/sysdeps/generic/math-type-macros-float.h @@ -24,6 +24,7 @@ #define M_SUF(c) c ## f #define FLOAT float #define CFLOAT _Complex float +#define M_STRTO_NAN __strtof_nan /* Standard/GNU macro literals do not exist for the float type. Use the double macro constants. */ diff --git a/sysdeps/generic/math-type-macros-ldouble.h b/sysdeps/generic/math-type-macros-ldouble.h index 90773fa578..4f959da05f 100644 --- a/sysdeps/generic/math-type-macros-ldouble.h +++ b/sysdeps/generic/math-type-macros-ldouble.h @@ -25,6 +25,7 @@ #define M_SUF(c) c ## l #define FLOAT long double #define CFLOAT _Complex long double +#define M_STRTO_NAN __strtold_nan /* Supply the generic macros. */ #include <math-type-macros.h> diff --git a/sysdeps/generic/math-type-macros.h b/sysdeps/generic/math-type-macros.h index 78b883c877..c2488ec600 100644 --- a/sysdeps/generic/math-type-macros.h +++ b/sysdeps/generic/math-type-macros.h @@ -30,6 +30,9 @@ i.e expf expl exp. FLOAT - Resolves to the C typename of M_TYPE. CFLOAT - Resolves to the complex typename of M_TYPE. + M_STRTO_NAN - Resolves to the internal libc function which + converts a string into the appropriate FLOAT nan + value. Optionally, these headers may inject a non-standard definition for the following: diff --git a/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h b/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h index f627264c18..2569607283 100644 --- a/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h +++ b/sysdeps/ieee754/ldbl-opt/math-type-macros-double.h @@ -47,6 +47,7 @@ #define LDOUBLE_fdiml_libm_version GLIBC_2_1 #define LDOUBLE_fmaxl_libm_version GLIBC_2_1 #define LDOUBLE_fminl_libm_version GLIBC_2_1 +#define LDOUBLE_nanl_libm_version GLIBC_2_1 /* Define compat symbols for long double on platforms where it was not always a distinct type. */ diff --git a/sysdeps/ieee754/ldbl-opt/s_nan.c b/sysdeps/ieee754/ldbl-opt/s_nan.c deleted file mode 100644 index 418aad2076..0000000000 --- a/sysdeps/ieee754/ldbl-opt/s_nan.c +++ /dev/null @@ -1,5 +0,0 @@ -#include <math_ldbl_opt.h> -#include <math/s_nan.c> -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __nan, nanl, GLIBC_2_1); -#endif diff --git a/sysdeps/ieee754/ldbl-opt/s_nanl.c b/sysdeps/ieee754/ldbl-opt/s_nanl.c deleted file mode 100644 index 9496e0b5ce..0000000000 --- a/sysdeps/ieee754/ldbl-opt/s_nanl.c +++ /dev/null @@ -1,5 +0,0 @@ -#include <math_ldbl_opt.h> -#undef weak_alias -#define weak_alias(n,a) -#include <math/s_nanl.c> -long_double_symbol (libm, __nanl, nanl); |