From c52944e8ccb15158b7e44cbb75fb46d81400d75c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 28 Sep 2018 21:53:33 +0000 Subject: Remove unnecessary math_private.h includes. After my changes to move various macros, inlines and other content from math_private.h to more specific headers, many files including math_private.h no longer need to do so. Furthermore, since the optimized inlines of various functions have been moved to include/fenv.h or replaced by use of function names GCC inlines automatically, a missing math_private.h include where one is appropriate will reliably cause a build failure rather than possibly causing code to be less well optimized while still building successfully. Thus, this patch removes includes of math_private.h that are now unnecessary. In the case of two RISC-V files, the include is replaced by one of stdbool.h because the files in question were relying on math_private.h to get a definition of bool. Tested for x86_64 and x86, and with build-many-glibcs.py. * math/fromfp.h: Do not include . * math/s_cacosh_template.c: Likewise. * math/s_casin_template.c: Likewise. * math/s_casinh_template.c: Likewise. * math/s_ccos_template.c: Likewise. * math/s_cproj_template.c: Likewise. * math/s_fdim_template.c: Likewise. * math/s_fmaxmag_template.c: Likewise. * math/s_fminmag_template.c: Likewise. * math/s_iseqsig_template.c: Likewise. * math/s_ldexp_template.c: Likewise. * math/s_nextdown_template.c: Likewise. * math/w_log1p_template.c: Likewise. * math/w_scalbln_template.c: Likewise. * sysdeps/aarch64/fpu/feholdexcpt.c: Likewise. * sysdeps/aarch64/fpu/fesetround.c: Likewise. * sysdeps/aarch64/fpu/fgetexcptflg.c: Likewise. * sysdeps/aarch64/fpu/ftestexcept.c: Likewise. * sysdeps/aarch64/fpu/s_llrint.c: Likewise. * sysdeps/aarch64/fpu/s_llrintf.c: Likewise. * sysdeps/aarch64/fpu/s_lrint.c: Likewise. * sysdeps/aarch64/fpu/s_lrintf.c: Likewise. * sysdeps/i386/fpu/s_atanl.c: Likewise. * sysdeps/i386/fpu/s_f32xaddf64.c: Likewise. * sysdeps/i386/fpu/s_f32xsubf64.c: Likewise. * sysdeps/i386/fpu/s_fdim.c: Likewise. * sysdeps/i386/fpu/s_logbl.c: Likewise. * sysdeps/i386/fpu/s_rintl.c: Likewise. * sysdeps/i386/fpu/s_significandl.c: Likewise. * sysdeps/ia64/fpu/s_matherrf.c: Likewise. * sysdeps/ia64/fpu/s_matherrl.c: Likewise. * sysdeps/ieee754/dbl-64/s_atan.c: Likewise. * sysdeps/ieee754/dbl-64/s_cbrt.c: Likewise. * sysdeps/ieee754/dbl-64/s_fma.c: Likewise. * sysdeps/ieee754/dbl-64/s_fmaf.c: Likewise. * sysdeps/ieee754/flt-32/s_cbrtf.c: Likewise. * sysdeps/ieee754/k_standardf.c: Likewise. * sysdeps/ieee754/k_standardl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_copysignl.c: Likewise. * sysdeps/ieee754/ldbl-64-128/s_finitel.c: Likewise. * sysdeps/ieee754/ldbl-64-128/s_fpclassifyl.c: Likewise. * sysdeps/ieee754/ldbl-64-128/s_isinfl.c: Likewise. * sysdeps/ieee754/ldbl-64-128/s_isnanl.c: Likewise. * sysdeps/ieee754/ldbl-64-128/s_signbitl.c: Likewise. * sysdeps/ieee754/ldbl-96/s_cbrtl.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fma.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fmal.c: Likewise. * sysdeps/ieee754/s_signgam.c: Likewise. * sysdeps/powerpc/power5+/fpu/s_modf.c: Likewise. * sysdeps/powerpc/power5+/fpu/s_modff.c: Likewise. * sysdeps/powerpc/power7/fpu/s_logbf.c: Likewise. * sysdeps/riscv/rv64/rvd/s_ceil.c: Likewise. * sysdeps/riscv/rv64/rvd/s_floor.c: Likewise. * sysdeps/riscv/rv64/rvd/s_nearbyint.c: Likewise. * sysdeps/riscv/rv64/rvd/s_round.c: Likewise. * sysdeps/riscv/rv64/rvd/s_roundeven.c: Likewise. * sysdeps/riscv/rv64/rvd/s_trunc.c: Likewise. * sysdeps/riscv/rvd/s_finite.c: Likewise. * sysdeps/riscv/rvd/s_fmax.c: Likewise. * sysdeps/riscv/rvd/s_fmin.c: Likewise. * sysdeps/riscv/rvd/s_fpclassify.c: Likewise. * sysdeps/riscv/rvd/s_isinf.c: Likewise. * sysdeps/riscv/rvd/s_isnan.c: Likewise. * sysdeps/riscv/rvd/s_issignaling.c: Likewise. * sysdeps/riscv/rvf/fegetround.c: Likewise. * sysdeps/riscv/rvf/feholdexcpt.c: Likewise. * sysdeps/riscv/rvf/fesetenv.c: Likewise. * sysdeps/riscv/rvf/fesetround.c: Likewise. * sysdeps/riscv/rvf/feupdateenv.c: Likewise. * sysdeps/riscv/rvf/fgetexcptflg.c: Likewise. * sysdeps/riscv/rvf/ftestexcept.c: Likewise. * sysdeps/riscv/rvf/s_ceilf.c: Likewise. * sysdeps/riscv/rvf/s_finitef.c: Likewise. * sysdeps/riscv/rvf/s_floorf.c: Likewise. * sysdeps/riscv/rvf/s_fmaxf.c: Likewise. * sysdeps/riscv/rvf/s_fminf.c: Likewise. * sysdeps/riscv/rvf/s_fpclassifyf.c: Likewise. * sysdeps/riscv/rvf/s_isinff.c: Likewise. * sysdeps/riscv/rvf/s_isnanf.c: Likewise. * sysdeps/riscv/rvf/s_issignalingf.c: Likewise. * sysdeps/riscv/rvf/s_nearbyintf.c: Likewise. * sysdeps/riscv/rvf/s_roundevenf.c: Likewise. * sysdeps/riscv/rvf/s_roundf.c: Likewise. * sysdeps/riscv/rvf/s_truncf.c: Likewise. * sysdeps/riscv/rv64/rvd/s_rint.c: Include instead of . * sysdeps/riscv/rvf/s_rintf.c: Likewise. --- math/fromfp.h | 1 - math/s_cacosh_template.c | 1 - math/s_casin_template.c | 1 - math/s_casinh_template.c | 1 - math/s_ccos_template.c | 1 - math/s_cproj_template.c | 1 - math/s_fdim_template.c | 1 - math/s_fmaxmag_template.c | 1 - math/s_fminmag_template.c | 1 - math/s_iseqsig_template.c | 1 - math/s_ldexp_template.c | 1 - math/s_nextdown_template.c | 1 - math/w_log1p_template.c | 1 - math/w_scalbln_template.c | 1 - 14 files changed, 14 deletions(-) (limited to 'math') diff --git a/math/fromfp.h b/math/fromfp.h index 9d102a6..fd3d2b4 100644 --- a/math/fromfp.h +++ b/math/fromfp.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/math/s_cacosh_template.c b/math/s_cacosh_template.c index c8a060d..281efb9 100644 --- a/math/s_cacosh_template.c +++ b/math/s_cacosh_template.c @@ -19,7 +19,6 @@ #include #include -#include CFLOAT diff --git a/math/s_casin_template.c b/math/s_casin_template.c index 24eb7ab..aab346f 100644 --- a/math/s_casin_template.c +++ b/math/s_casin_template.c @@ -19,7 +19,6 @@ #include #include -#include CFLOAT diff --git a/math/s_casinh_template.c b/math/s_casinh_template.c index 8433ce1..b6e9212 100644 --- a/math/s_casinh_template.c +++ b/math/s_casinh_template.c @@ -19,7 +19,6 @@ #include #include -#include CFLOAT M_DECL_FUNC (__casinh) (CFLOAT x) diff --git a/math/s_ccos_template.c b/math/s_ccos_template.c index 413cd95..ad25bc3 100644 --- a/math/s_ccos_template.c +++ b/math/s_ccos_template.c @@ -20,7 +20,6 @@ #include #include #include -#include CFLOAT M_DECL_FUNC (__ccos) (CFLOAT x) diff --git a/math/s_cproj_template.c b/math/s_cproj_template.c index 2e2e7f1..acaa254 100644 --- a/math/s_cproj_template.c +++ b/math/s_cproj_template.c @@ -19,7 +19,6 @@ #include #include -#include CFLOAT diff --git a/math/s_fdim_template.c b/math/s_fdim_template.c index c8fa71f..e40c19f 100644 --- a/math/s_fdim_template.c +++ b/math/s_fdim_template.c @@ -20,7 +20,6 @@ #include #include #include -#include FLOAT M_DECL_FUNC (__fdim) (FLOAT x, FLOAT y) diff --git a/math/s_fmaxmag_template.c b/math/s_fmaxmag_template.c index 01b9267..549976d 100644 --- a/math/s_fmaxmag_template.c +++ b/math/s_fmaxmag_template.c @@ -17,7 +17,6 @@ . */ #include -#include FLOAT M_DECL_FUNC (__fmaxmag) (FLOAT x, FLOAT y) diff --git a/math/s_fminmag_template.c b/math/s_fminmag_template.c index 82abf68..a78894e 100644 --- a/math/s_fminmag_template.c +++ b/math/s_fminmag_template.c @@ -17,7 +17,6 @@ . */ #include -#include FLOAT M_DECL_FUNC (__fminmag) (FLOAT x, FLOAT y) diff --git a/math/s_iseqsig_template.c b/math/s_iseqsig_template.c index a4d28d7..edabb31 100644 --- a/math/s_iseqsig_template.c +++ b/math/s_iseqsig_template.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/math/s_ldexp_template.c b/math/s_ldexp_template.c index 3aa56f9..75372dc 100644 --- a/math/s_ldexp_template.c +++ b/math/s_ldexp_template.c @@ -15,7 +15,6 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $"; #endif #include -#include #include FLOAT diff --git a/math/s_nextdown_template.c b/math/s_nextdown_template.c index 06e38d2..3bc3ffb 100644 --- a/math/s_nextdown_template.c +++ b/math/s_nextdown_template.c @@ -17,7 +17,6 @@ . */ #include -#include /* Return the greatest floating-point number less than X. */ FLOAT diff --git a/math/w_log1p_template.c b/math/w_log1p_template.c index 59f82cf..123537b 100644 --- a/math/w_log1p_template.c +++ b/math/w_log1p_template.c @@ -18,7 +18,6 @@ #include #include -#include FLOAT M_DECL_FUNC (__w_log1p) (FLOAT x) diff --git a/math/w_scalbln_template.c b/math/w_scalbln_template.c index 71aa02a..9c37b82 100644 --- a/math/w_scalbln_template.c +++ b/math/w_scalbln_template.c @@ -18,7 +18,6 @@ #include #include -#include FLOAT M_DECL_FUNC (__w_scalbln) (FLOAT x, long int n) -- cgit v1.1