From patchwork Sat Mar 10 20:23:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 26274 Received: (qmail 37429 invoked by alias); 10 Mar 2018 20:23:16 -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 37323 invoked by uid 89); 10 Mar 2018 20:23:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=na X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH] Don't include math.h/math_private.h in math_ldbl_opt.h. Date: Sat, 10 Mar 2018 15:23:10 -0500 Message-Id: <20180310202310.2795-1-zackw@panix.com> MIME-Version: 1.0 The sysdeps/ieee754/ldbl-opt version of math_ldbl_opt.h includes math.h and math_private.h, despite not having any need for those headers itself; the sysdeps/generic version doesn't. About 20 files are relying on math_ldbl_opt.h to include math.h and/or math_private.h for them, even though none of them necessarily used on a platform that needs ldbl-opt support. This patch removes the includes from the ldbl-opt version of math_ldbl_opt.h, and fixes up all of the files that broke in a full build-many-glibcs cycle. Committed as (relatively) trivial bugfix. * sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h: Don't include math.h or math_private.h. * sysdeps/alpha/fpu/s_isnan.c * sysdeps/ieee754/ldbl-128ibm/s_ceill.c * sysdeps/ieee754/ldbl-128ibm/s_floorl.c * sysdeps/ieee754/ldbl-128ibm/s_llrintl.c * sysdeps/ieee754/ldbl-128ibm/s_llroundl.c * sysdeps/ieee754/ldbl-128ibm/s_lrintl.c * sysdeps/ieee754/ldbl-128ibm/s_lroundl.c * sysdeps/ieee754/ldbl-128ibm/s_rintl.c * sysdeps/ieee754/ldbl-128ibm/s_roundl.c * sysdeps/ieee754/ldbl-128ibm/s_truncl.c * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot.c * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf.c: * sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c * sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c * sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c: Include math_private.h. * sysdeps/ieee754/ldbl-64-128/s_finitel.c * sysdeps/ieee754/ldbl-64-128/s_fpclassifyl.c * sysdeps/ieee754/ldbl-64-128/s_isinfl.c * sysdeps/ieee754/ldbl-64-128/s_isnanl.c * sysdeps/ieee754/ldbl-64-128/s_signbitl.c * sysdeps/powerpc/power7/fpu/s_logb.c: Include math.h and math_private.h. --- sysdeps/alpha/fpu/s_isnan.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_ceill.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_floorl.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_llrintl.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_llroundl.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_lrintl.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_lroundl.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_rintl.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_roundl.c | 1 + sysdeps/ieee754/ldbl-128ibm/s_truncl.c | 1 + sysdeps/ieee754/ldbl-64-128/s_finitel.c | 2 ++ sysdeps/ieee754/ldbl-64-128/s_fpclassifyl.c | 2 ++ sysdeps/ieee754/ldbl-64-128/s_isinfl.c | 2 ++ sysdeps/ieee754/ldbl-64-128/s_isnanl.c | 2 ++ sysdeps/ieee754/ldbl-64-128/s_signbitl.c | 2 ++ sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h | 3 --- sysdeps/powerpc/power7/fpu/s_logb.c | 2 ++ sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot.c | 1 + sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf.c | 1 + sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c | 1 + sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c | 1 + sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c | 1 + 22 files changed, 27 insertions(+), 3 deletions(-) diff --git a/sysdeps/alpha/fpu/s_isnan.c b/sysdeps/alpha/fpu/s_isnan.c index 457bca004b..a8b20db204 100644 --- a/sysdeps/alpha/fpu/s_isnan.c +++ b/sysdeps/alpha/fpu/s_isnan.c @@ -22,6 +22,7 @@ #define __GI___isnanf not__GI___isnanf #include +#include #include #undef __isnanf diff --git a/sysdeps/ieee754/ldbl-128ibm/s_ceill.c b/sysdeps/ieee754/ldbl-128ibm/s_ceill.c index 22eddcfcd3..7dcff021c4 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_ceill.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_ceill.c @@ -18,6 +18,7 @@ . */ #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_floorl.c b/sysdeps/ieee754/ldbl-128ibm/s_floorl.c index 2131934cc1..4aae5ae608 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_floorl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_floorl.c @@ -18,6 +18,7 @@ . */ #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c b/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c index f2f4c19b0e..9d4535103e 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c b/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c index 5bfa83cee3..de6a7b5be2 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c b/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c index c2e2f68984..05fe7fefdf 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c b/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c index 010e8e28a1..bc8dda4c1d 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_rintl.c b/sysdeps/ieee754/ldbl-128ibm/s_rintl.c index 9c4514eec3..73d2b4edfe 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_rintl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_rintl.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_roundl.c b/sysdeps/ieee754/ldbl-128ibm/s_roundl.c index 5915d53a18..94a62dcd6c 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_roundl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_roundl.c @@ -21,6 +21,7 @@ when it's coded in C. */ #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-128ibm/s_truncl.c b/sysdeps/ieee754/ldbl-128ibm/s_truncl.c index a4638b5da9..a915a01ac6 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_truncl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_truncl.c @@ -18,6 +18,7 @@ . */ #include +#include #include #include #include diff --git a/sysdeps/ieee754/ldbl-64-128/s_finitel.c b/sysdeps/ieee754/ldbl-64-128/s_finitel.c index c0862a7485..5a16e6a277 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_finitel.c +++ b/sysdeps/ieee754/ldbl-64-128/s_finitel.c @@ -1,3 +1,5 @@ +#include +#include #include #undef weak_alias #define weak_alias(n,a) diff --git a/sysdeps/ieee754/ldbl-64-128/s_fpclassifyl.c b/sysdeps/ieee754/ldbl-64-128/s_fpclassifyl.c index a10b6c3a1a..a14cea4001 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_fpclassifyl.c +++ b/sysdeps/ieee754/ldbl-64-128/s_fpclassifyl.c @@ -1,3 +1,5 @@ +#include +#include #include #undef weak_alias #define weak_alias(n,a) diff --git a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c index 6dab0e9223..94d0b06277 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c +++ b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c @@ -1,3 +1,5 @@ +#include +#include #include #if !IS_IN (libm) # undef weak_alias diff --git a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c index ad5ecc5281..9a7a29770c 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c +++ b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c @@ -1,3 +1,5 @@ +#include +#include #include #if !IS_IN (libm) # undef weak_alias diff --git a/sysdeps/ieee754/ldbl-64-128/s_signbitl.c b/sysdeps/ieee754/ldbl-64-128/s_signbitl.c index 850db7386a..39e0c34b6c 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_signbitl.c +++ b/sysdeps/ieee754/ldbl-64-128/s_signbitl.c @@ -1,3 +1,5 @@ +#include +#include #include #undef weak_alias #define weak_alias(n,a) diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h index af861c11ea..61ba784f86 100644 --- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h +++ b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h @@ -36,9 +36,6 @@ #endif #ifndef __ASSEMBLER__ -# include -# include - /* Set temporarily to non-zero if long double should be considered the same as double. */ extern __thread int __no_long_double attribute_tls_model_ie attribute_hidden; diff --git a/sysdeps/powerpc/power7/fpu/s_logb.c b/sysdeps/powerpc/power7/fpu/s_logb.c index 160b9334de..f7eec8ff06 100644 --- a/sysdeps/powerpc/power7/fpu/s_logb.c +++ b/sysdeps/powerpc/power7/fpu/s_logb.c @@ -16,6 +16,8 @@ License along with the GNU C Library; if not, see . */ +#include +#include #include #include diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot.c index faa4415f9f..b05414f225 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot.c +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot.c @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf.c index 4ea3864f2b..d432cd0023 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf.c +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf.c @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c index af103e47b5..f752514efa 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c @@ -17,6 +17,7 @@ . */ #include +#include #include #include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c index cb771a3fe4..8d05c430cc 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c index e46ef68bfe..9bef1fea3f 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include "init-arch.h"