{"id":810324,"url":"http://patchwork.ozlabs.org/api/1.2/patches/810324/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/alpine.DEB.2.20.1709052336210.6352@digraph.polyomino.org.uk/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/1.2/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"","list_archive_url":null,"date":"2017-09-05T23:36:56","name":"Prefer new libm function wrappers for !LIBM_SVID_COMPAT [committed]","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"89f851ed5763264412d7a1246d508b0338ae11ab","submitter":{"id":4349,"url":"http://patchwork.ozlabs.org/api/1.2/people/4349/?format=json","name":"Joseph Myers","email":"joseph@codesourcery.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/alpine.DEB.2.20.1709052336210.6352@digraph.polyomino.org.uk/mbox/","series":[{"id":1667,"url":"http://patchwork.ozlabs.org/api/1.2/series/1667/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=1667","date":"2017-09-05T23:36:56","name":"Prefer new libm function wrappers for !LIBM_SVID_COMPAT [committed]","version":1,"mbox":"http://patchwork.ozlabs.org/series/1667/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810324/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810324/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-84222-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"pjsIowYR\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xn36V13jNz9s83\n\tfor ;\n\tWed, 6 Sep 2017 09:37:37 +1000 (AEST)","(qmail 34167 invoked by alias); 5 Sep 2017 23:37:20 -0000","(qmail 31938 invoked by uid 89); 5 Sep 2017 23:37:18 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:from:to:subject:message-id:mime-version\n\t:content-type; q=dns; s=default; b=t+0hkWBpcj5MFcOLREvFs5HX6B9kd\n\tAH/WkzPILTSS1hNkhlLjSt/V9gACr67GImiXgUq0WmnaD1nnCmXCarOxfmX38pLX\n\tQrZS8RLf2+SAwfm02eOh6KbXgYHhpFwR9tiqEpm/QbEk7MRlfs19dp6cMFHY3tg6\n\tmCqM9w94LNYBiY=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:date:from:to:subject:message-id:mime-version\n\t:content-type; s=default; bh=YkCvmFKNoiehPkl+Qv2nmlyeTto=; b=pjs\n\tIowYRUdGZCIX0qyw9sM97s1Tt0AxxZdCxNYoWZprj2qIrAmjLT+z6lVtRLzHuG6Q\n\t3+wiZBcmzg/+sCvr4mrZbDZOheEGQCltQRoEBR2WKBFclBlQRh0cZQFHJ2HvkbM0\n\toeAACE4xjpHkVhBFwbcWQWkz81dRY6sBFfZ0LkqM=","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":",\n\t","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-24.5 required=5.0 tests=AWL, BAYES_00,\n\tGIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,\n\tRCVD_IN_DNSWL_NONE, SPF_PASS,\n\tURIBL_RED autolearn=ham version=3.3.2 spammy=","X-HELO":"relay1.mentorg.com","Date":"Tue, 5 Sep 2017 23:36:56 +0000","From":"Joseph Myers ","To":"","Subject":"Prefer new libm function wrappers for !LIBM_SVID_COMPAT [committed]","Message-ID":"","User-Agent":"Alpine 2.20 (DEB 67 2015-01-07)","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"US-ASCII\"","X-ClientProxiedBy":"svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To\n\tsvr-ies-mbx-01.mgc.mentorg.com (139.181.222.1)"},"content":"The initial obsoletion of SVID libm error handling left the old\nwrappers and __kernel_standard still being used for new ports and\nstatic linking, just with macro definitions of _LIB_VERSION and\nmatherr that meant symbols with those names were never actually used\nand the code for different error handling variants could be optimized\nout.\n\nThis patch cleans things up further by eliminating the\n__kernel_standard use for new ports and static linking. Now, the old\nwrappers no longer generate any code in the !LIBM_SVID_COMPAT case,\nwhile the new errno-only wrappers that were added for float128 support\nare now also used for float, double and long double in that case.\n\nThe changes are generally straightforward. The w_scalb*_compat\nwrappers continue to be used (scalb is obsolescent in the sense of not\nbeing supported for float128, but is present in supported standards -\nthe 2001 edition of POSIX and earlier XSI versions - so remains\nsupported for static linking and new ports, as do the float and long\ndouble variants that are existing GNU extensions). Those wrappers\nwould only call __kernel_standard in the _LIB_VERSION == _SVID_ case.\nSince we would like to be able to compile most of glibc without\noptimization, relying on a static function whose only use is under an\nif (0) condition being optimized away to avoid an undefined\n__kernel_standard reference may not be a good idea. Thus, the\nrelevant code in the scalb wrappers has LIBM_SVID_COMPAT conditionals\nadded to guarantee it's not built at all in the case where\n__kernel_standard does not exist.\n\nJust as i386 has its own w_sqrt_compat.c, so w_sqrt.c is also added.\nia64 gets dummy w_*.c to prevent those files being built where they\nwould conflict with the ia64 libm, as with its existing w_*_compat.c.\n\nConditions disabling code for !LIBM_SVID_COMPAT are needed in both the\nmath/ wrappers and in the long double wrappers in ldbl-opt (to avoid\nthem setting up aliases and symbol versions for undefined symbols). I\nhope that future cleanups to how libm function aliases and symbol\nversioning are done will eliminate the need for most of the ldbl-opt\nwrappers.\n\nTested for x86_64 and x86, and with build-many-glibcs.py. Committed.\n\n2017-09-05 Joseph Myers \n\n\t* sysdeps/generic/math-type-macros-double.h: Include\n\t.\n\t(__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.\n\t* sysdeps/generic/math-type-macros-float.h: Include\n\t.\n\t(__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.\n\t* sysdeps/generic/math-type-macros-ldouble.h: Include\n\t.\n\t(__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.\n\t* math/lgamma-compat.h (BUILD_LGAMMA): Include LIBM_SVID_COMPAT\n\tcondition.\n\t* math/w_acos_compat.c: Condition contents on [LIBM_SVID_COMPAT].\n\t* math/w_acosf_compat.c: Likewise.\n\t* math/w_acosh_compat.c: Likewise.\n\t* math/w_acoshf_compat.c: Likewise.\n\t* math/w_acoshl_compat.c: Likewise.\n\t* math/w_acosl_compat.c: Likewise.\n\t* math/w_asin_compat.c: Likewise.\n\t* math/w_asinf_compat.c: Likewise.\n\t* math/w_asinl_compat.c: Likewise.\n\t* math/w_atan2_compat.c: Likewise.\n\t* math/w_atan2f_compat.c: Likewise.\n\t* math/w_atan2l_compat.c: Likewise.\n\t* math/w_atanh_compat.c: Likewise.\n\t* math/w_atanhf_compat.c: Likewise.\n\t* math/w_atanhl_compat.c: Likewise.\n\t* math/w_cosh_compat.c: Likewise.\n\t* math/w_coshf_compat.c: Likewise.\n\t* math/w_coshl_compat.c: Likewise.\n\t* math/w_exp10_compat.c: Likewise.\n\t* math/w_exp10f_compat.c: Likewise.\n\t* math/w_exp10l_compat.c: Likewise.\n\t* math/w_exp2_compat.c: Likewise.\n\t* math/w_exp2f_compat.c: Likewise.\n\t* math/w_exp2l_compat.c: Likewise.\n\t* math/w_fmod_compat.c: Likewise.\n\t* math/w_fmodf_compat.c: Likewise.\n\t* math/w_fmodl_compat.c: Likewise.\n\t* math/w_hypot_compat.c: Likewise.\n\t* math/w_hypotf_compat.c: Likewise.\n\t* math/w_hypotl_compat.c: Likewise.\n\t* math/w_j0_compat.c: Likewise.\n\t* math/w_j0f_compat.c: Likewise.\n\t* math/w_j0l_compat.c: Likewise.\n\t* math/w_j1_compat.c: Likewise.\n\t* math/w_j1f_compat.c: Likewise.\n\t* math/w_j1l_compat.c: Likewise.\n\t* math/w_jn_compat.c: Likewise.\n\t* math/w_jnf_compat.c: Likewise.\n\t* math/w_jnl_compat.c: Likewise.\n\t* math/w_lgamma_r_compat.c: Likewise.\n\t* math/w_lgammaf_r_compat.c: Likewise.\n\t* math/w_lgammal_r_compat.c: Likewise.\n\t* math/w_log10_compat.c: Likewise.\n\t* math/w_log10f_compat.c: Likewise.\n\t* math/w_log10l_compat.c: Likewise.\n\t* math/w_log2_compat.c: Likewise.\n\t* math/w_log2f_compat.c: Likewise.\n\t* math/w_log2l_compat.c: Likewise.\n\t* math/w_log_compat.c: Likewise.\n\t* math/w_logf_compat.c: Likewise.\n\t* math/w_logl_compat.c: Likewise.\n\t* math/w_pow_compat.c: Likewise.\n\t* math/w_powf_compat.c: Likewise.\n\t* math/w_powl_compat.c: Likewise.\n\t* math/w_remainder_compat.c: Likewise.\n\t* math/w_remainderf_compat.c: Likewise.\n\t* math/w_remainderl_compat.c: Likewise.\n\t* math/w_sinh_compat.c: Likewise.\n\t* math/w_sinhf_compat.c: Likewise.\n\t* math/w_sinhl_compat.c: Likewise.\n\t* math/w_sqrt_compat.c: Likewise.\n\t* math/w_sqrtf_compat.c: Likewise.\n\t* math/w_sqrtl_compat.c: Likewise.\n\t* math/w_tgamma_compat.c: Likewise.\n\t* math/w_tgammaf_compat.c: Likewise.\n\t* math/w_tgammal_compat.c: Likewise.\n\t* math/w_scalb_compat.c (sysv_scalb): Condition definition on\n\t[LIBM_SVID_COMPAT].\n\t(__scalb): Condition call to sysv_scalb on [LIBM_SVID_COMPAT].\n\t* math/w_scalbf_compat.c (sysv_scalbf): Condition definition on\n\t[LIBM_SVID_COMPAT].\n\t(__scalbf): Condition call to sysv_scalbf on [LIBM_SVID_COMPAT].\n\t* math/w_scalbl_compat.c (sysv_scalbl): Condition definition on\n\t[LIBM_SVID_COMPAT].\n\t(__scalbl): Condition call to sysv_scalbl on [LIBM_SVID_COMPAT].\n\t* sysdeps/i386/fpu/w_sqrt.c: New file.\n\t* sysdeps/ia64/fpu/w_acos.c: Likewise.\n\t* sysdeps/ia64/fpu/w_acosf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_acosh.c: Likewise.\n\t* sysdeps/ia64/fpu/w_acoshf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_acoshl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_acosl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_asin.c: Likewise.\n\t* sysdeps/ia64/fpu/w_asinf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_asinl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_atan2.c: Likewise.\n\t* sysdeps/ia64/fpu/w_atan2f.c: Likewise.\n\t* sysdeps/ia64/fpu/w_atan2l.c: Likewise.\n\t* sysdeps/ia64/fpu/w_atanh.c: Likewise.\n\t* sysdeps/ia64/fpu/w_atanhf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_atanhl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_cosh.c: Likewise.\n\t* sysdeps/ia64/fpu/w_coshf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_coshl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_exp.c: Likewise.\n\t* sysdeps/ia64/fpu/w_exp10.c: Likewise.\n\t* sysdeps/ia64/fpu/w_exp10f.c: Likewise.\n\t* sysdeps/ia64/fpu/w_exp10l.c: Likewise.\n\t* sysdeps/ia64/fpu/w_exp2.c: Likewise.\n\t* sysdeps/ia64/fpu/w_exp2f.c: Likewise.\n\t* sysdeps/ia64/fpu/w_exp2l.c: Likewise.\n\t* sysdeps/ia64/fpu/w_expf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_expl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_fmod.c: Likewise.\n\t* sysdeps/ia64/fpu/w_fmodf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_fmodl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_hypot.c: Likewise.\n\t* sysdeps/ia64/fpu/w_hypotf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_hypotl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_lgamma_r.c: Likewise.\n\t* sysdeps/ia64/fpu/w_lgammaf_r.c: Likewise.\n\t* sysdeps/ia64/fpu/w_lgammal_r.c: Likewise.\n\t* sysdeps/ia64/fpu/w_log.c: Likewise.\n\t* sysdeps/ia64/fpu/w_log10.c: Likewise.\n\t* sysdeps/ia64/fpu/w_log10f.c: Likewise.\n\t* sysdeps/ia64/fpu/w_log10l.c: Likewise.\n\t* sysdeps/ia64/fpu/w_log2.c: Likewise.\n\t* sysdeps/ia64/fpu/w_log2f.c: Likewise.\n\t* sysdeps/ia64/fpu/w_log2l.c: Likewise.\n\t* sysdeps/ia64/fpu/w_logf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_logl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_pow.c: Likewise.\n\t* sysdeps/ia64/fpu/w_powf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_powl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_remainder.c: Likewise.\n\t* sysdeps/ia64/fpu/w_remainderf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_remainderl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_sinh.c: Likewise.\n\t* sysdeps/ia64/fpu/w_sinhf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_sinhl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_sqrt.c: Likewise.\n\t* sysdeps/ia64/fpu/w_sqrtf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_sqrtl.c: Likewise.\n\t* sysdeps/ia64/fpu/w_tgamma.c: Likewise.\n\t* sysdeps/ia64/fpu/w_tgammaf.c: Likewise.\n\t* sysdeps/ia64/fpu/w_tgammal.c: Likewise.\n\t* sysdeps/ieee754/dbl-64/w_exp_compat.c: Condition contents on\n\t[LIBM_SVID_COMPAT].\n\t* sysdeps/ieee754/flt-32/w_expf_compat.c: Likewise.\n\t* sysdeps/ieee754/k_standard.c: Likewise.\n\t* sysdeps/ieee754/k_standardf.c: Likewise.\n\t* sysdeps/ieee754/k_standardl.c: Likewise.\n\t* sysdeps/ieee754/ldbl-128/w_expl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-96/w_expl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-64-128/w_expl_compat.c: Condition\n\tlong_double_symbol call on [LIBM_SVID_COMPAT].\n\t* sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_acosl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_asinl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_coshl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_j0l_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_j1l_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_jnl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_log10l_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_log2l_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_logl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_powl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c: Likewise.\n\t* sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c: Condition\n\tlong_double_symbol and compat_symbol calls on [LIBM_SVID_COMPAT].","diff":"diff --git a/math/lgamma-compat.h b/math/lgamma-compat.h\nindex 189d126..b7b6b36 100644\n--- a/math/lgamma-compat.h\n+++ b/math/lgamma-compat.h\n@@ -41,7 +41,8 @@\n #define HAVE_LGAMMA_COMPAT SHLIB_COMPAT (libm, LGAMMA_OLD_VER, LGAMMA_NEW_VER)\n \n /* Whether to build this version at all. */\n-#define BUILD_LGAMMA (HAVE_LGAMMA_COMPAT || !USE_AS_COMPAT)\n+#define BUILD_LGAMMA \\\n+ (LIBM_SVID_COMPAT && (HAVE_LGAMMA_COMPAT || !USE_AS_COMPAT))\n \n /* The name to use for this version. */\n #if USE_AS_COMPAT\ndiff --git a/math/w_acos_compat.c b/math/w_acos_compat.c\nindex 5115732..1930105 100644\n--- a/math/w_acos_compat.c\n+++ b/math/w_acos_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper acos */\n double\n __acos (double x)\n@@ -37,7 +38,8 @@ __acos (double x)\n return __ieee754_acos (x);\n }\n weak_alias (__acos, acos)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__acos, __acosl)\n weak_alias (__acos, acosl)\n+# endif\n #endif\ndiff --git a/math/w_acosf_compat.c b/math/w_acosf_compat.c\nindex 0bf557c..97cac13 100644\n--- a/math/w_acosf_compat.c\n+++ b/math/w_acosf_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper acosf */\n float\n __acosf (float x)\n@@ -37,3 +38,4 @@ __acosf (float x)\n return __ieee754_acosf (x);\n }\n weak_alias (__acosf, acosf)\n+#endif\ndiff --git a/math/w_acosh_compat.c b/math/w_acosh_compat.c\nindex 31251ce..f6d298e 100644\n--- a/math/w_acosh_compat.c\n+++ b/math/w_acosh_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper acosh */\n double\n __acosh (double x)\n@@ -32,7 +33,8 @@ __acosh (double x)\n return __ieee754_acosh (x);\n }\n weak_alias (__acosh, acosh)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__acosh, __acoshl)\n weak_alias (__acosh, acoshl)\n+# endif\n #endif\ndiff --git a/math/w_acoshf_compat.c b/math/w_acoshf_compat.c\nindex 6a4482e..7a8c87b 100644\n--- a/math/w_acoshf_compat.c\n+++ b/math/w_acoshf_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper acoshf */\n float\n __acoshf (float x)\n@@ -32,3 +33,4 @@ __acoshf (float x)\n return __ieee754_acoshf (x);\n }\n weak_alias (__acoshf, acoshf)\n+#endif\ndiff --git a/math/w_acoshl_compat.c b/math/w_acoshl_compat.c\nindex b9f66c5..79d0370 100644\n--- a/math/w_acoshl_compat.c\n+++ b/math/w_acoshl_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper acosl */\n long double\n __acoshl (long double x)\n@@ -32,3 +33,4 @@ __acoshl (long double x)\n return __ieee754_acoshl (x);\n }\n weak_alias (__acoshl, acoshl)\n+#endif\ndiff --git a/math/w_acosl_compat.c b/math/w_acosl_compat.c\nindex 66600b5..7d2f183 100644\n--- a/math/w_acosl_compat.c\n+++ b/math/w_acosl_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper acosl */\n long double\n __acosl (long double x)\n@@ -37,3 +38,4 @@ __acosl (long double x)\n return __ieee754_acosl (x);\n }\n weak_alias (__acosl, acosl)\n+#endif\ndiff --git a/math/w_asin_compat.c b/math/w_asin_compat.c\nindex 59beea8..7780f85 100644\n--- a/math/w_asin_compat.c\n+++ b/math/w_asin_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper asin */\n double\n __asin (double x)\n@@ -37,7 +38,8 @@ __asin (double x)\n return __ieee754_asin (x);\n }\n weak_alias (__asin, asin)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__asin, __asinl)\n weak_alias (__asin, asinl)\n+# endif\n #endif\ndiff --git a/math/w_asinf_compat.c b/math/w_asinf_compat.c\nindex 0eb20b1..10ee323 100644\n--- a/math/w_asinf_compat.c\n+++ b/math/w_asinf_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper asinf */\n float\n __asinf (float x)\n@@ -37,3 +38,4 @@ __asinf (float x)\n return __ieee754_asinf (x);\n }\n weak_alias (__asinf, asinf)\n+#endif\ndiff --git a/math/w_asinl_compat.c b/math/w_asinl_compat.c\nindex c8f4d15..c9e1a34 100644\n--- a/math/w_asinl_compat.c\n+++ b/math/w_asinl_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper asinl */\n long double\n __asinl (long double x)\n@@ -37,3 +38,4 @@ __asinl (long double x)\n return __ieee754_asinl (x);\n }\n weak_alias (__asinl, asinl)\n+#endif\ndiff --git a/math/w_atan2_compat.c b/math/w_atan2_compat.c\nindex fa098ff..1ca3349 100644\n--- a/math/w_atan2_compat.c\n+++ b/math/w_atan2_compat.c\n@@ -26,6 +26,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n double\n __atan2 (double y, double x)\n {\n@@ -40,7 +41,8 @@ __atan2 (double y, double x)\n return z;\n }\n weak_alias (__atan2, atan2)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__atan2, __atan2l)\n weak_alias (__atan2, atan2l)\n+# endif\n #endif\ndiff --git a/math/w_atan2f_compat.c b/math/w_atan2f_compat.c\nindex 15e05d8..8d7ad71 100644\n--- a/math/w_atan2f_compat.c\n+++ b/math/w_atan2f_compat.c\n@@ -26,6 +26,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n float\n __atan2f (float y, float x)\n {\n@@ -40,3 +41,4 @@ __atan2f (float y, float x)\n return z;\n }\n weak_alias (__atan2f, atan2f)\n+#endif\ndiff --git a/math/w_atan2l_compat.c b/math/w_atan2l_compat.c\nindex 87b7394..9dc2b14 100644\n--- a/math/w_atan2l_compat.c\n+++ b/math/w_atan2l_compat.c\n@@ -26,6 +26,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n long double\n __atan2l (long double y, long double x)\n {\n@@ -40,3 +41,4 @@ __atan2l (long double y, long double x)\n return z;\n }\n weak_alias (__atan2l, atan2l)\n+#endif\ndiff --git a/math/w_atanh_compat.c b/math/w_atanh_compat.c\nindex f7a43be..c2cbb2e 100644\n--- a/math/w_atanh_compat.c\n+++ b/math/w_atanh_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper atanh */\n double\n __atanh (double x)\n@@ -35,7 +36,8 @@ __atanh (double x)\n return __ieee754_atanh (x);\n }\n weak_alias (__atanh, atanh)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__atanh, __atanhl)\n weak_alias (__atanh, atanhl)\n+# endif\n #endif\ndiff --git a/math/w_atanhf_compat.c b/math/w_atanhf_compat.c\nindex c9d2c3a..6045188 100644\n--- a/math/w_atanhf_compat.c\n+++ b/math/w_atanhf_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper atanhf */\n float\n __atanhf (float x)\n@@ -35,3 +36,4 @@ __atanhf (float x)\n return __ieee754_atanhf (x);\n }\n weak_alias (__atanhf, atanhf)\n+#endif\ndiff --git a/math/w_atanhl_compat.c b/math/w_atanhl_compat.c\nindex 56f9f1e..837a665 100644\n--- a/math/w_atanhl_compat.c\n+++ b/math/w_atanhl_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper atanhl */\n long double\n __atanhl (long double x)\n@@ -35,3 +36,4 @@ __atanhl (long double x)\n return __ieee754_atanhl (x);\n }\n weak_alias (__atanhl, atanhl)\n+#endif\ndiff --git a/math/w_cosh_compat.c b/math/w_cosh_compat.c\nindex fd16436..d0cb6b1 100644\n--- a/math/w_cosh_compat.c\n+++ b/math/w_cosh_compat.c\n@@ -18,6 +18,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n double\n __cosh (double x)\n {\n@@ -29,7 +30,8 @@ __cosh (double x)\n \treturn z;\n }\n weak_alias (__cosh, cosh)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__cosh, __coshl)\n weak_alias (__cosh, coshl)\n+# endif\n #endif\ndiff --git a/math/w_coshf_compat.c b/math/w_coshf_compat.c\nindex dd62281..b5d5316 100644\n--- a/math/w_coshf_compat.c\n+++ b/math/w_coshf_compat.c\n@@ -22,6 +22,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n float\n __coshf (float x)\n {\n@@ -33,3 +34,4 @@ __coshf (float x)\n \treturn z;\n }\n weak_alias (__coshf, coshf)\n+#endif\ndiff --git a/math/w_coshl_compat.c b/math/w_coshl_compat.c\nindex 5fa32be..4dab6ef 100644\n--- a/math/w_coshl_compat.c\n+++ b/math/w_coshl_compat.c\n@@ -23,6 +23,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double\n __coshl (long double x)\n {\n@@ -34,3 +35,4 @@ __coshl (long double x)\n \treturn z;\n }\n weak_alias (__coshl, coshl)\n+#endif\ndiff --git a/math/w_exp10_compat.c b/math/w_exp10_compat.c\nindex 5256f5b..42dc312 100644\n--- a/math/w_exp10_compat.c\n+++ b/math/w_exp10_compat.c\n@@ -25,6 +25,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n double\n __exp10 (double x)\n {\n@@ -37,15 +38,16 @@ __exp10 (double x)\n return z;\n }\n weak_alias (__exp10, exp10)\n-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n strong_alias (__exp10, __pow10)\n compat_symbol (libm, __pow10, pow10, GLIBC_2_1);\n-#endif\n-#ifdef NO_LONG_DOUBLE\n+# endif\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__exp10, __exp10l)\n weak_alias (__exp10, exp10l)\n-# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n strong_alias (__exp10l, __pow10l)\n compat_symbol (libm, __pow10l, pow10l, GLIBC_2_1);\n+# endif\n # endif\n #endif\ndiff --git a/math/w_exp10f_compat.c b/math/w_exp10f_compat.c\nindex c559e6a..bacf2eb 100644\n--- a/math/w_exp10f_compat.c\n+++ b/math/w_exp10f_compat.c\n@@ -25,6 +25,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n float\n __exp10f (float x)\n {\n@@ -37,7 +38,8 @@ __exp10f (float x)\n return z;\n }\n weak_alias (__exp10f, exp10f)\n-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n strong_alias (__exp10f, __pow10f)\n compat_symbol (libm, __pow10f, pow10f, GLIBC_2_1);\n+# endif\n #endif\ndiff --git a/math/w_exp10l_compat.c b/math/w_exp10l_compat.c\nindex 03b7ce9..3d7d66d 100644\n--- a/math/w_exp10l_compat.c\n+++ b/math/w_exp10l_compat.c\n@@ -25,6 +25,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double\n __exp10l (long double x)\n {\n@@ -37,7 +38,8 @@ __exp10l (long double x)\n return z;\n }\n weak_alias (__exp10l, exp10l)\n-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n strong_alias (__exp10l, __pow10l)\n compat_symbol (libm, __pow10l, pow10l, GLIBC_2_1);\n+# endif\n #endif\ndiff --git a/math/w_exp2_compat.c b/math/w_exp2_compat.c\nindex a4d4653..5739547 100644\n--- a/math/w_exp2_compat.c\n+++ b/math/w_exp2_compat.c\n@@ -6,6 +6,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n double\n __exp2 (double x)\n {\n@@ -18,7 +19,8 @@ __exp2 (double x)\n return z;\n }\n weak_alias (__exp2, exp2)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__exp2, __exp2l)\n weak_alias (__exp2, exp2l)\n+# endif\n #endif\ndiff --git a/math/w_exp2f_compat.c b/math/w_exp2f_compat.c\nindex b21fe36..b058dae 100644\n--- a/math/w_exp2f_compat.c\n+++ b/math/w_exp2f_compat.c\n@@ -6,6 +6,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n float\n __exp2f (float x)\n {\n@@ -18,3 +19,4 @@ __exp2f (float x)\n return z;\n }\n weak_alias (__exp2f, exp2f)\n+#endif\ndiff --git a/math/w_exp2l_compat.c b/math/w_exp2l_compat.c\nindex 04cd666..96d4b96 100644\n--- a/math/w_exp2l_compat.c\n+++ b/math/w_exp2l_compat.c\n@@ -6,6 +6,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double\n __exp2l (long double x)\n {\n@@ -18,3 +19,4 @@ __exp2l (long double x)\n return z;\n }\n weak_alias (__exp2l, exp2l)\n+#endif\ndiff --git a/math/w_fmod_compat.c b/math/w_fmod_compat.c\nindex 1079d3a..f75b861 100644\n--- a/math/w_fmod_compat.c\n+++ b/math/w_fmod_compat.c\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n /* wrapper fmod */\n double\n __fmod (double x, double y)\n@@ -32,7 +33,8 @@ __fmod (double x, double y)\n return __ieee754_fmod (x, y);\n }\n weak_alias (__fmod, fmod)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__fmod, __fmodl)\n weak_alias (__fmod, fmodl)\n+# endif\n #endif\ndiff --git a/math/w_fmodf_compat.c b/math/w_fmodf_compat.c\nindex 88b64a2..a2739d8 100644\n--- a/math/w_fmodf_compat.c\n+++ b/math/w_fmodf_compat.c\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n /* wrapper fmodf */\n float\n __fmodf (float x, float y)\n@@ -32,3 +33,4 @@ __fmodf (float x, float y)\n return __ieee754_fmodf (x, y);\n }\n weak_alias (__fmodf, fmodf)\n+#endif\ndiff --git a/math/w_fmodl_compat.c b/math/w_fmodl_compat.c\nindex 23422fa..3136e82 100644\n--- a/math/w_fmodl_compat.c\n+++ b/math/w_fmodl_compat.c\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n /* wrapper fmodl */\n long double\n __fmodl (long double x, long double y)\n@@ -32,3 +33,4 @@ __fmodl (long double x, long double y)\n return __ieee754_fmodl (x, y);\n }\n weak_alias (__fmodl, fmodl)\n+#endif\ndiff --git a/math/w_hypot_compat.c b/math/w_hypot_compat.c\nindex ff3774c..21c7e65 100644\n--- a/math/w_hypot_compat.c\n+++ b/math/w_hypot_compat.c\n@@ -19,6 +19,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n double\n __hypot (double x, double y)\n {\n@@ -30,7 +31,8 @@ __hypot (double x, double y)\n \treturn z;\n }\n weak_alias (__hypot, hypot)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__hypot, __hypotl)\n weak_alias (__hypot, hypotl)\n+# endif\n #endif\ndiff --git a/math/w_hypotf_compat.c b/math/w_hypotf_compat.c\nindex 0a43d90..8e6d234 100644\n--- a/math/w_hypotf_compat.c\n+++ b/math/w_hypotf_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n float\n __hypotf(float x, float y)\n {\n@@ -34,3 +35,4 @@ __hypotf(float x, float y)\n \treturn z;\n }\n weak_alias (__hypotf, hypotf)\n+#endif\ndiff --git a/math/w_hypotl_compat.c b/math/w_hypotl_compat.c\nindex 13060f7..bc56d29 100644\n--- a/math/w_hypotl_compat.c\n+++ b/math/w_hypotl_compat.c\n@@ -23,6 +23,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n long double\n __hypotl(long double x, long double y)\n {\n@@ -35,3 +36,4 @@ __hypotl(long double x, long double y)\n \treturn z;\n }\n weak_alias (__hypotl, hypotl)\n+#endif\ndiff --git a/math/w_j0_compat.c b/math/w_j0_compat.c\nindex 80d21ac..3df71e0 100644\n--- a/math/w_j0_compat.c\n+++ b/math/w_j0_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper j0 */\n double\n j0 (double x)\n@@ -33,9 +34,9 @@ j0 (double x)\n \n return __ieee754_j0 (x);\n }\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n weak_alias (j0, j0l)\n-#endif\n+# endif\n \n \n /* wrapper y0 */\n@@ -64,6 +65,7 @@ y0 (double x)\n \n return __ieee754_y0 (x);\n }\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n weak_alias (y0, y0l)\n+# endif\n #endif\ndiff --git a/math/w_j0f_compat.c b/math/w_j0f_compat.c\nindex 36fc4f9..e9ac74f 100644\n--- a/math/w_j0f_compat.c\n+++ b/math/w_j0f_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper j0f */\n float\n j0f (float x)\n@@ -62,3 +63,4 @@ y0f (float x)\n \n return __ieee754_y0f (x);\n }\n+#endif\ndiff --git a/math/w_j0l_compat.c b/math/w_j0l_compat.c\nindex ff7e1b1..76ec812 100644\n--- a/math/w_j0l_compat.c\n+++ b/math/w_j0l_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper j0l */\n long double\n __j0l (long double x)\n@@ -63,3 +64,4 @@ __y0l (long double x)\n return __ieee754_y0l (x);\n }\n weak_alias (__y0l, y0l)\n+#endif\ndiff --git a/math/w_j1_compat.c b/math/w_j1_compat.c\nindex f7a76c1..be788f9 100644\n--- a/math/w_j1_compat.c\n+++ b/math/w_j1_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper j1 */\n double\n j1 (double x)\n@@ -33,9 +34,9 @@ j1 (double x)\n \n return __ieee754_j1 (x);\n }\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n weak_alias (j1, j1l)\n-#endif\n+# endif\n \n \n /* wrapper y1 */\n@@ -64,6 +65,7 @@ y1 (double x)\n \n return __ieee754_y1 (x);\n }\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n weak_alias (y1, y1l)\n+# endif\n #endif\ndiff --git a/math/w_j1f_compat.c b/math/w_j1f_compat.c\nindex 9aa5c8c..c3222bb 100644\n--- a/math/w_j1f_compat.c\n+++ b/math/w_j1f_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper j1f */\n float\n j1f (float x)\n@@ -62,3 +63,4 @@ y1f (float x)\n \n return __ieee754_y1f (x);\n }\n+#endif\ndiff --git a/math/w_j1l_compat.c b/math/w_j1l_compat.c\nindex 7e6d9f5..c3acfdf 100644\n--- a/math/w_j1l_compat.c\n+++ b/math/w_j1l_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper j1l */\n long double\n __j1l (long double x)\n@@ -63,3 +64,4 @@ __y1l (long double x)\n return __ieee754_y1l (x);\n }\n weak_alias (__y1l, y1l)\n+#endif\ndiff --git a/math/w_jn_compat.c b/math/w_jn_compat.c\nindex 7c49992..496c779 100644\n--- a/math/w_jn_compat.c\n+++ b/math/w_jn_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper jn */\n double\n jn (int n, double x)\n@@ -33,9 +34,9 @@ jn (int n, double x)\n \n return __ieee754_jn (n, x);\n }\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n weak_alias (jn, jnl)\n-#endif\n+# endif\n \n \n /* wrapper yn */\n@@ -64,6 +65,7 @@ yn (int n, double x)\n \n return __ieee754_yn (n, x);\n }\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n weak_alias (yn, ynl)\n+# endif\n #endif\ndiff --git a/math/w_jnf_compat.c b/math/w_jnf_compat.c\nindex ead40e7..440d53d 100644\n--- a/math/w_jnf_compat.c\n+++ b/math/w_jnf_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper jnf */\n float\n jnf (int n, float x)\n@@ -62,3 +63,4 @@ ynf (int n, float x)\n \n return __ieee754_ynf (n, x);\n }\n+#endif\ndiff --git a/math/w_jnl_compat.c b/math/w_jnl_compat.c\nindex bc41635..7298c73 100644\n--- a/math/w_jnl_compat.c\n+++ b/math/w_jnl_compat.c\n@@ -48,11 +48,12 @@ static char rcsid[] = \"$NetBSD: $\";\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double __jnl(int n, long double x)\t/* wrapper jnl */\n {\n-#ifdef _IEEE_LIBM\n+# ifdef _IEEE_LIBM\n \treturn __ieee754_jnl(n,x);\n-#else\n+# else\n \tlong double z;\n \tz = __ieee754_jnl(n,x);\n \tif (_LIB_VERSION == _IEEE_\n@@ -63,15 +64,15 @@ long double __jnl(int n, long double x)\t/* wrapper jnl */\n \t return __kernel_standard_l((double)n,x,238); /* jn(|x|>X_TLOSS,n) */\n \t} else\n \t return z;\n-#endif\n+# endif\n }\n weak_alias (__jnl, jnl)\n \n long double __ynl(int n, long double x)\t/* wrapper ynl */\n {\n-#ifdef _IEEE_LIBM\n+# ifdef _IEEE_LIBM\n \treturn __ieee754_ynl(n,x);\n-#else\n+# else\n \tlong double z;\n \tz = __ieee754_ynl(n,x);\n \tif(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;\n@@ -87,6 +88,7 @@ long double __ynl(int n, long double x)\t/* wrapper ynl */\n \t return __kernel_standard_l((double)n,x,239); /* yn(x>X_TLOSS,n) */\n \t} else\n \t return z;\n-#endif\n+# endif\n }\n weak_alias (__ynl, ynl)\n+#endif\ndiff --git a/math/w_lgamma_r_compat.c b/math/w_lgamma_r_compat.c\nindex 3f7fbce..f88a5df 100644\n--- a/math/w_lgamma_r_compat.c\n+++ b/math/w_lgamma_r_compat.c\n@@ -19,6 +19,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n double\n __lgamma_r(double x, int *signgamp)\n {\n@@ -33,7 +34,8 @@ __lgamma_r(double x, int *signgamp)\n \treturn y;\n }\n weak_alias (__lgamma_r, lgamma_r)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__lgamma_r, __lgammal_r)\n weak_alias (__lgamma_r, lgammal_r)\n+# endif\n #endif\ndiff --git a/math/w_lgammaf_r_compat.c b/math/w_lgammaf_r_compat.c\nindex d9601f4..86003de 100644\n--- a/math/w_lgammaf_r_compat.c\n+++ b/math/w_lgammaf_r_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n float\n __lgammaf_r(float x, int *signgamp)\n {\n@@ -36,3 +37,4 @@ __lgammaf_r(float x, int *signgamp)\n \treturn y;\n }\n weak_alias (__lgammaf_r, lgammaf_r)\n+#endif\ndiff --git a/math/w_lgammal_r_compat.c b/math/w_lgammal_r_compat.c\nindex d1b58e4..781bfa4 100644\n--- a/math/w_lgammal_r_compat.c\n+++ b/math/w_lgammal_r_compat.c\n@@ -23,6 +23,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n long double\n __lgammal_r(long double x, int *signgamp)\n {\n@@ -37,3 +38,4 @@ __lgammal_r(long double x, int *signgamp)\n \treturn y;\n }\n weak_alias (__lgammal_r, lgammal_r)\n+#endif\ndiff --git a/math/w_log10_compat.c b/math/w_log10_compat.c\nindex 6f3eb34..b8247aa 100644\n--- a/math/w_log10_compat.c\n+++ b/math/w_log10_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper log10(x) */\n double\n __log10 (double x)\n@@ -43,7 +44,8 @@ __log10 (double x)\n return __ieee754_log10 (x);\n }\n weak_alias (__log10, log10)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__log10, __log10l)\n weak_alias (__log10, log10l)\n+# endif\n #endif\ndiff --git a/math/w_log10f_compat.c b/math/w_log10f_compat.c\nindex 2cb5c9a..151c94b 100644\n--- a/math/w_log10f_compat.c\n+++ b/math/w_log10f_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper log10f(x) */\n float\n __log10f (float x)\n@@ -43,3 +44,4 @@ __log10f (float x)\n return __ieee754_log10f (x);\n }\n weak_alias (__log10f, log10f)\n+#endif\ndiff --git a/math/w_log10l_compat.c b/math/w_log10l_compat.c\nindex 0063c50..88d9c40 100644\n--- a/math/w_log10l_compat.c\n+++ b/math/w_log10l_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper log10l(x) */\n long double\n __log10l (long double x)\n@@ -43,3 +44,4 @@ __log10l (long double x)\n return __ieee754_log10l (x);\n }\n weak_alias (__log10l, log10l)\n+#endif\ndiff --git a/math/w_log2_compat.c b/math/w_log2_compat.c\nindex 252fc0d..6d1f9f2 100644\n--- a/math/w_log2_compat.c\n+++ b/math/w_log2_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper log2(x) */\n double\n __log2 (double x)\n@@ -43,7 +44,8 @@ __log2 (double x)\n return __ieee754_log2 (x);\n }\n weak_alias (__log2, log2)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__log2, __log2l)\n weak_alias (__log2, log2l)\n+# endif\n #endif\ndiff --git a/math/w_log2f_compat.c b/math/w_log2f_compat.c\nindex 6adaff6..82085d5 100644\n--- a/math/w_log2f_compat.c\n+++ b/math/w_log2f_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper log2f(x) */\n float\n __log2f (float x)\n@@ -43,3 +44,4 @@ __log2f (float x)\n return __ieee754_log2f (x);\n }\n weak_alias (__log2f, log2f)\n+#endif\ndiff --git a/math/w_log2l_compat.c b/math/w_log2l_compat.c\nindex f496c36..cd367f2 100644\n--- a/math/w_log2l_compat.c\n+++ b/math/w_log2l_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper log2l(x) */\n long double\n __log2l (long double x)\n@@ -43,3 +44,4 @@ __log2l (long double x)\n return __ieee754_log2l (x);\n }\n weak_alias (__log2l, log2l)\n+#endif\ndiff --git a/math/w_log_compat.c b/math/w_log_compat.c\nindex 82f3ff4..80750b4 100644\n--- a/math/w_log_compat.c\n+++ b/math/w_log_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper log(x) */\n double\n __log (double x)\n@@ -43,7 +44,8 @@ __log (double x)\n return __ieee754_log (x);\n }\n weak_alias (__log, log)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__log, __logl)\n weak_alias (__log, logl)\n+# endif\n #endif\ndiff --git a/math/w_logf_compat.c b/math/w_logf_compat.c\nindex ac18b65..4423bd5 100644\n--- a/math/w_logf_compat.c\n+++ b/math/w_logf_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper logf(x) */\n float\n __logf (float x)\n@@ -43,3 +44,4 @@ __logf (float x)\n return __ieee754_logf (x);\n }\n weak_alias (__logf, logf)\n+#endif\ndiff --git a/math/w_logl_compat.c b/math/w_logl_compat.c\nindex ba65830..e37a174 100644\n--- a/math/w_logl_compat.c\n+++ b/math/w_logl_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper logl(x) */\n long double\n __logl (long double x)\n@@ -43,3 +44,4 @@ __logl (long double x)\n return __ieee754_logl (x);\n }\n weak_alias (__logl, logl)\n+#endif\ndiff --git a/math/w_pow_compat.c b/math/w_pow_compat.c\nindex 367f609..4865f4d 100644\n--- a/math/w_pow_compat.c\n+++ b/math/w_pow_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper pow */\n double\n __pow (double x, double y)\n@@ -59,7 +60,8 @@ __pow (double x, double y)\n return z;\n }\n weak_alias (__pow, pow)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__pow, __powl)\n weak_alias (__pow, powl)\n+# endif\n #endif\ndiff --git a/math/w_powf_compat.c b/math/w_powf_compat.c\nindex afc3fce..ce1235b 100644\n--- a/math/w_powf_compat.c\n+++ b/math/w_powf_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper powf */\n float\n __powf (float x, float y)\n@@ -59,3 +60,4 @@ __powf (float x, float y)\n return z;\n }\n weak_alias (__powf, powf)\n+#endif\ndiff --git a/math/w_powl_compat.c b/math/w_powl_compat.c\nindex b25dad8..9159f61 100644\n--- a/math/w_powl_compat.c\n+++ b/math/w_powl_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper powl */\n long double\n __powl (long double x, long double y)\n@@ -59,3 +60,4 @@ __powl (long double x, long double y)\n return z;\n }\n weak_alias (__powl, powl)\n+#endif\ndiff --git a/math/w_remainder_compat.c b/math/w_remainder_compat.c\nindex 6bf5d1f..68e322e 100644\n--- a/math/w_remainder_compat.c\n+++ b/math/w_remainder_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper remainder */\n double\n __remainder (double x, double y)\n@@ -34,8 +35,9 @@ __remainder (double x, double y)\n }\n weak_alias (__remainder, remainder)\n weak_alias (__remainder, drem)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__remainder, __remainderl)\n weak_alias (__remainder, remainderl)\n weak_alias (__remainder, dreml)\n+# endif\n #endif\ndiff --git a/math/w_remainderf_compat.c b/math/w_remainderf_compat.c\nindex 3ffefde..39ff3b4 100644\n--- a/math/w_remainderf_compat.c\n+++ b/math/w_remainderf_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper remainderf */\n float\n __remainderf (float x, float y)\n@@ -34,3 +35,4 @@ __remainderf (float x, float y)\n }\n weak_alias (__remainderf, remainderf)\n weak_alias (__remainderf, dremf)\n+#endif\ndiff --git a/math/w_remainderl_compat.c b/math/w_remainderl_compat.c\nindex b01b0b1..c11ba24 100644\n--- a/math/w_remainderl_compat.c\n+++ b/math/w_remainderl_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper remainderl */\n long double\n __remainderl (long double x, long double y)\n@@ -34,3 +35,4 @@ __remainderl (long double x, long double y)\n }\n weak_alias (__remainderl, remainderl)\n weak_alias (__remainderl, dreml)\n+#endif\ndiff --git a/math/w_scalb_compat.c b/math/w_scalb_compat.c\nindex a31e54d..277e724 100644\n--- a/math/w_scalb_compat.c\n+++ b/math/w_scalb_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n static double\n __attribute__ ((noinline))\n sysv_scalb (double x, double fn)\n@@ -40,15 +41,18 @@ sysv_scalb (double x, double fn)\n \n return z;\n }\n+#endif\n \n \n /* Wrapper scalb */\n double\n __scalb (double x, double fn)\n {\n+#if LIBM_SVID_COMPAT\n if (__glibc_unlikely (_LIB_VERSION == _SVID_))\n return sysv_scalb (x, fn);\n else\n+#endif\n {\n double z = __ieee754_scalb (x, fn);\n \ndiff --git a/math/w_scalbf_compat.c b/math/w_scalbf_compat.c\nindex 2b96df0..79798ae 100644\n--- a/math/w_scalbf_compat.c\n+++ b/math/w_scalbf_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n static float\n __attribute__ ((noinline))\n sysv_scalbf (float x, float fn)\n@@ -40,15 +41,18 @@ sysv_scalbf (float x, float fn)\n \n return z;\n }\n+#endif\n \n \n /* Wrapper scalbf */\n float\n __scalbf (float x, float fn)\n {\n+#if LIBM_SVID_COMPAT\n if (__glibc_unlikely (_LIB_VERSION == _SVID_))\n return sysv_scalbf (x, fn);\n else\n+#endif\n {\n float z = __ieee754_scalbf (x, fn);\n \ndiff --git a/math/w_scalbl_compat.c b/math/w_scalbl_compat.c\nindex a4a0f8e..4c73e6b 100644\n--- a/math/w_scalbl_compat.c\n+++ b/math/w_scalbl_compat.c\n@@ -22,6 +22,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n static long double\n __attribute__ ((noinline))\n sysv_scalbl (long double x, long double fn)\n@@ -40,15 +41,18 @@ sysv_scalbl (long double x, long double fn)\n \n return z;\n }\n+#endif\n \n \n /* Wrapper scalbl */\n long double\n __scalbl (long double x, long double fn)\n {\n+#if LIBM_SVID_COMPAT\n if (__glibc_unlikely (_LIB_VERSION == _SVID_))\n return sysv_scalbl (x, fn);\n else\n+#endif\n {\n long double z = __ieee754_scalbl (x, fn);\n \ndiff --git a/math/w_sinh_compat.c b/math/w_sinh_compat.c\nindex 121edfc..e5c3724 100644\n--- a/math/w_sinh_compat.c\n+++ b/math/w_sinh_compat.c\n@@ -18,6 +18,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n double\n __sinh (double x)\n {\n@@ -29,7 +30,8 @@ __sinh (double x)\n \treturn z;\n }\n weak_alias (__sinh, sinh)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__sinh, __sinhl)\n weak_alias (__sinh, sinhl)\n+# endif\n #endif\ndiff --git a/math/w_sinhf_compat.c b/math/w_sinhf_compat.c\nindex 2103b06..1310ccf 100644\n--- a/math/w_sinhf_compat.c\n+++ b/math/w_sinhf_compat.c\n@@ -21,6 +21,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n float\n __sinhf (float x)\n {\n@@ -32,3 +33,4 @@ __sinhf (float x)\n \treturn z;\n }\n weak_alias (__sinhf, sinhf)\n+#endif\ndiff --git a/math/w_sinhl_compat.c b/math/w_sinhl_compat.c\nindex 57f08e7..3482098 100644\n--- a/math/w_sinhl_compat.c\n+++ b/math/w_sinhl_compat.c\n@@ -22,6 +22,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double\n __sinhl (long double x)\n {\n@@ -33,3 +34,4 @@ __sinhl (long double x)\n \treturn z;\n }\n weak_alias (__sinhl, sinhl)\n+#endif\ndiff --git a/math/w_sqrt_compat.c b/math/w_sqrt_compat.c\nindex 743df32..aeead2e 100644\n--- a/math/w_sqrt_compat.c\n+++ b/math/w_sqrt_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper sqrt */\n double\n __sqrt (double x)\n@@ -31,7 +32,8 @@ __sqrt (double x)\n return __ieee754_sqrt (x);\n }\n weak_alias (__sqrt, sqrt)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__sqrt, __sqrtl)\n weak_alias (__sqrt, sqrtl)\n+# endif\n #endif\ndiff --git a/math/w_sqrtf_compat.c b/math/w_sqrtf_compat.c\nindex 0689b4b..bd3d504 100644\n--- a/math/w_sqrtf_compat.c\n+++ b/math/w_sqrtf_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper sqrtf */\n float\n __sqrtf (float x)\n@@ -31,3 +32,4 @@ __sqrtf (float x)\n return __ieee754_sqrtf (x);\n }\n weak_alias (__sqrtf, sqrtf)\n+#endif\ndiff --git a/math/w_sqrtl_compat.c b/math/w_sqrtl_compat.c\nindex 43e81ac..b0afd11 100644\n--- a/math/w_sqrtl_compat.c\n+++ b/math/w_sqrtl_compat.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* wrapper sqrtl */\n long double\n __sqrtl (long double x)\n@@ -31,3 +32,4 @@ __sqrtl (long double x)\n return __ieee754_sqrtl (x);\n }\n weak_alias (__sqrtl, sqrtl)\n+#endif\ndiff --git a/math/w_tgamma_compat.c b/math/w_tgamma_compat.c\nindex 93bd48f..f843475 100644\n--- a/math/w_tgamma_compat.c\n+++ b/math/w_tgamma_compat.c\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n double\n __tgamma(double x)\n {\n@@ -41,7 +42,8 @@ __tgamma(double x)\n \treturn local_signgam < 0 ? -y : y;\n }\n weak_alias (__tgamma, tgamma)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__tgamma, __tgammal)\n weak_alias (__tgamma, tgammal)\n+# endif\n #endif\ndiff --git a/math/w_tgammaf_compat.c b/math/w_tgammaf_compat.c\nindex e6ae48c..796850b 100644\n--- a/math/w_tgammaf_compat.c\n+++ b/math/w_tgammaf_compat.c\n@@ -18,6 +18,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n float\n __tgammaf(float x)\n {\n@@ -43,3 +44,4 @@ __tgammaf(float x)\n \treturn local_signgam < 0 ? - y : y;\n }\n weak_alias (__tgammaf, tgammaf)\n+#endif\ndiff --git a/math/w_tgammal_compat.c b/math/w_tgammal_compat.c\nindex 306f672..c0e4429 100644\n--- a/math/w_tgammal_compat.c\n+++ b/math/w_tgammal_compat.c\n@@ -23,6 +23,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double\n __tgammal(long double x)\n {\n@@ -44,3 +45,4 @@ __tgammal(long double x)\n \treturn local_signgam < 0 ? - y : y;\n }\n weak_alias (__tgammal, tgammal)\n+#endif\ndiff --git a/sysdeps/generic/math-type-macros-double.h b/sysdeps/generic/math-type-macros-double.h\nindex 6116f7f..a755699 100644\n--- a/sysdeps/generic/math-type-macros-double.h\n+++ b/sysdeps/generic/math-type-macros-double.h\n@@ -47,7 +47,9 @@\n /* Supply the generic macros. */\n #include \n \n-/* Do not use the type-generic wrapper templates. */\n-#define __USE_WRAPPER_TEMPLATE 0\n+/* Do not use the type-generic wrapper templates if compatibility with\n+ SVID error handling is needed. */\n+#include \n+#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT\n \n #endif\ndiff --git a/sysdeps/generic/math-type-macros-float.h b/sysdeps/generic/math-type-macros-float.h\nindex 712e517..cc8c4b0 100644\n--- a/sysdeps/generic/math-type-macros-float.h\n+++ b/sysdeps/generic/math-type-macros-float.h\n@@ -33,7 +33,9 @@\n /* Supply the generic macros. */\n #include \n \n-/* Do not use the type-generic wrapper templates. */\n-#define __USE_WRAPPER_TEMPLATE 0\n+/* Do not use the type-generic wrapper templates if compatibility with\n+ SVID error handling is needed. */\n+#include \n+#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT\n \n #endif\ndiff --git a/sysdeps/generic/math-type-macros-ldouble.h b/sysdeps/generic/math-type-macros-ldouble.h\nindex 4e02e53..7dbd559 100644\n--- a/sysdeps/generic/math-type-macros-ldouble.h\n+++ b/sysdeps/generic/math-type-macros-ldouble.h\n@@ -30,7 +30,9 @@\n /* Supply the generic macros. */\n #include \n \n-/* Do not use the type-generic wrapper templates. */\n-#define __USE_WRAPPER_TEMPLATE 0\n+/* Do not use the type-generic wrapper templates if compatibility with\n+ SVID error handling is needed. */\n+#include \n+#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT\n \n #endif\ndiff --git a/sysdeps/i386/fpu/w_sqrt.c b/sysdeps/i386/fpu/w_sqrt.c\nnew file mode 100644\nindex 0000000..d37a5d5\n--- /dev/null\n+++ b/sysdeps/i386/fpu/w_sqrt.c\n@@ -0,0 +1,9 @@\n+/* The inline __ieee754_sqrt is not correctly rounding; it's OK for\n+ most internal uses in glibc, but not for sqrt itself. */\n+#define __ieee754_sqrt __avoid_ieee754_sqrt\n+#include \n+#include \n+#undef __ieee754_sqrt\n+extern double __ieee754_sqrt (double);\n+#include \n+#include \ndiff --git a/sysdeps/ia64/fpu/w_acos.c b/sysdeps/ia64/fpu/w_acos.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_acos.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_acosf.c b/sysdeps/ia64/fpu/w_acosf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_acosf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_acosh.c b/sysdeps/ia64/fpu/w_acosh.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_acosh.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_acoshf.c b/sysdeps/ia64/fpu/w_acoshf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_acoshf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_acoshl.c b/sysdeps/ia64/fpu/w_acoshl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_acoshl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_acosl.c b/sysdeps/ia64/fpu/w_acosl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_acosl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_asin.c b/sysdeps/ia64/fpu/w_asin.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_asin.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_asinf.c b/sysdeps/ia64/fpu/w_asinf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_asinf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_asinl.c b/sysdeps/ia64/fpu/w_asinl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_asinl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_atan2.c b/sysdeps/ia64/fpu/w_atan2.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_atan2.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_atan2f.c b/sysdeps/ia64/fpu/w_atan2f.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_atan2f.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_atan2l.c b/sysdeps/ia64/fpu/w_atan2l.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_atan2l.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_atanh.c b/sysdeps/ia64/fpu/w_atanh.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_atanh.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_atanhf.c b/sysdeps/ia64/fpu/w_atanhf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_atanhf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_atanhl.c b/sysdeps/ia64/fpu/w_atanhl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_atanhl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_cosh.c b/sysdeps/ia64/fpu/w_cosh.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_cosh.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_coshf.c b/sysdeps/ia64/fpu/w_coshf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_coshf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_coshl.c b/sysdeps/ia64/fpu/w_coshl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_coshl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_exp.c b/sysdeps/ia64/fpu/w_exp.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_exp.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_exp10.c b/sysdeps/ia64/fpu/w_exp10.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_exp10.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_exp10f.c b/sysdeps/ia64/fpu/w_exp10f.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_exp10f.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_exp10l.c b/sysdeps/ia64/fpu/w_exp10l.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_exp10l.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_exp2.c b/sysdeps/ia64/fpu/w_exp2.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_exp2.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_exp2f.c b/sysdeps/ia64/fpu/w_exp2f.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_exp2f.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_exp2l.c b/sysdeps/ia64/fpu/w_exp2l.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_exp2l.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_expf.c b/sysdeps/ia64/fpu/w_expf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_expf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_expl.c b/sysdeps/ia64/fpu/w_expl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_expl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_fmod.c b/sysdeps/ia64/fpu/w_fmod.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_fmod.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_fmodf.c b/sysdeps/ia64/fpu/w_fmodf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_fmodf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_fmodl.c b/sysdeps/ia64/fpu/w_fmodl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_fmodl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_hypot.c b/sysdeps/ia64/fpu/w_hypot.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_hypot.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_hypotf.c b/sysdeps/ia64/fpu/w_hypotf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_hypotf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_hypotl.c b/sysdeps/ia64/fpu/w_hypotl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_hypotl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_lgamma_r.c b/sysdeps/ia64/fpu/w_lgamma_r.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_lgamma_r.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_lgammaf_r.c b/sysdeps/ia64/fpu/w_lgammaf_r.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_lgammaf_r.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_lgammal_r.c b/sysdeps/ia64/fpu/w_lgammal_r.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_lgammal_r.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_log.c b/sysdeps/ia64/fpu/w_log.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_log.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_log10.c b/sysdeps/ia64/fpu/w_log10.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_log10.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_log10f.c b/sysdeps/ia64/fpu/w_log10f.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_log10f.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_log10l.c b/sysdeps/ia64/fpu/w_log10l.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_log10l.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_log2.c b/sysdeps/ia64/fpu/w_log2.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_log2.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_log2f.c b/sysdeps/ia64/fpu/w_log2f.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_log2f.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_log2l.c b/sysdeps/ia64/fpu/w_log2l.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_log2l.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_logf.c b/sysdeps/ia64/fpu/w_logf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_logf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_logl.c b/sysdeps/ia64/fpu/w_logl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_logl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_pow.c b/sysdeps/ia64/fpu/w_pow.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_pow.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_powf.c b/sysdeps/ia64/fpu/w_powf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_powf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_powl.c b/sysdeps/ia64/fpu/w_powl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_powl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_remainder.c b/sysdeps/ia64/fpu/w_remainder.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_remainder.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_remainderf.c b/sysdeps/ia64/fpu/w_remainderf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_remainderf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_remainderl.c b/sysdeps/ia64/fpu/w_remainderl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_remainderl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_sinh.c b/sysdeps/ia64/fpu/w_sinh.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_sinh.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_sinhf.c b/sysdeps/ia64/fpu/w_sinhf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_sinhf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_sinhl.c b/sysdeps/ia64/fpu/w_sinhl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_sinhl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_sqrt.c b/sysdeps/ia64/fpu/w_sqrt.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_sqrt.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_sqrtf.c b/sysdeps/ia64/fpu/w_sqrtf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_sqrtf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_sqrtl.c b/sysdeps/ia64/fpu/w_sqrtl.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_sqrtl.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_tgamma.c b/sysdeps/ia64/fpu/w_tgamma.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_tgamma.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_tgammaf.c b/sysdeps/ia64/fpu/w_tgammaf.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_tgammaf.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ia64/fpu/w_tgammal.c b/sysdeps/ia64/fpu/w_tgammal.c\nnew file mode 100644\nindex 0000000..1cc8931\n--- /dev/null\n+++ b/sysdeps/ia64/fpu/w_tgammal.c\n@@ -0,0 +1 @@\n+/* Not needed. */\ndiff --git a/sysdeps/ieee754/dbl-64/w_exp_compat.c b/sysdeps/ieee754/dbl-64/w_exp_compat.c\nindex 69ec0a1..98aa5b7 100644\n--- a/sysdeps/ieee754/dbl-64/w_exp_compat.c\n+++ b/sysdeps/ieee754/dbl-64/w_exp_compat.c\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n /* wrapper exp */\n double\n __exp (double x)\n@@ -33,7 +34,8 @@ __exp (double x)\n }\n hidden_def (__exp)\n weak_alias (__exp, exp)\n-#ifdef NO_LONG_DOUBLE\n+# ifdef NO_LONG_DOUBLE\n strong_alias (__exp, __expl)\n weak_alias (__exp, expl)\n+# endif\n #endif\ndiff --git a/sysdeps/ieee754/flt-32/w_expf_compat.c b/sysdeps/ieee754/flt-32/w_expf_compat.c\nindex 8a1fa51..a38ff40 100644\n--- a/sysdeps/ieee754/flt-32/w_expf_compat.c\n+++ b/sysdeps/ieee754/flt-32/w_expf_compat.c\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n /* wrapper expf */\n float\n __expf (float x)\n@@ -33,3 +34,4 @@ __expf (float x)\n }\n hidden_def (__expf)\n weak_alias (__expf, expf)\n+#endif\ndiff --git a/sysdeps/ieee754/k_standard.c b/sysdeps/ieee754/k_standard.c\nindex 8f906bd..f74f9c7 100644\n--- a/sysdeps/ieee754/k_standard.c\n+++ b/sysdeps/ieee754/k_standard.c\n@@ -21,23 +21,25 @@ static char rcsid[] = \"$NetBSD: k_standard.c,v 1.6 1995/05/10 20:46:35 jtc Exp $\n \n #include \n \n-#ifndef _USE_WRITE\n-#include \t\t\t/* fputs(), stderr */\n-#define\tWRITE2(u,v)\tfputs(u, stderr)\n-#else\t/* !defined(_USE_WRITE) */\n-#include \t\t\t/* write */\n-#define\tWRITE2(u,v)\twrite(2, u, v)\n-#undef fflush\n-#endif\t/* !defined(_USE_WRITE) */\n+#if LIBM_SVID_COMPAT\n+\n+# ifndef _USE_WRITE\n+# include \t\t\t/* fputs(), stderr */\n+# define\tWRITE2(u,v)\tfputs(u, stderr)\n+# else\t/* !defined(_USE_WRITE) */\n+# include \t\t\t/* write */\n+# define\tWRITE2(u,v)\twrite(2, u, v)\n+# undef fflush\n+# endif\t/* !defined(_USE_WRITE) */\n \n /* XXX gcc versions until now don't delay the 0.0/0.0 division until\n runtime but produce NaN at compile time. This is wrong since the\n exceptions are not set correctly. */\n-#if 0\n+# if 0\n static const double zero = 0.0;\t/* used as const */\n-#else\n+# else\n static double zero = 0.0;\t/* used as const */\n-#endif\n+# endif\n \n /*\n * Standard conformance (non-IEEE) on exception cases.\n@@ -97,21 +99,21 @@ double\n __kernel_standard(double x, double y, int type)\n {\n \tstruct exception exc;\n-#ifndef HUGE_VAL\t/* this is the only routine that uses HUGE_VAL */\n-#define HUGE_VAL inf\n+# ifndef HUGE_VAL\t/* this is the only routine that uses HUGE_VAL */\n+# define HUGE_VAL inf\n \tdouble inf = 0.0;\n \n \tSET_HIGH_WORD(inf,0x7ff00000);\t/* set inf to infinite */\n-#endif\n+# endif\n \n \t/* The SVID struct exception uses a field \"char *name;\". */\n-#define CSTR(func) ((char *) (type < 100\t\t\t\t\\\n+# define CSTR(func) ((char *) (type < 100\t\t\t\t\\\n \t\t\t ? func\t\t\t\t\t\\\n \t\t\t : (type < 200 ? func \"f\" : func \"l\")))\n \n-#ifdef _USE_WRITE\n+# ifdef _USE_WRITE\n \t(void) fflush(stdout);\n-#endif\n+# endif\n \texc.arg1 = x;\n \texc.arg2 = y;\n \tswitch(type) {\n@@ -945,3 +947,4 @@ __kernel_standard(double x, double y, int type)\n \t}\n \treturn exc.retval;\n }\n+#endif\ndiff --git a/sysdeps/ieee754/k_standardf.c b/sysdeps/ieee754/k_standardf.c\nindex 85b2003..62d25d2 100644\n--- a/sysdeps/ieee754/k_standardf.c\n+++ b/sysdeps/ieee754/k_standardf.c\n@@ -21,6 +21,7 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n /* Handle errors for a libm function as specified by TYPE (see\n comments in k_standard.c for details), with arguments X and Y,\n returning the appropriate return value for that function. */\n@@ -30,3 +31,4 @@ __kernel_standard_f (float x, float y, int type)\n {\n return __kernel_standard (x, y, type);\n }\n+#endif\ndiff --git a/sysdeps/ieee754/k_standardl.c b/sysdeps/ieee754/k_standardl.c\nindex 783fd0b..484ec91 100644\n--- a/sysdeps/ieee754/k_standardl.c\n+++ b/sysdeps/ieee754/k_standardl.c\n@@ -38,6 +38,8 @@\n #include \n \n \n+#if LIBM_SVID_COMPAT\n+\n static double zero = 0.0;\n \n /* Handle errors for a libm function as specified by TYPE (see\n@@ -106,3 +108,4 @@ __kernel_standard_l (long double x, long double y, int type)\n return __kernel_standard (dx, dy, type);\n }\n }\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-128/w_expl_compat.c b/sysdeps/ieee754/ldbl-128/w_expl_compat.c\nindex e0fa9e3..ec076de 100644\n--- a/sysdeps/ieee754/ldbl-128/w_expl_compat.c\n+++ b/sysdeps/ieee754/ldbl-128/w_expl_compat.c\n@@ -26,18 +26,20 @@ static char rcsid[] = \"$NetBSD: $\";\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double __expl(long double x)\t/* wrapper exp */\n {\n-#ifdef _IEEE_LIBM\n+# ifdef _IEEE_LIBM\n \treturn __ieee754_expl(x);\n-#else\n+# else\n \tlong double z = __ieee754_expl (x);\n \tif (__glibc_unlikely (!isfinite (z) || z == 0)\n \t && isfinite (x) && _LIB_VERSION != _IEEE_)\n \t return __kernel_standard_l (x, x, 206 + !!signbit (x));\n \n \treturn z;\n-#endif\n+# endif\n }\n hidden_def (__expl)\n weak_alias (__expl, expl)\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c b/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c\nindex 019a48f..53948a9 100644\n--- a/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c\n+++ b/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c\n@@ -3,6 +3,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n long double __expl(long double x)\t/* wrapper exp */\n {\n long double z;\n@@ -20,3 +21,4 @@ long double __expl(long double x)\t/* wrapper exp */\n }\n hidden_def (__expl)\n long_double_symbol (libm, __expl, expl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c b/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c\nindex 37c153e..037e8bf 100644\n--- a/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c\n+++ b/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __expl, expl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-96/w_expl_compat.c b/sysdeps/ieee754/ldbl-96/w_expl_compat.c\nindex c9e6003..ae9ab58 100644\n--- a/sysdeps/ieee754/ldbl-96/w_expl_compat.c\n+++ b/sysdeps/ieee754/ldbl-96/w_expl_compat.c\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#if LIBM_SVID_COMPAT\n /* wrapper expl */\n long double\n __expl (long double x)\n@@ -33,3 +34,4 @@ __expl (long double x)\n }\n hidden_def (__expl)\n weak_alias (__expl, expl)\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c b/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c\nindex df4338d..f66964a 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __acoshl, acoshl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c b/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c\nindex 5efc990..ff33e9a 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_acosl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __acosl, acosl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c b/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c\nindex 087fab2..a53f1cb 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_asinl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __asinl, asinl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c b/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c\nindex 6b12209..c70f77e 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __atan2l, atan2l);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c b/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c\nindex 49bae1e..67450c5 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __atanhl, atanhl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c b/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c\nindex a880877..392511b 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_coshl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __coshl, coshl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c b/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c\nindex cf15488..5a52a75 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c\n@@ -4,15 +4,17 @@\n #undef compat_symbol\n #define compat_symbol(l,n,a,v)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __exp10l, exp10l);\n-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)\n /* compat_symbol was undefined and redefined above to avoid the\n default pow10l compat symbol at version GLIBC_2_1 (as for ldbl-opt\n configurations, that version should have the alias to exp10). So\n it now needs to be redefined to define the compat symbol at version\n LONG_DOUBLE_COMPAT_VERSION. */\n-# undef compat_symbol\n-# define compat_symbol(lib, local, symbol, version)\t\\\n+# undef compat_symbol\n+# define compat_symbol(lib, local, symbol, version)\t\\\n compat_symbol_reference (lib, local, symbol, version)\n compat_symbol (libm, __pow10l, pow10l, LONG_DOUBLE_COMPAT_VERSION);\n+# endif\n #endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c b/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c\nindex 88fe0ac..12419e3 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __fmodl, fmodl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c b/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c\nindex 68e3997..b87bac7 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __hypotl, hypotl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c b/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c\nindex 9050657..8fc8651 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_j0l_compat.c\n@@ -2,5 +2,7 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __j0l, j0l);\n long_double_symbol (libm, __y0l, y0l);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c b/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c\nindex 4ed9e2d..85b3fee 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_j1l_compat.c\n@@ -2,5 +2,7 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __j1l, j1l);\n long_double_symbol (libm, __y1l, y1l);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c b/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c\nindex d22ee54..9b2c998 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_jnl_compat.c\n@@ -2,5 +2,7 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __jnl, jnl);\n long_double_symbol (libm, __ynl, ynl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c b/sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c\nindex 6fdf2bb..431aa5d 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __lgammal_r, lgammal_r);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c b/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c\nindex 17de3e7..6eb9ea7 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_log10l_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __log10l, log10l);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c b/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c\nindex 3c5e734..1507e93 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_log2l_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __log2l, log2l);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_logl_compat.c b/sysdeps/ieee754/ldbl-opt/w_logl_compat.c\nindex 2b55842..6b71ef2 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_logl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_logl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __logl, logl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_powl_compat.c b/sysdeps/ieee754/ldbl-opt/w_powl_compat.c\nindex 1897cf1..c6f8d85 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_powl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_powl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __powl, powl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c b/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c\nindex b2ce5c9..849d2db4 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c\n@@ -2,6 +2,8 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __remainderl, remainderl);\n strong_alias (__remainderl, __dreml)\n long_double_symbol (libm, __dreml, dreml);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c b/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c\nindex 305ed82..8fce55c 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __sinhl, sinhl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c b/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c\nindex 1e4526f..05be917 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __sqrtl, sqrtl);\n+#endif\ndiff --git a/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c b/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c\nindex aaf5403..8c201ca 100644\n--- a/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c\n+++ b/sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c\n@@ -2,4 +2,6 @@\n #undef weak_alias\n #define weak_alias(n,a)\n #include \n+#if LIBM_SVID_COMPAT\n long_double_symbol (libm, __tgammal, tgammal);\n+#endif\n","prefixes":[]}