From 2c46d1148650edf5d02051c3794227d52618db0c Mon Sep 17 00:00:00 2001 From: "Paul E. Murphy" Date: Mon, 12 Sep 2016 17:32:07 -0500 Subject: Build s_nan* objects from a generic template This requires adding a macro to synthesize the call to __strto*_nan. Since this is likely to be the only usage ever for strto* functions in generated libm calls, a dedicated macro is defined for it. --- math/Makefile | 5 +++-- math/s_nan.c | 36 ------------------------------------ math/s_nan_template.c | 37 +++++++++++++++++++++++++++++++++++++ math/s_nanf.c | 32 -------------------------------- math/s_nanl.c | 32 -------------------------------- 5 files changed, 40 insertions(+), 102 deletions(-) delete mode 100644 math/s_nan.c create mode 100644 math/s_nan_template.c delete mode 100644 math/s_nanf.c delete mode 100644 math/s_nanl.c (limited to 'math') diff --git a/math/Makefile b/math/Makefile index 367f73e..6c58b97 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.c deleted file mode 100644 index 03e95f5..0000000 --- a/math/s_nan.c +++ /dev/null @@ -1,36 +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 , 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 - . */ - -#include -#include -#include -#include -#include - - -double -__nan (const char *tagp) -{ - return __strtod_nan (tagp, NULL, 0); -} -weak_alias (__nan, nan) -#ifdef NO_LONG_DOUBLE -strong_alias (__nan, __nanl) -weak_alias (__nan, nanl) -#endif diff --git a/math/s_nan_template.c b/math/s_nan_template.c new file mode 100644 index 0000000..cf47a2f --- /dev/null +++ b/math/s_nan_template.c @@ -0,0 +1,37 @@ +/* Return quiet nan. + Copyright (C) 1997-2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + . */ + +#include +#include +#include +#include +#include + + +FLOAT +M_DECL_FUNC (__nan) (const char *tagp) +{ + return M_STRTO_NAN (tagp, NULL, 0); +} + +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 3046720..0000000 --- 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 , 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 - . */ - -#include -#include -#include -#include -#include - - -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 4b7b3d5..0000000 --- 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 , 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 - . */ - -#include -#include -#include -#include -#include - - -long double -__nanl (const char *tagp) -{ - return __strtold_nan (tagp, NULL, 0); -} -weak_alias (__nanl, nanl) -- cgit v1.1