From patchwork Wed Sep 14 17:04:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. Murphy" X-Patchwork-Id: 15632 X-Patchwork-Delegate: joseph@codesourcery.com Received: (qmail 31533 invoked by alias); 14 Sep 2016 17:05:01 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 31507 invoked by uid 89); 14 Sep 2016 17:05:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.9 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=drepper, Supply, na, U*drepper X-HELO: mx0a-001b2d01.pphosted.com X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: murphyp@linux.vnet.ibm.com From: "Paul E. Murphy" Subject: [PATCH] Build s_nan* objects from a generic template To: "libc-alpha@sourceware.org" Date: Wed, 14 Sep 2016 12:04:41 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16091417-0028-0000-0000-000005953A93 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005760; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000185; SDB=6.00757651; UDB=6.00359379; IPR=6.00531164; BA=6.00004726; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012670; XFM=3.00000011; UTC=2016-09-14 17:04:45 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16091417-0029-0000-0000-00002F37B252 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-14_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609020000 definitions=main-1609140230 This is the followup to https://sourceware.org/ml/libc-alpha/2016-09/msg00228.html. I've verified no symbol or code changes on ppc64, arm, aarch64, s390x, m68k, and x86_64 using 'nm -S' and 'objdump -d' on the s_nan* object files. ---8<--- 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 (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/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. --- math/Makefile | 5 +-- math/s_nan.c | 36 --------------------- math/s_nan_template.c | 37 ++++++++++++++++++++++ math/s_nanf.c | 32 ------------------- math/s_nanl.c | 32 ------------------- sysdeps/generic/math-type-macros-double.h | 1 + sysdeps/generic/math-type-macros-float.h | 1 + sysdeps/generic/math-type-macros-ldouble.h | 1 + sysdeps/generic/math-type-macros.h | 3 ++ sysdeps/ieee754/ldbl-opt/math-type-macros-double.h | 1 + sysdeps/ieee754/ldbl-opt/s_nan.c | 5 --- sysdeps/ieee754/ldbl-opt/s_nanl.c | 5 --- 12 files changed, 47 insertions(+), 112 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 delete mode 100644 sysdeps/ieee754/ldbl-opt/s_nan.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_nanl.c diff --git a/math/Makefile b/math/Makefile index 0c59616..5c396ba 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) diff --git a/sysdeps/generic/math-type-macros-double.h b/sysdeps/generic/math-type-macros-double.h index 284a6a4..6d0f206 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 aab88fd..33f5130 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 90773fa..4f959da 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 diff --git a/sysdeps/generic/math-type-macros.h b/sysdeps/generic/math-type-macros.h index 78b883c..c2488ec 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 f627264..2569607 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 418aad2..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_nan.c +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include -#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 9496e0b..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_nanl.c +++ /dev/null @@ -1,5 +0,0 @@ -#include -#undef weak_alias -#define weak_alias(n,a) -#include -long_double_symbol (libm, __nanl, nanl);