From 17688c4487cbc5296bb4da4ca7e78092307d2bbd Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 13:00:48 +0100 Subject: [PATCH 1/9] Rename include/fenv.h to . OpenLibm has an implementation of fenv.h internally. This may be problematic in case you want it to build against the host system's implementation, as it would require you to somehow take the fenv.h file out of the compiler search path. Simply use a different naming scheme, similar to openlibm.h and openlibm_complex.h. If we want to build against the host's fenv.h, we can simply add an '#include ' from within this header. --- amd64/fenv.c | 2 +- amd64/fenv.h | 6 ++++-- arm/fenv.c | 2 +- i387/fenv.c | 2 +- include/fenv.h | 9 --------- src/e_sqrtl.c | 2 +- src/openlibm_fenv.h | 9 +++++++++ src/s_fma.c | 2 +- src/s_fmaf.c | 3 +-- src/s_fmal.c | 2 +- src/s_lrint.c | 2 +- src/s_lround.c | 2 +- src/s_nearbyint.c | 2 +- test/libm-test.c | 2 +- 14 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 include/fenv.h create mode 100644 src/openlibm_fenv.h diff --git a/amd64/fenv.c b/amd64/fenv.c index ecd0ab2..b06c899 100644 --- a/amd64/fenv.c +++ b/amd64/fenv.c @@ -32,7 +32,7 @@ #ifdef _WIN32 #define __fenv_static #endif -#include "fenv.h" +#include "openlibm_fenv.h" #ifdef __GNUC_GNU_INLINE__ #error "This file must be compiled with C99 'inline' semantics" diff --git a/amd64/fenv.h b/amd64/fenv.h index b7e7610..df3ceab 100644 --- a/amd64/fenv.h +++ b/amd64/fenv.h @@ -29,8 +29,10 @@ #ifndef _FENV_H_ #define _FENV_H_ -#include "include/cdefs-compat.h" -#include "include/types-compat.h" +#include "cdefs-compat.h" +#include "types-compat.h" + +#include "math_private.h" #ifndef __fenv_static #define __fenv_static static diff --git a/arm/fenv.c b/arm/fenv.c index bf6b1f9..c9abf14 100644 --- a/arm/fenv.c +++ b/arm/fenv.c @@ -27,7 +27,7 @@ */ #define __fenv_static -#include "fenv.h" +#include #ifdef __GNUC_GNU_INLINE__ #error "This file must be compiled with C99 'inline' semantics" diff --git a/i387/fenv.c b/i387/fenv.c index b0a8497..5ad4de6 100644 --- a/i387/fenv.c +++ b/i387/fenv.c @@ -32,7 +32,7 @@ #include #define __fenv_static -#include "fenv.h" +#include #ifdef __GNUC_GNU_INLINE__ #error "This file must be compiled with C99 'inline' semantics" diff --git a/include/fenv.h b/include/fenv.h deleted file mode 100644 index cfe40b9..0000000 --- a/include/fenv.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifdef __arm__ -#include "../arm/fenv.h" -#else -#ifdef __LP64 -#include "../amd64/fenv.h" -#else -#include "../i387/fenv.h" -#endif -#endif diff --git a/src/e_sqrtl.c b/src/e_sqrtl.c index 7b2ea83..80f3d61 100644 --- a/src/e_sqrtl.c +++ b/src/e_sqrtl.c @@ -27,11 +27,11 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_sqrtl.c,v 1.1 2008/03/02 01:47:58 das Exp $"); -#include #include #include "fpmath.h" #include "openlibm.h" +#include "openlibm_fenv.h" #include "math_private.h" /* Return (x + ulp) for normal positive x. Assumes no overflow. */ diff --git a/src/openlibm_fenv.h b/src/openlibm_fenv.h new file mode 100644 index 0000000..69ccf9f --- /dev/null +++ b/src/openlibm_fenv.h @@ -0,0 +1,9 @@ +#if defined(__arm__) +#include "../arm/fenv.h" +#elif defined(__x86_64__) +#include "../amd64/fenv.h" +#elif defined(__i386__) +#include "../i387/fenv.h" +#else +#error "Unsupported platform" +#endif diff --git a/src/s_fma.c b/src/s_fma.c index 1c93f55..7fa8ba3 100644 --- a/src/s_fma.c +++ b/src/s_fma.c @@ -27,9 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_fma.c,v 1.8 2011/10/21 06:30:43 das Exp $"); -#include #include #include +#include #include "math_private.h" diff --git a/src/s_fmaf.c b/src/s_fmaf.c index da0e019..b697f9a 100644 --- a/src/s_fmaf.c +++ b/src/s_fmaf.c @@ -27,9 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.3 2011/10/15 04:16:58 das Exp $"); -#include - #include "openlibm.h" +#include "openlibm_fenv.h" #include "math_private.h" /* diff --git a/src/s_fmal.c b/src/s_fmal.c index 1d6b6b8..1aa7ab3 100644 --- a/src/s_fmal.c +++ b/src/s_fmal.c @@ -27,9 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.7 2011/10/21 06:30:43 das Exp $"); -#include #include #include +#include #include "math_private.h" #include "fpmath.h" diff --git a/src/s_lrint.c b/src/s_lrint.c index ff7bce7..9ecb558 100644 --- a/src/s_lrint.c +++ b/src/s_lrint.c @@ -25,8 +25,8 @@ */ #include "cdefs-compat.h" -#include #include +#include #include "math_private.h" #ifndef type diff --git a/src/s_lround.c b/src/s_lround.c index f89d031..37068fe 100644 --- a/src/s_lround.c +++ b/src/s_lround.c @@ -29,8 +29,8 @@ //#include #include //VBS end -#include #include +#include #include "math_private.h" #ifndef type diff --git a/src/s_nearbyint.c b/src/s_nearbyint.c index 6de1d77..f0fc19f 100644 --- a/src/s_nearbyint.c +++ b/src/s_nearbyint.c @@ -27,8 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_nearbyint.c,v 1.2 2008/01/14 02:12:06 das Exp $"); -#include #include +#include #include "math_private.h" /* diff --git a/test/libm-test.c b/test/libm-test.c index be01255..ebd7eb4 100644 --- a/test/libm-test.c +++ b/test/libm-test.c @@ -123,8 +123,8 @@ #include #else #include "openlibm.h" +#include "openlibm_fenv.h" #include "float.h" -#include "fenv.h" #endif #if 0 /* XXX scp XXX */ From beb387c4b293b36e4c6a5bf2036887998454a7d6 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 13:15:01 +0100 Subject: [PATCH 2/9] Use consistently. --- ld128/e_acoshl.c | 2 +- ld128/e_atanhl.c | 2 +- ld128/e_coshl.c | 2 +- ld128/e_expl.c | 2 +- ld128/e_fmodl.c | 2 +- ld128/e_hypotl.c | 2 +- ld128/e_lgammal_r.c | 2 +- ld128/e_log10l.c | 2 +- ld128/e_log2l.c | 2 +- ld128/e_logl.c | 2 +- ld128/e_powl.c | 2 +- ld128/e_sinhl.c | 2 +- ld128/e_tgammal.c | 2 +- ld128/s_asinhl.c | 2 +- ld128/s_ceill.c | 2 +- ld128/s_erfl.c | 2 +- ld128/s_expm1l.c | 2 +- ld128/s_floorl.c | 2 +- ld128/s_log1pl.c | 2 +- ld128/s_modfl.c | 2 +- ld128/s_nextafterl.c | 2 +- ld128/s_nexttoward.c | 2 +- ld128/s_nexttowardf.c | 2 +- ld128/s_remquol.c | 2 +- ld128/s_tanhl.c | 3 ++- ld128/s_truncl.c | 2 +- 26 files changed, 27 insertions(+), 26 deletions(-) diff --git a/ld128/e_acoshl.c b/ld128/e_acoshl.c index dd8197f..dcd89fe 100644 --- a/ld128/e_acoshl.c +++ b/ld128/e_acoshl.c @@ -24,7 +24,7 @@ * acoshl(NaN) is NaN without signal. */ -#include +#include #include "math_private.h" diff --git a/ld128/e_atanhl.c b/ld128/e_atanhl.c index 51485b3..7cfa23b 100644 --- a/ld128/e_atanhl.c +++ b/ld128/e_atanhl.c @@ -28,7 +28,7 @@ * */ -#include +#include #include "math_private.h" diff --git a/ld128/e_coshl.c b/ld128/e_coshl.c index 3098c7b..0ebf079 100644 --- a/ld128/e_coshl.c +++ b/ld128/e_coshl.c @@ -46,7 +46,7 @@ * only coshl(0)=1 is exact for finite x. */ -#include +#include #include "math_private.h" diff --git a/ld128/e_expl.c b/ld128/e_expl.c index 0118d4f..4cfb137 100644 --- a/ld128/e_expl.c +++ b/ld128/e_expl.c @@ -73,7 +73,7 @@ /* Exponential function */ #include -#include +#include #include "math_private.h" diff --git a/ld128/e_fmodl.c b/ld128/e_fmodl.c index cb629dd..22a8920 100644 --- a/ld128/e_fmodl.c +++ b/ld128/e_fmodl.c @@ -16,7 +16,7 @@ * Method: shift and subtract */ -#include +#include #include "math_private.h" diff --git a/ld128/e_hypotl.c b/ld128/e_hypotl.c index ff642d9..b86a2d0 100644 --- a/ld128/e_hypotl.c +++ b/ld128/e_hypotl.c @@ -42,7 +42,7 @@ * than 1 ulps (units in the last place) */ -#include +#include #include "math_private.h" diff --git a/ld128/e_lgammal_r.c b/ld128/e_lgammal_r.c index 855ba4c..8408da2 100644 --- a/ld128/e_lgammal_r.c +++ b/ld128/e_lgammal_r.c @@ -69,7 +69,7 @@ * */ -#include +#include #include "math_private.h" diff --git a/ld128/e_log10l.c b/ld128/e_log10l.c index 9980203..6b05909 100644 --- a/ld128/e_log10l.c +++ b/ld128/e_log10l.c @@ -59,7 +59,7 @@ * */ -#include +#include #include "math_private.h" diff --git a/ld128/e_log2l.c b/ld128/e_log2l.c index fe15b82..53ced8c 100644 --- a/ld128/e_log2l.c +++ b/ld128/e_log2l.c @@ -58,7 +58,7 @@ * */ -#include +#include #include "math_private.h" diff --git a/ld128/e_logl.c b/ld128/e_logl.c index 8f2b7e6..7032fb9 100644 --- a/ld128/e_logl.c +++ b/ld128/e_logl.c @@ -60,7 +60,7 @@ * */ -#include +#include #include "math_private.h" diff --git a/ld128/e_powl.c b/ld128/e_powl.c index 1c73633..af09a6d 100644 --- a/ld128/e_powl.c +++ b/ld128/e_powl.c @@ -59,7 +59,7 @@ * */ -#include +#include #include "math_private.h" diff --git a/ld128/e_sinhl.c b/ld128/e_sinhl.c index a158d5a..56e441a 100644 --- a/ld128/e_sinhl.c +++ b/ld128/e_sinhl.c @@ -44,7 +44,7 @@ * only sinhl(0)=0 is exact for finite x. */ -#include +#include #include "math_private.h" diff --git a/ld128/e_tgammal.c b/ld128/e_tgammal.c index fb36209..dfa70d1 100644 --- a/ld128/e_tgammal.c +++ b/ld128/e_tgammal.c @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include #include "math_private.h" diff --git a/ld128/s_asinhl.c b/ld128/s_asinhl.c index 12df814..ac6f481 100644 --- a/ld128/s_asinhl.c +++ b/ld128/s_asinhl.c @@ -21,7 +21,7 @@ * := signl(x)*log1pl(|x| + x^2/(1 + sqrtl(1+x^2))) */ -#include +#include #include "math_private.h" diff --git a/ld128/s_ceill.c b/ld128/s_ceill.c index 9ee833c..1edd12d 100644 --- a/ld128/s_ceill.c +++ b/ld128/s_ceill.c @@ -19,7 +19,7 @@ * Inexact flag raised if x not equal to ceil(x). */ -#include +#include #include "math_private.h" diff --git a/ld128/s_erfl.c b/ld128/s_erfl.c index c6b3d4d..dd35b4b 100644 --- a/ld128/s_erfl.c +++ b/ld128/s_erfl.c @@ -91,7 +91,7 @@ * erfc/erf(NaN) is NaN */ -#include +#include #include "math_private.h" diff --git a/ld128/s_expm1l.c b/ld128/s_expm1l.c index eb58b3e..76e8090 100644 --- a/ld128/s_expm1l.c +++ b/ld128/s_expm1l.c @@ -54,7 +54,7 @@ */ #include -#include +#include #include "math_private.h" diff --git a/ld128/s_floorl.c b/ld128/s_floorl.c index a7d8140..6360c0b 100644 --- a/ld128/s_floorl.c +++ b/ld128/s_floorl.c @@ -19,7 +19,7 @@ * Inexact flag raised if x not equal to floor(x). */ -#include +#include #include "math_private.h" diff --git a/ld128/s_log1pl.c b/ld128/s_log1pl.c index 673bf6a..5bc86a6 100644 --- a/ld128/s_log1pl.c +++ b/ld128/s_log1pl.c @@ -54,7 +54,7 @@ * IEEE -1, 8 100000 1.9e-34 4.3e-35 */ -#include +#include #include "math_private.h" diff --git a/ld128/s_modfl.c b/ld128/s_modfl.c index 0ca4a35..5fdf2c0 100644 --- a/ld128/s_modfl.c +++ b/ld128/s_modfl.c @@ -20,7 +20,7 @@ * No exception. */ -#include +#include #include "math_private.h" diff --git a/ld128/s_nextafterl.c b/ld128/s_nextafterl.c index 7a3bbf7..a45bede 100644 --- a/ld128/s_nextafterl.c +++ b/ld128/s_nextafterl.c @@ -17,7 +17,7 @@ * Special cases: */ -#include +#include #include "math_private.h" diff --git a/ld128/s_nexttoward.c b/ld128/s_nexttoward.c index adbbb22..0ae65af 100644 --- a/ld128/s_nexttoward.c +++ b/ld128/s_nexttoward.c @@ -17,8 +17,8 @@ * Special cases: */ -#include #include +#include #include "math_private.h" diff --git a/ld128/s_nexttowardf.c b/ld128/s_nexttowardf.c index e63a165..6f8ccdf 100644 --- a/ld128/s_nexttowardf.c +++ b/ld128/s_nexttowardf.c @@ -10,7 +10,7 @@ * ==================================================== */ -#include +#include #include "math_private.h" diff --git a/ld128/s_remquol.c b/ld128/s_remquol.c index ee7a713..67c89a4 100644 --- a/ld128/s_remquol.c +++ b/ld128/s_remquol.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include "math_private.h" diff --git a/ld128/s_tanhl.c b/ld128/s_tanhl.c index 78707a0..b852164 100644 --- a/ld128/s_tanhl.c +++ b/ld128/s_tanhl.c @@ -50,7 +50,8 @@ * only tanhl(0)=0 is exact for finite argument. */ -#include "math.h" +#include + #include "math_private.h" static const long double one = 1.0, two = 2.0, tiny = 1.0e-4900L; diff --git a/ld128/s_truncl.c b/ld128/s_truncl.c index fce5b6c..6bb3fb5 100644 --- a/ld128/s_truncl.c +++ b/ld128/s_truncl.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "math_private.h" From 08dbb2b51732e2a78851f3720c9107120f2e4fe8 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 13:30:44 +0100 Subject: [PATCH 3/9] Never include . Include instead. If we ship with a separate copy of , we should also use this one instead of the one provided by the system. --- src/k_exp.c | 4 ++-- src/k_expf.c | 4 ++-- src/math_private.h | 3 ++- src/openlibm.h | 10 ++++------ src/openlibm_complex.h | 11 +++++++---- src/s_cabs.c | 4 ++-- src/s_cabsf.c | 4 ++-- src/s_cabsl.c | 4 ++-- src/s_cacos.c | 4 ++-- src/s_cacosf.c | 4 ++-- src/s_cacosh.c | 4 ++-- src/s_cacoshf.c | 4 ++-- src/s_cacoshl.c | 4 ++-- src/s_cacosl.c | 4 ++-- src/s_carg.c | 3 ++- src/s_cargf.c | 3 ++- src/s_cargl.c | 3 ++- src/s_casin.c | 4 ++-- src/s_casinf.c | 4 ++-- src/s_casinh.c | 4 ++-- src/s_casinhf.c | 4 ++-- src/s_casinhl.c | 4 ++-- src/s_casinl.c | 4 ++-- src/s_catan.c | 4 ++-- src/s_catanf.c | 4 ++-- src/s_catanh.c | 4 ++-- src/s_catanhf.c | 4 ++-- src/s_catanhl.c | 4 ++-- src/s_catanl.c | 4 ++-- src/s_ccos.c | 4 ++-- src/s_ccosf.c | 4 ++-- src/s_ccosh.c | 2 +- src/s_ccoshf.c | 2 +- src/s_ccoshl.c | 4 ++-- src/s_ccosl.c | 4 ++-- src/s_cexp.c | 2 +- src/s_cexpf.c | 2 +- src/s_cexpl.c | 4 ++-- src/s_cimag.c | 5 +++-- src/s_cimagf.c | 5 +++-- src/s_cimagl.c | 5 +++-- src/s_clog.c | 4 ++-- src/s_clogf.c | 4 ++-- src/s_clogl.c | 4 ++-- src/s_conj.c | 4 ++-- src/s_conjf.c | 4 ++-- src/s_conjl.c | 4 ++-- src/s_cpow.c | 3 ++- src/s_cpowf.c | 3 ++- src/s_cpowl.c | 3 ++- src/s_cproj.c | 2 +- src/s_cprojf.c | 2 +- src/s_cprojl.c | 2 +- src/s_creal.c | 4 +++- src/s_crealf.c | 4 +++- src/s_creall.c | 4 +++- src/s_csin.c | 4 ++-- src/s_csinf.c | 4 ++-- src/s_csinh.c | 2 +- src/s_csinhf.c | 2 +- src/s_csinhl.c | 4 ++-- src/s_csinl.c | 4 ++-- src/s_csqrt.c | 2 +- src/s_csqrtf.c | 2 +- src/s_csqrtl.c | 2 +- src/s_ctan.c | 4 ++-- src/s_ctanf.c | 4 ++-- src/s_ctanh.c | 2 +- src/s_ctanhf.c | 2 +- src/s_ctanhl.c | 4 ++-- src/s_ctanl.c | 4 ++-- src/w_cabs.c | 3 ++- src/w_cabsf.c | 3 ++- src/w_cabsl.c | 3 ++- 74 files changed, 147 insertions(+), 127 deletions(-) diff --git a/src/k_exp.c b/src/k_exp.c index 7bed88b..6019290 100644 --- a/src/k_exp.c +++ b/src/k_exp.c @@ -27,9 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/k_exp.c,v 1.1 2011/10/21 06:27:56 das Exp $"); -#include +#include +#include -#include "openlibm.h" #include "math_private.h" static const u_int32_t k = 1799; /* constant for reduction */ diff --git a/src/k_expf.c b/src/k_expf.c index 9df0b0f..ed5a065 100644 --- a/src/k_expf.c +++ b/src/k_expf.c @@ -27,9 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/k_expf.c,v 1.1 2011/10/21 06:27:56 das Exp $"); -#include +#include +#include -#include "openlibm.h" #include "math_private.h" static const u_int32_t k = 235; /* constant for reduction */ diff --git a/src/math_private.h b/src/math_private.h index 05d95c3..1ab2309 100644 --- a/src/math_private.h +++ b/src/math_private.h @@ -17,10 +17,11 @@ #ifndef _MATH_PRIVATE_H_ #define _MATH_PRIVATE_H_ +#include + #include "cdefs-compat.h" #include "types-compat.h" #include "fpmath.h" -#include #include #include "math_private_openbsd.h" diff --git a/src/openlibm.h b/src/openlibm.h index df24814..66c55b0 100644 --- a/src/openlibm.h +++ b/src/openlibm.h @@ -14,10 +14,10 @@ * $FreeBSD: src/lib/msun/src/openlibm.h,v 1.82 2011/11/12 19:55:48 theraven Exp $ */ -#ifndef _MATH_H_ -#define _MATH_H_ +#ifndef OPENLIBM_H +#define OPENLIBM_H -#include +#include #if (defined(_WIN32) || defined (_MSC_VER)) && !defined(__WIN32__) #define __WIN32__ @@ -581,9 +581,7 @@ long double truncl(long double); long double lgammal_r(long double, int *); #endif /* __BSD_VISIBLE */ -#include "openlibm_complex.h" - #if defined(__cplusplus) } #endif -#endif /* !_MATH_H_ */ +#endif /* !OPENLIBM_H */ diff --git a/src/openlibm_complex.h b/src/openlibm_complex.h index 57f5072..ba91803 100644 --- a/src/openlibm_complex.h +++ b/src/openlibm_complex.h @@ -15,10 +15,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _OPENLIBM_COMPLEX_H_ -#define _OPENLIBM_COMPLEX_H_ +#ifndef OPENLIBM_COMPLEX_H +#define OPENLIBM_COMPLEX_H -#include +#define complex _Complex + +#define _Complex_I 1.0fi +#define I _Complex_I /* * Double versions of C99 functions @@ -99,4 +102,4 @@ long double complex conjl(long double complex); long double complex cprojl(long double complex); long double creall(long double complex); -#endif /* !_OPENLIBM_COMPLEX_H_ */ +#endif /* !OPENLIBM_COMPLEX_H */ diff --git a/src/s_cabs.c b/src/s_cabs.c index 9fb7ee5..f7e03fe 100644 --- a/src/s_cabs.c +++ b/src/s_cabs.c @@ -15,9 +15,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include -#include "openlibm.h" +#include +#include double cabs(double complex z) diff --git a/src/s_cabsf.c b/src/s_cabsf.c index 61b5442..ae093a6 100644 --- a/src/s_cabsf.c +++ b/src/s_cabsf.c @@ -15,8 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include "openlibm.h" +#include +#include float cabsf(float complex z) diff --git a/src/s_cabsl.c b/src/s_cabsl.c index 2c4538e..91db084 100644 --- a/src/s_cabsl.c +++ b/src/s_cabsl.c @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include "openlibm.h" +#include +#include long double cabsl(long double complex z) diff --git a/src/s_cacos.c b/src/s_cacos.c index fc4d3c3..cb0c1e3 100644 --- a/src/s_cacos.c +++ b/src/s_cacos.c @@ -46,9 +46,9 @@ * IEEE -10,+10 30000 1.8e-14 2.2e-15 */ -#include #include -#include "openlibm.h" +#include +#include double complex cacos(double complex z) diff --git a/src/s_cacosf.c b/src/s_cacosf.c index fe49956..5df0726 100644 --- a/src/s_cacosf.c +++ b/src/s_cacosf.c @@ -46,8 +46,8 @@ * */ -#include -#include "openlibm.h" +#include +#include float complex cacosf(float complex z) diff --git a/src/s_cacosh.c b/src/s_cacosh.c index 78f8e7d..8dce7f7 100644 --- a/src/s_cacosh.c +++ b/src/s_cacosh.c @@ -42,9 +42,9 @@ * */ -#include #include -#include "openlibm.h" +#include +#include double complex cacosh(double complex z) diff --git a/src/s_cacoshf.c b/src/s_cacoshf.c index 5bbbd1a..12a790a 100644 --- a/src/s_cacoshf.c +++ b/src/s_cacoshf.c @@ -42,8 +42,8 @@ * */ -#include -#include "openlibm.h" +#include +#include float complex cacoshf(float complex z) diff --git a/src/s_cacoshl.c b/src/s_cacoshl.c index 0c6d7a5..96768c3 100644 --- a/src/s_cacoshl.c +++ b/src/s_cacoshl.c @@ -43,8 +43,8 @@ * */ -#include -#include "openlibm.h" +#include +#include long double complex cacoshl(long double complex z) diff --git a/src/s_cacosl.c b/src/s_cacosl.c index d66fad1..147e92e 100644 --- a/src/s_cacosl.c +++ b/src/s_cacosl.c @@ -47,8 +47,8 @@ * IEEE -10,+10 30000 1.8e-14 2.2e-15 */ -#include -#include "openlibm.h" +#include +#include static const long double PIO2L = 1.570796326794896619231321691639751442098585L; diff --git a/src/s_carg.c b/src/s_carg.c index 195feb4..a1b2dfc 100644 --- a/src/s_carg.c +++ b/src/s_carg.c @@ -27,8 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_carg.c,v 1.1 2007/12/12 23:43:51 das Exp $"); -#include #include +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/s_cargf.c b/src/s_cargf.c index 7592b1f..098a163 100644 --- a/src/s_cargf.c +++ b/src/s_cargf.c @@ -27,8 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargf.c,v 1.1 2007/12/12 23:43:51 das Exp $"); -#include #include +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/s_cargl.c b/src/s_cargl.c index 2a725c9..f12607f 100644 --- a/src/s_cargl.c +++ b/src/s_cargl.c @@ -27,8 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargl.c,v 1.1 2008/07/31 22:41:26 das Exp $"); -#include #include +#include + #include "math_private.h" DLLEXPORT long double diff --git a/src/s_casin.c b/src/s_casin.c index 9e9ab5b..f469c39 100644 --- a/src/s_casin.c +++ b/src/s_casin.c @@ -49,9 +49,9 @@ * Also tested by csin(casin(z)) = z. */ -#include #include -#include "openlibm.h" +#include +#include double complex casin(double complex z) diff --git a/src/s_casinf.c b/src/s_casinf.c index 2783acc..4f1503d 100644 --- a/src/s_casinf.c +++ b/src/s_casinf.c @@ -47,8 +47,8 @@ * */ -#include -#include "openlibm.h" +#include +#include float complex casinf(float complex z) diff --git a/src/s_casinh.c b/src/s_casinh.c index 031d1e3..9d29034 100644 --- a/src/s_casinh.c +++ b/src/s_casinh.c @@ -42,9 +42,9 @@ * */ -#include #include -#include "openlibm.h" +#include +#include double complex casinh(double complex z) diff --git a/src/s_casinhf.c b/src/s_casinhf.c index 952f7fe..e4617d8 100644 --- a/src/s_casinhf.c +++ b/src/s_casinhf.c @@ -42,8 +42,8 @@ * */ -#include -#include "openlibm.h" +#include +#include float complex casinhf(float complex z) diff --git a/src/s_casinhl.c b/src/s_casinhl.c index 1738ea4..3d9c0e6 100644 --- a/src/s_casinhl.c +++ b/src/s_casinhl.c @@ -43,8 +43,8 @@ * */ -#include -#include "openlibm.h" +#include +#include long double complex casinhl(long double complex z) diff --git a/src/s_casinl.c b/src/s_casinl.c index 2fa08ef..53cfd24 100644 --- a/src/s_casinl.c +++ b/src/s_casinl.c @@ -49,9 +49,9 @@ * Also tested by csin(casin(z)) = z. */ -#include #include -#include "openlibm.h" +#include +#include #if LDBL_MANT_DIG == 64 static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L; diff --git a/src/s_catan.c b/src/s_catan.c index dc69b3a..cb153d9 100644 --- a/src/s_catan.c +++ b/src/s_catan.c @@ -62,9 +62,9 @@ * 2.9e-17. See also clog(). */ -#include #include -#include "openlibm.h" +#include +#include #define MAXNUM 1.0e308 diff --git a/src/s_catanf.c b/src/s_catanf.c index 33c78c4..1238bd6 100644 --- a/src/s_catanf.c +++ b/src/s_catanf.c @@ -59,8 +59,8 @@ * */ -#include -#include "openlibm.h" +#include +#include #define MAXNUMF 1.0e38F diff --git a/src/s_catanh.c b/src/s_catanh.c index 726ac50..3c30a26 100644 --- a/src/s_catanh.c +++ b/src/s_catanh.c @@ -42,9 +42,9 @@ * */ -#include #include -#include "openlibm.h" +#include +#include double complex catanh(double complex z) diff --git a/src/s_catanhf.c b/src/s_catanhf.c index 866e6a9..42d5efe 100644 --- a/src/s_catanhf.c +++ b/src/s_catanhf.c @@ -42,8 +42,8 @@ * */ -#include -#include "openlibm.h" +#include +#include float complex catanhf(float complex z) diff --git a/src/s_catanhl.c b/src/s_catanhl.c index 2a5fa16..e2ea5d7 100644 --- a/src/s_catanhl.c +++ b/src/s_catanhl.c @@ -43,8 +43,8 @@ * */ -#include -#include "openlibm.h" +#include +#include long double complex catanhl(long double complex z) diff --git a/src/s_catanl.c b/src/s_catanl.c index 5a08728..7626e20 100644 --- a/src/s_catanl.c +++ b/src/s_catanl.c @@ -63,9 +63,9 @@ * 2.9e-17. See also clog(). */ -#include #include -#include "openlibm.h" +#include +#include static const long double PIL = 3.141592653589793238462643383279502884197169L; static const long double DP1 = 3.14159265358979323829596852490908531763125L; diff --git a/src/s_ccos.c b/src/s_ccos.c index 96731c7..e64de78 100644 --- a/src/s_ccos.c +++ b/src/s_ccos.c @@ -49,9 +49,9 @@ * IEEE -10,+10 30000 3.8e-16 1.0e-16 */ -#include #include -#include "openlibm.h" +#include +#include /* calculate cosh and sinh */ diff --git a/src/s_ccosf.c b/src/s_ccosf.c index 6643d4c..461098f 100644 --- a/src/s_ccosf.c +++ b/src/s_ccosf.c @@ -48,8 +48,8 @@ * IEEE -10,+10 30000 1.8e-7 5.5e-8 */ -#include -#include "openlibm.h" +#include +#include /* calculate cosh and sinh */ diff --git a/src/s_ccosh.c b/src/s_ccosh.c index 32b780a..4970645 100644 --- a/src/s_ccosh.c +++ b/src/s_ccosh.c @@ -37,8 +37,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccosh.c,v 1.2 2011/10/21 06:29:32 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_ccoshf.c b/src/s_ccoshf.c index 6d79ac6..f5bccee 100644 --- a/src/s_ccoshf.c +++ b/src/s_ccoshf.c @@ -31,8 +31,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccoshf.c,v 1.2 2011/10/21 06:29:32 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_ccoshl.c b/src/s_ccoshl.c index 265137d..246a612 100644 --- a/src/s_ccoshl.c +++ b/src/s_ccoshl.c @@ -43,8 +43,8 @@ * */ -#include -#include "openlibm.h" +#include +#include long double complex ccoshl(long double complex z) diff --git a/src/s_ccosl.c b/src/s_ccosl.c index b57fd9e..220d0f9 100644 --- a/src/s_ccosl.c +++ b/src/s_ccosl.c @@ -50,8 +50,8 @@ * IEEE -10,+10 30000 3.8e-16 1.0e-16 */ -#include -#include "openlibm.h" +#include +#include static void cchshl(long double x, long double *c, long double *s) diff --git a/src/s_cexp.c b/src/s_cexp.c index f247cfe..64b60db 100644 --- a/src/s_cexp.c +++ b/src/s_cexp.c @@ -27,8 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexp.c,v 1.3 2011/10/21 06:27:56 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_cexpf.c b/src/s_cexpf.c index 26e963a..b178e76 100644 --- a/src/s_cexpf.c +++ b/src/s_cexpf.c @@ -27,8 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexpf.c,v 1.3 2011/10/21 06:27:56 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_cexpl.c b/src/s_cexpl.c index 0391322..b4b8e4c 100644 --- a/src/s_cexpl.c +++ b/src/s_cexpl.c @@ -54,8 +54,8 @@ * */ -#include -#include "openlibm.h" +#include +#include long double complex cexpl(long double complex z) diff --git a/src/s_cimag.c b/src/s_cimag.c index 99835bf..6e8a465 100644 --- a/src/s_cimag.c +++ b/src/s_cimag.c @@ -26,8 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_cimag.c,v 1.3 2009/03/14 18:24:15 das Exp $ */ -#include -#include "openlibm.h" +#include +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/s_cimagf.c b/src/s_cimagf.c index a3d3c86..f59b65e 100644 --- a/src/s_cimagf.c +++ b/src/s_cimagf.c @@ -26,8 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_cimagf.c,v 1.3 2009/03/14 18:24:15 das Exp $ */ -#include -#include "openlibm.h" +#include +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/s_cimagl.c b/src/s_cimagl.c index 58d1990..92345ca 100644 --- a/src/s_cimagl.c +++ b/src/s_cimagl.c @@ -26,8 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_cimagl.c,v 1.3 2009/03/14 18:24:15 das Exp $ */ -#include -#include "openlibm.h" +#include +#include + #include "math_private.h" DLLEXPORT long double diff --git a/src/s_clog.c b/src/s_clog.c index a862cc9..7e8f723 100644 --- a/src/s_clog.c +++ b/src/s_clog.c @@ -54,9 +54,9 @@ * absolute error 1.0e-16. */ -#include #include -#include "openlibm.h" +#include +#include double complex clog(double complex z) diff --git a/src/s_clogf.c b/src/s_clogf.c index 3348fcb..ea67476 100644 --- a/src/s_clogf.c +++ b/src/s_clogf.c @@ -53,8 +53,8 @@ * */ -#include -#include "openlibm.h" +#include +#include float complex clogf(float complex z) diff --git a/src/s_clogl.c b/src/s_clogl.c index 0618de3..caff2d4 100644 --- a/src/s_clogl.c +++ b/src/s_clogl.c @@ -55,8 +55,8 @@ * absolute error 1.0e-16. */ -#include -#include "openlibm.h" +#include +#include long double complex clogl(long double complex z) diff --git a/src/s_conj.c b/src/s_conj.c index b383f69..811616f 100644 --- a/src/s_conj.c +++ b/src/s_conj.c @@ -26,9 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_conj.c,v 1.2 2008/08/07 14:39:56 das Exp $ */ -#include +#include +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT double complex diff --git a/src/s_conjf.c b/src/s_conjf.c index 2b24486..d2f58ad 100644 --- a/src/s_conjf.c +++ b/src/s_conjf.c @@ -26,9 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_conjf.c,v 1.2 2008/08/07 14:39:56 das Exp $ */ -#include +#include +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT float complex diff --git a/src/s_conjl.c b/src/s_conjl.c index 4b73472..a73394a 100644 --- a/src/s_conjl.c +++ b/src/s_conjl.c @@ -26,9 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_conjl.c,v 1.2 2008/08/07 14:39:56 das Exp $ */ -#include +#include +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT long double complex diff --git a/src/s_cpow.c b/src/s_cpow.c index 9c618b4..ada9e77 100644 --- a/src/s_cpow.c +++ b/src/s_cpow.c @@ -44,9 +44,10 @@ * */ -#include #include #include +#include + #include "math_private.h" DLLEXPORT double complex diff --git a/src/s_cpowf.c b/src/s_cpowf.c index a01398b..14482d2 100644 --- a/src/s_cpowf.c +++ b/src/s_cpowf.c @@ -44,8 +44,9 @@ * */ -#include #include +#include + #include "math_private.h" DLLEXPORT float complex diff --git a/src/s_cpowl.c b/src/s_cpowl.c index 3103763..0218c78 100644 --- a/src/s_cpowl.c +++ b/src/s_cpowl.c @@ -45,8 +45,9 @@ * */ -#include #include +#include + #include "math_private.h" DLLEXPORT long double complex diff --git a/src/s_cproj.c b/src/s_cproj.c index 303812c..7b9e131 100644 --- a/src/s_cproj.c +++ b/src/s_cproj.c @@ -27,8 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cproj.c,v 1.1 2008/08/07 15:07:48 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_cprojf.c b/src/s_cprojf.c index 30c7f47..320540c 100644 --- a/src/s_cprojf.c +++ b/src/s_cprojf.c @@ -27,8 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojf.c,v 1.1 2008/08/07 15:07:48 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_cprojl.c b/src/s_cprojl.c index a10553b..e68e14d 100644 --- a/src/s_cprojl.c +++ b/src/s_cprojl.c @@ -27,8 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojl.c,v 1.1 2008/08/07 15:07:48 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_creal.c b/src/s_creal.c index faf5999..119b1fa 100644 --- a/src/s_creal.c +++ b/src/s_creal.c @@ -26,7 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_creal.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $ */ -#include +#include +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/s_crealf.c b/src/s_crealf.c index f17d595..b4a9045 100644 --- a/src/s_crealf.c +++ b/src/s_crealf.c @@ -26,7 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_crealf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $ */ -#include +#include +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/s_creall.c b/src/s_creall.c index 2d1ded7..7cd1ed5 100644 --- a/src/s_creall.c +++ b/src/s_creall.c @@ -26,7 +26,9 @@ * $FreeBSD: src/lib/msun/src/s_creall.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $ */ -#include +#include +#include + #include "math_private.h" DLLEXPORT long double diff --git a/src/s_csin.c b/src/s_csin.c index d176c25..4e6616d 100644 --- a/src/s_csin.c +++ b/src/s_csin.c @@ -51,9 +51,9 @@ * */ -#include #include -#include "openlibm.h" +#include +#include /* calculate cosh and sinh */ diff --git a/src/s_csinf.c b/src/s_csinf.c index f0023b5..4c22851 100644 --- a/src/s_csinf.c +++ b/src/s_csinf.c @@ -49,8 +49,8 @@ * */ -#include -#include "openlibm.h" +#include +#include /* calculate cosh and sinh */ diff --git a/src/s_csinh.c b/src/s_csinh.c index 9f2fd95..3ec28d4 100644 --- a/src/s_csinh.c +++ b/src/s_csinh.c @@ -37,8 +37,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinh.c,v 1.2 2011/10/21 06:29:32 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_csinhf.c b/src/s_csinhf.c index e5545ab..cdaea30 100644 --- a/src/s_csinhf.c +++ b/src/s_csinhf.c @@ -31,8 +31,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinhf.c,v 1.2 2011/10/21 06:29:32 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_csinhl.c b/src/s_csinhl.c index 4c85d82..d9af4a2 100644 --- a/src/s_csinhl.c +++ b/src/s_csinhl.c @@ -42,8 +42,8 @@ * */ -#include -#include "openlibm.h" +#include +#include long double complex csinhl(long double complex z) diff --git a/src/s_csinl.c b/src/s_csinl.c index 02a8746..ada306d 100644 --- a/src/s_csinl.c +++ b/src/s_csinl.c @@ -52,8 +52,8 @@ * */ -#include -#include "openlibm.h" +#include +#include static void cchshl(long double x, long double *c, long double *s) diff --git a/src/s_csqrt.c b/src/s_csqrt.c index 7ddf944..e0633bd 100644 --- a/src/s_csqrt.c +++ b/src/s_csqrt.c @@ -27,9 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.4 2008/08/08 00:15:16 das Exp $"); -#include #include #include +#include #include "math_private.h" diff --git a/src/s_csqrtf.c b/src/s_csqrtf.c index 58c4b05..4cad53c 100644 --- a/src/s_csqrtf.c +++ b/src/s_csqrtf.c @@ -27,8 +27,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.3 2008/08/08 00:15:16 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_csqrtl.c b/src/s_csqrtl.c index 416e6b6..71ebada 100644 --- a/src/s_csqrtl.c +++ b/src/s_csqrtl.c @@ -26,9 +26,9 @@ #include "cdefs-compat.h" -#include #include #include +#include #include "math_private.h" diff --git a/src/s_ctan.c b/src/s_ctan.c index c23d8d0..d83e55f 100644 --- a/src/s_ctan.c +++ b/src/s_ctan.c @@ -56,9 +56,9 @@ * Also tested by ctan * ccot = 1 and catan(ctan(z)) = z. */ -#include #include -#include "openlibm.h" +#include +#include #define MACHEP 1.1e-16 #define MAXNUM 1.0e308 diff --git a/src/s_ctanf.c b/src/s_ctanf.c index 9771372..e49b623 100644 --- a/src/s_ctanf.c +++ b/src/s_ctanf.c @@ -53,8 +53,8 @@ * IEEE -10,+10 30000 3.3e-7 5.1e-8 */ -#include -#include "openlibm.h" +#include +#include #define MACHEPF 3.0e-8 #define MAXNUMF 1.0e38f diff --git a/src/s_ctanh.c b/src/s_ctanh.c index 0042bbe..fa97cc1 100644 --- a/src/s_ctanh.c +++ b/src/s_ctanh.c @@ -66,8 +66,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanh.c,v 1.2 2011/10/21 06:30:16 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_ctanhf.c b/src/s_ctanhf.c index cc70c5e..a976977 100644 --- a/src/s_ctanhf.c +++ b/src/s_ctanhf.c @@ -31,8 +31,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanhf.c,v 1.2 2011/10/21 06:30:16 das Exp $"); -#include #include +#include #include "math_private.h" diff --git a/src/s_ctanhl.c b/src/s_ctanhl.c index 0328bc8..6ee9b5b 100644 --- a/src/s_ctanhl.c +++ b/src/s_ctanhl.c @@ -43,8 +43,8 @@ * */ -#include -#include "openlibm.h" +#include +#include long double complex ctanhl(long double complex z) diff --git a/src/s_ctanl.c b/src/s_ctanl.c index c35b69f..8672938 100644 --- a/src/s_ctanl.c +++ b/src/s_ctanl.c @@ -56,9 +56,9 @@ * Also tested by ctan * ccot = 1 and catan(ctan(z)) = z. */ -#include #include -#include "openlibm.h" +#include +#include #if LDBL_MANT_DIG == 64 static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L; diff --git a/src/w_cabs.c b/src/w_cabs.c index c992e4f..ff3fff7 100644 --- a/src/w_cabs.c +++ b/src/w_cabs.c @@ -8,9 +8,10 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.7 2008/03/30 20:03:06 das Exp $"); -#include #include #include +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/w_cabsf.c b/src/w_cabsf.c index c72bbbe..6bbcf03 100644 --- a/src/w_cabsf.c +++ b/src/w_cabsf.c @@ -5,8 +5,9 @@ * Placed into the Public Domain, 1994. */ -#include #include +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/w_cabsl.c b/src/w_cabsl.c index 7ec31b3..3987cfe 100644 --- a/src/w_cabsl.c +++ b/src/w_cabsl.c @@ -10,8 +10,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabsl.c,v 1.1 2008/03/30 20:02:03 das Exp $"); -#include #include +#include + #include "math_private.h" DLLEXPORT long double From a249c5ebb3eeb7646e4d00f47a066eb3119e891c Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 13:40:29 +0100 Subject: [PATCH 4/9] Simply use __imag__ to implement cimag(). We already use this construct in cabs() to call hypot(), so I guess we can assume our targeted compilers support this construct. --- src/s_cimag.c | 5 +---- src/s_cimagf.c | 5 +---- src/s_cimagl.c | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/s_cimag.c b/src/s_cimag.c index 6e8a465..e778e89 100644 --- a/src/s_cimag.c +++ b/src/s_cimag.c @@ -26,7 +26,6 @@ * $FreeBSD: src/lib/msun/src/s_cimag.c,v 1.3 2009/03/14 18:24:15 das Exp $ */ -#include #include #include "math_private.h" @@ -34,7 +33,5 @@ DLLEXPORT double cimag(double complex z) { - const double_complex z1 = { .f = z }; - - return (IMAGPART(z1)); + return (__imag__ z); } diff --git a/src/s_cimagf.c b/src/s_cimagf.c index f59b65e..3b56d2f 100644 --- a/src/s_cimagf.c +++ b/src/s_cimagf.c @@ -26,7 +26,6 @@ * $FreeBSD: src/lib/msun/src/s_cimagf.c,v 1.3 2009/03/14 18:24:15 das Exp $ */ -#include #include #include "math_private.h" @@ -34,7 +33,5 @@ DLLEXPORT float cimagf(float complex z) { - const float_complex z1 = { .f = z }; - - return (IMAGPART(z1)); + return (__imag__ z); } diff --git a/src/s_cimagl.c b/src/s_cimagl.c index 92345ca..70ccdb5 100644 --- a/src/s_cimagl.c +++ b/src/s_cimagl.c @@ -26,7 +26,6 @@ * $FreeBSD: src/lib/msun/src/s_cimagl.c,v 1.3 2009/03/14 18:24:15 das Exp $ */ -#include #include #include "math_private.h" @@ -34,7 +33,5 @@ DLLEXPORT long double cimagl(long double complex z) { - const long_double_complex z1 = { .f = z }; - - return (IMAGPART(z1)); + return (__imag__ z); } From 410e6ebb59ba7d1a63ea4876f66087bd4ea9b6e6 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 13:57:45 +0100 Subject: [PATCH 5/9] Move CMPLX() into , as it is normally part of . While there, make CMPLX() work with Clang by using compound literals. Now that cimag*() uses __imag__, we can also just inline the unions. There is no need for the separate types anymore. Also just define CMPLX() unconditionally now, as we no longer pull in the host's . --- src/openlibm.h | 98 ------------------------------------------ src/openlibm_complex.h | 68 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 98 deletions(-) diff --git a/src/openlibm.h b/src/openlibm.h index 66c55b0..337da4c 100644 --- a/src/openlibm.h +++ b/src/openlibm.h @@ -17,8 +17,6 @@ #ifndef OPENLIBM_H #define OPENLIBM_H -#include - #if (defined(_WIN32) || defined (_MSC_VER)) && !defined(__WIN32__) #define __WIN32__ #endif @@ -180,102 +178,6 @@ extern int signgam; #endif #endif /* __BSD_VISIBLE */ -//VBS -//#ifdef _COMPLEX_H - -/* - * C99 specifies that complex numbers have the same representation as - * an array of two elements, where the first element is the real part - * and the second element is the imaginary part. - */ -typedef union { - float complex f; - float a[2]; -} float_complex; -typedef union { - double complex f; - double a[2]; -} double_complex; -typedef union { - long double complex f; - long double a[2]; -} long_double_complex; -#define REALPART(z) ((z).a[0]) -#define IMAGPART(z) ((z).a[1]) - -/* - * Macros that can be used to construct complex values. - * - * The C99 standard intends x+I*y to be used for this, but x+I*y is - * currently unusable in general since gcc introduces many overflow, - * underflow, sign and efficiency bugs by rewriting I*y as - * (0.0+I)*(y+0.0*I) and laboriously computing the full complex product. - * In particular, I*Inf is corrupted to NaN+I*Inf, and I*-0 is corrupted - * to -0.0+I*0.0. - * - * In C11, a CMPLX(x,y) macro was added to circumvent this limitation, - * and gcc 4.7 added a __builtin_complex feature to simplify implementation - * of CMPLX in libc, so we can take advantage of these features if they - * are available. - * - * If __builtin_complex is not available, resort to using inline - * functions instead. These can unfortunately not be used to construct - * compile-time constants. - */ - -#define HAVE_BUILTIN_COMPLEX (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__INTEL_COMPILER) - -#ifndef CMPLXF -#if HAVE_BUILTIN_COMPLEX -# define CMPLXF(x,y) __builtin_complex ((float) (x), (float) (y)) -#else -static __inline float complex -CMPLXF(float x, float y) -{ - float_complex z; - - REALPART(z) = x; - IMAGPART(z) = y; - return (z.f); -} -#endif -#endif - -#ifndef CMPLX -#if HAVE_BUILTIN_COMPLEX -# define CMPLX(x,y) __builtin_complex ((double) (x), (double) (y)) -#else -static __inline double complex -CMPLX(double x, double y) -{ - double_complex z; - - REALPART(z) = x; - IMAGPART(z) = y; - return (z.f); -} -#endif -#endif - -#ifndef CMPLXL -#if HAVE_BUILTIN_COMPLEX -# define CMPLXL(x,y) __builtin_complex ((long double) (x), (long double) (y)) -#else -static __inline long double complex -CMPLXL(long double x, long double y) -{ - long_double_complex z; - - REALPART(z) = x; - IMAGPART(z) = y; - return (z.f); -} -#endif -#endif - -//VBS -//#endif /* _COMPLEX_H */ - /* * Most of these functions depend on the rounding mode and have the side * effect of raising floating-point exceptions, so they are not declared diff --git a/src/openlibm_complex.h b/src/openlibm_complex.h index ba91803..7774eab 100644 --- a/src/openlibm_complex.h +++ b/src/openlibm_complex.h @@ -23,6 +23,74 @@ #define _Complex_I 1.0fi #define I _Complex_I +/* + * Macros that can be used to construct complex values. + * + * The C99 standard intends x+I*y to be used for this, but x+I*y is + * currently unusable in general since gcc introduces many overflow, + * underflow, sign and efficiency bugs by rewriting I*y as + * (0.0+I)*(y+0.0*I) and laboriously computing the full complex product. + * In particular, I*Inf is corrupted to NaN+I*Inf, and I*-0 is corrupted + * to -0.0+I*0.0. + * + * In C11, a CMPLX(x,y) macro was added to circumvent this limitation, + * and gcc 4.7 added a __builtin_complex feature to simplify implementation + * of CMPLX in libc, so we can take advantage of these features if they + * are available. Clang simply allows complex values to be constructed + * using a compound literal. + * + * If __builtin_complex is not available, resort to using inline + * functions instead. These can unfortunately not be used to construct + * compile-time constants. + * + * C99 specifies that complex numbers have the same representation as + * an array of two elements, where the first element is the real part + * and the second element is the imaginary part. + */ + +#ifdef __clang__ +# define CMPLXF(x, y) ((float complex){x, y}) +# define CMPLX(x, y) ((double complex){x, y}) +# define CMPLXL(x, y) ((long double complex){x, y}) +#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__INTEL_COMPILER) +# define CMPLXF(x,y) __builtin_complex ((float) (x), (float) (y)) +# define CMPLX(x,y) __builtin_complex ((double) (x), (double) (y)) +# define CMPLXL(x,y) __builtin_complex ((long double) (x), (long double) (y)) +#else +static inline float complex +CMPLXF(float x, float y) +{ + union { + float a[2]; + float complex f; + } z = {{ x, y }}; + + return (z.f); +} + +static inline double complex +CMPLX(double x, double y) +{ + union { + double a[2]; + double complex f; + } z = {{ x, y }}; + + return (z.f); +} + +static inline long double complex +CMPLXL(long double x, long double y) +{ + union { + long double a[2]; + long double complex f; + } z = {{ x, y }}; + + return (z.f); +} +#endif + /* * Double versions of C99 functions */ From 8429b82a9334a13fa74259fa14c820fbfe03d372 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 14:09:57 +0100 Subject: [PATCH 6/9] Use proper floating point literals. signbit() and friends should always take floating point arguments. This fixes a compiler error when using FreeBSD's own . --- test/libm-test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/libm-test.c b/test/libm-test.c index ebd7eb4..340a330 100644 --- a/test/libm-test.c +++ b/test/libm-test.c @@ -2741,7 +2741,7 @@ fpclassify_test (void) check_int ("fpclassify (-inf) == FP_INFINITE", fpclassify (minus_infty), FP_INFINITE, 0, 0, 0); check_int ("fpclassify (+0) == FP_ZERO", fpclassify (plus_zero), FP_ZERO, 0, 0, 0); check_int ("fpclassify (-0) == FP_ZERO", fpclassify (minus_zero), FP_ZERO, 0, 0, 0); - check_int ("fpclassify (1000) == FP_NORMAL", fpclassify (1000), FP_NORMAL, 0, 0, 0); + check_int ("fpclassify (1000) == FP_NORMAL", fpclassify (1000.0), FP_NORMAL, 0, 0, 0); print_max_error ("fpclassify", 0, 0); } @@ -2886,9 +2886,9 @@ isfinite_test (void) { init_max_error (); - check_bool ("isfinite (0) == true", isfinite (0), 1, 0, 0, 0); + check_bool ("isfinite (0) == true", isfinite (0.0), 1, 0, 0, 0); check_bool ("isfinite (-0) == true", isfinite (minus_zero), 1, 0, 0, 0); - check_bool ("isfinite (10) == true", isfinite (10), 1, 0, 0, 0); + check_bool ("isfinite (10) == true", isfinite (10.0), 1, 0, 0, 0); check_bool ("isfinite (inf) == false", isfinite (plus_infty), 0, 0, 0, 0); check_bool ("isfinite (-inf) == false", isfinite (minus_infty), 0, 0, 0, 0); check_bool ("isfinite (NaN) == false", isfinite (nan_value), 0, 0, 0, 0); @@ -2901,9 +2901,9 @@ isnormal_test (void) { init_max_error (); - check_bool ("isnormal (0) == false", isnormal (0), 0, 0, 0, 0); + check_bool ("isnormal (0) == false", isnormal (0.0), 0, 0, 0, 0); check_bool ("isnormal (-0) == false", isnormal (minus_zero), 0, 0, 0, 0); - check_bool ("isnormal (10) == true", isnormal (10), 1, 0, 0, 0); + check_bool ("isnormal (10) == true", isnormal (10.0), 1, 0, 0, 0); check_bool ("isnormal (inf) == false", isnormal (plus_infty), 0, 0, 0, 0); check_bool ("isnormal (-inf) == false", isnormal (minus_infty), 0, 0, 0, 0); check_bool ("isnormal (NaN) == false", isnormal (nan_value), 0, 0, 0, 0); @@ -3908,15 +3908,15 @@ signbit_test (void) init_max_error (); - check_bool ("signbit (0) == false", signbit (0), 0, 0, 0, 0); + check_bool ("signbit (0) == false", signbit (0.0), 0, 0, 0, 0); check_bool ("signbit (-0) == true", signbit (minus_zero), 1, 0, 0, 0); check_bool ("signbit (inf) == false", signbit (plus_infty), 0, 0, 0, 0); check_bool ("signbit (-inf) == true", signbit (minus_infty), 1, 0, 0, 0); /* signbit (x) != 0 for x < 0. */ - check_bool ("signbit (-1) == true", signbit (-1), 1, 0, 0, 0); + check_bool ("signbit (-1) == true", signbit (-1.0), 1, 0, 0, 0); /* signbit (x) == 0 for x >= 0. */ - check_bool ("signbit (1) == false", signbit (1), 0, 0, 0, 0); + check_bool ("signbit (1) == false", signbit (1.0), 0, 0, 0, 0); print_max_error ("signbit", 0, 0); } From f6b045b4cd0bf1d8f3d56ceab3baadfec29857b4 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 14:11:11 +0100 Subject: [PATCH 7/9] Add bits to openlibm headers to switch between using the host headers. --- src/openlibm.h | 6 ++++++ src/openlibm_complex.h | 6 ++++++ src/openlibm_fenv.h | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/src/openlibm.h b/src/openlibm.h index 337da4c..74fc3a7 100644 --- a/src/openlibm.h +++ b/src/openlibm.h @@ -14,6 +14,10 @@ * $FreeBSD: src/lib/msun/src/openlibm.h,v 1.82 2011/11/12 19:55:48 theraven Exp $ */ +#ifdef OPENLIBM_USE_HOST_MATH_H +#include +#else /* !OPENLIBM_USE_HOST_MATH_H */ + #ifndef OPENLIBM_H #define OPENLIBM_H @@ -487,3 +491,5 @@ long double lgammal_r(long double, int *); } #endif #endif /* !OPENLIBM_H */ + +#endif /* OPENLIBM_USE_HOST_MATH_H */ diff --git a/src/openlibm_complex.h b/src/openlibm_complex.h index 7774eab..7afc992 100644 --- a/src/openlibm_complex.h +++ b/src/openlibm_complex.h @@ -15,6 +15,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef OPENLIBM_USE_HOST_COMPLEX_H +#include +#else /* !OPENLIBM_USE_HOST_COMPLEX_H */ + #ifndef OPENLIBM_COMPLEX_H #define OPENLIBM_COMPLEX_H @@ -171,3 +175,5 @@ long double complex cprojl(long double complex); long double creall(long double complex); #endif /* !OPENLIBM_COMPLEX_H */ + +#endif /* OPENLIBM_USE_HOST_COMPLEX_H */ diff --git a/src/openlibm_fenv.h b/src/openlibm_fenv.h index 69ccf9f..478e458 100644 --- a/src/openlibm_fenv.h +++ b/src/openlibm_fenv.h @@ -1,3 +1,7 @@ +#ifdef OPENLIBM_USE_HOST_FENV_H +#include +#else /* !OPENLIBM_USE_HOST_FENV_H */ + #if defined(__arm__) #include "../arm/fenv.h" #elif defined(__x86_64__) @@ -7,3 +11,5 @@ #else #error "Unsupported platform" #endif + +#endif /* OPENLIBM_USE_HOST_FENV_H */ From 06dbb6e72b1d3e43ca813caa0b139094068e6a88 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 14:24:24 +0100 Subject: [PATCH 8/9] Use more uniform style of including headers. Put external headers before internal ones. While there, replace a lot of occurences of "openlibm.h" with . It should be thought of as an external header, as it is installed along with the library. --- amd64/fenv.c | 2 +- ld128/e_rem_pio2l.h | 2 +- ld128/k_tanl.c | 3 ++- ld128/s_exp2l.c | 2 +- ld128/s_nanl.c | 2 +- ld80/e_coshl.c | 3 ++- ld80/e_rem_pio2l.h | 3 +-- ld80/k_tanl.c | 3 ++- ld80/s_exp2l.c | 4 ++-- ld80/s_nanl.c | 3 +-- ld80/s_truncl.c | 2 +- src/e_acos.c | 2 +- src/e_acosf.c | 3 ++- src/e_acosh.c | 3 ++- src/e_acoshf.c | 3 ++- src/e_acosl.c | 2 +- src/e_asin.c | 2 +- src/e_asinf.c | 3 ++- src/e_asinl.c | 2 +- src/e_atan2.c | 2 +- src/e_atan2f.c | 3 ++- src/e_atan2l.c | 2 +- src/e_atanh.c | 3 ++- src/e_atanhf.c | 3 ++- src/e_cosh.c | 3 ++- src/e_coshf.c | 3 ++- src/e_exp.c | 2 +- src/e_expf.c | 2 +- src/e_fmod.c | 3 ++- src/e_fmodf.c | 3 ++- src/e_fmodl.c | 3 ++- src/e_gamma.c | 3 ++- src/e_gamma_r.c | 3 ++- src/e_gammaf.c | 3 ++- src/e_gammaf_r.c | 3 ++- src/e_hypot.c | 2 +- src/e_hypotf.c | 3 ++- src/e_hypotl.c | 2 +- src/e_j0.c | 3 ++- src/e_j0f.c | 3 ++- src/e_j1.c | 3 ++- src/e_j1f.c | 3 ++- src/e_jn.c | 3 ++- src/e_jnf.c | 3 ++- src/e_lgamma.c | 3 ++- src/e_lgamma_r.c | 3 ++- src/e_lgammaf.c | 3 ++- src/e_lgammaf_r.c | 3 ++- src/e_lgammal.c | 4 +++- src/e_log.c | 3 ++- src/e_log10.c | 3 ++- src/e_log10f.c | 3 ++- src/e_log2.c | 3 ++- src/e_log2f.c | 3 ++- src/e_logf.c | 3 ++- src/e_pow.c | 3 ++- src/e_powf.c | 3 ++- src/e_rem_pio2.c | 2 +- src/e_rem_pio2f.c | 2 +- src/e_remainder.c | 2 +- src/e_remainderf.c | 3 ++- src/e_scalb.c | 3 ++- src/e_scalbf.c | 3 ++- src/e_sinh.c | 3 ++- src/e_sinhf.c | 3 ++- src/e_sqrt.c | 2 +- src/e_sqrtf.c | 3 ++- src/e_sqrtl.c | 4 ++-- src/k_cos.c | 3 ++- src/k_cosf.c | 3 ++- src/k_rem_pio2.c | 2 +- src/k_sin.c | 3 ++- src/k_sinf.c | 3 ++- src/k_tan.c | 4 +++- src/k_tanf.c | 3 ++- src/polevll.c | 2 +- src/s_asinh.c | 3 ++- src/s_asinhf.c | 3 ++- src/s_atan.c | 2 +- src/s_atanf.c | 3 ++- src/s_atanl.c | 2 +- src/s_cbrt.c | 3 ++- src/s_cbrtf.c | 3 ++- src/s_cbrtl.c | 4 ++-- src/s_ceil.c | 2 +- src/s_ceilf.c | 3 ++- src/s_copysign.c | 3 ++- src/s_copysignf.c | 3 ++- src/s_cos.c | 2 +- src/s_cosf.c | 2 +- src/s_cosl.c | 2 +- src/s_erf.c | 2 +- src/s_erff.c | 3 ++- src/s_exp2.c | 2 +- src/s_exp2f.c | 2 +- src/s_expm1.c | 2 +- src/s_expm1f.c | 2 +- src/s_fabs.c | 3 ++- src/s_fabsf.c | 3 ++- src/s_finite.c | 3 ++- src/s_finitef.c | 3 ++- src/s_floor.c | 2 +- src/s_floorf.c | 3 ++- src/s_fmaf.c | 5 +++-- src/s_frexp.c | 2 +- src/s_frexpf.c | 3 ++- src/s_ilogb.c | 2 +- src/s_ilogbf.c | 2 +- src/s_log1p.c | 2 +- src/s_log1pf.c | 2 +- src/s_logb.c | 2 +- src/s_logbf.c | 3 ++- src/s_modf.c | 3 ++- src/s_modff.c | 3 ++- src/s_nextafter.c | 2 +- src/s_nextafterf.c | 3 ++- src/s_nextafterl.c | 2 +- src/s_nexttoward.c | 2 +- src/s_nexttowardf.c | 2 +- src/s_remquo.c | 2 +- src/s_remquof.c | 3 ++- src/s_remquol.c | 2 +- src/s_rint.c | 2 +- src/s_rintf.c | 2 +- src/s_scalbn.c | 5 +++-- src/s_scalbnf.c | 3 ++- src/s_signgam.c | 4 +++- src/s_significand.c | 3 ++- src/s_significandf.c | 3 ++- src/s_sin.c | 2 +- src/s_sincos.c | 2 +- src/s_sincosf.c | 3 ++- src/s_sincosl.c | 6 +++--- src/s_sinf.c | 2 +- src/s_sinl.c | 2 +- src/s_tan.c | 2 +- src/s_tanf.c | 2 +- src/s_tanh.c | 3 ++- src/s_tanhf.c | 3 ++- src/s_tanl.c | 2 +- src/s_trunc.c | 2 +- src/s_truncf.c | 3 ++- src/w_dremf.c | 3 ++- 143 files changed, 235 insertions(+), 152 deletions(-) diff --git a/amd64/fenv.c b/amd64/fenv.c index b06c899..63b0680 100644 --- a/amd64/fenv.c +++ b/amd64/fenv.c @@ -32,7 +32,7 @@ #ifdef _WIN32 #define __fenv_static #endif -#include "openlibm_fenv.h" +#include #ifdef __GNUC_GNU_INLINE__ #error "This file must be compiled with C99 'inline' semantics" diff --git a/ld128/e_rem_pio2l.h b/ld128/e_rem_pio2l.h index 8ca0b1e..ad84329 100644 --- a/ld128/e_rem_pio2l.h +++ b/ld128/e_rem_pio2l.h @@ -23,8 +23,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" #include "fpmath.h" diff --git a/ld128/k_tanl.c b/ld128/k_tanl.c index 441950f..2675f05 100644 --- a/ld128/k_tanl.c +++ b/ld128/k_tanl.c @@ -18,7 +18,8 @@ * ld128 version of k_tan.c. See ../src/k_tan.c for most comments. */ -#include "openlibm.h" +#include + #include "math_private.h" /* diff --git a/ld128/s_exp2l.c b/ld128/s_exp2l.c index 17f9395..930b4fc 100644 --- a/ld128/s_exp2l.c +++ b/ld128/s_exp2l.c @@ -28,10 +28,10 @@ //__FBSDID("$FreeBSD: src/lib/msun/ld128/s_exp2l.c,v 1.3 2008/02/13 10:44:44 bde Exp $"); #include +#include #include #include "fpmath.h" -#include "openlibm.h" #include "math_private.h" #define TBLBITS 7 diff --git a/ld128/s_nanl.c b/ld128/s_nanl.c index 4e0c36b..a18beaa 100644 --- a/ld128/s_nanl.c +++ b/ld128/s_nanl.c @@ -26,7 +26,7 @@ * $FreeBSD: src/lib/msun/ld128/s_nanl.c,v 1.3 2008/03/02 20:16:55 das Exp $ */ -#include "openlibm.h" +#include #include "fpmath.h" #include "math_private.h" diff --git a/ld80/e_coshl.c b/ld80/e_coshl.c index 2d0a114..670c5c4 100644 --- a/ld80/e_coshl.c +++ b/ld80/e_coshl.c @@ -31,7 +31,8 @@ * only coshl(0)=1 is exact for finite x. */ -#include "openlibm.h" +#include + #include "math_private.h" static const long double one = 1.0, half=0.5, huge = 1.0e4900L; diff --git a/ld80/e_rem_pio2l.h b/ld80/e_rem_pio2l.h index 65ccaaa..eebe723 100644 --- a/ld80/e_rem_pio2l.h +++ b/ld80/e_rem_pio2l.h @@ -23,10 +23,9 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" -#include "openlibm.h" #define BIAS (LDBL_MAX_EXP - 1) diff --git a/ld80/k_tanl.c b/ld80/k_tanl.c index 4e65aac..c85001e 100644 --- a/ld80/k_tanl.c +++ b/ld80/k_tanl.c @@ -18,7 +18,8 @@ * ld80 version of k_tan.c. See ../src/k_tan.c for most comments. */ -#include "openlibm.h" +#include + #include "math_private.h" /* diff --git a/ld80/s_exp2l.c b/ld80/s_exp2l.c index 0c89159..5e13a4e 100644 --- a/ld80/s_exp2l.c +++ b/ld80/s_exp2l.c @@ -32,8 +32,8 @@ #include "amd64/bsd_ieeefp.h" -#include "openlibm.h" -#include "openlibm.h" +#include + #include "math_private.h" #define TBLBITS 7 diff --git a/ld80/s_nanl.c b/ld80/s_nanl.c index 7b0fe01..df6a559 100644 --- a/ld80/s_nanl.c +++ b/ld80/s_nanl.c @@ -26,9 +26,8 @@ * $FreeBSD: src/lib/msun/ld80/s_nanl.c,v 1.2 2007/12/18 23:46:31 das Exp $ */ -#include "openlibm.h" +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT long double diff --git a/ld80/s_truncl.c b/ld80/s_truncl.c index e4aa68c..922d1da 100644 --- a/ld80/s_truncl.c +++ b/ld80/s_truncl.c @@ -24,7 +24,7 @@ //#include #include -#include "openlibm.h" +#include #include #include "math_private.h" diff --git a/src/e_acos.c b/src/e_acos.c index 3eea520..bf07b54 100644 --- a/src/e_acos.c +++ b/src/e_acos.c @@ -39,8 +39,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/e_acosf.c b/src/e_acosf.c index 8e32fae..21763fc 100644 --- a/src/e_acosf.c +++ b/src/e_acosf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.11 2008/08/03 17:39:54 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/e_acosh.c b/src/e_acosh.c index 6180b24..d54c21a 100644 --- a/src/e_acosh.c +++ b/src/e_acosh.c @@ -29,7 +29,8 @@ * acosh(NaN) is NaN without signal. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/e_acoshf.c b/src/e_acoshf.c index 65de3f2..5e4a163 100644 --- a/src/e_acoshf.c +++ b/src/e_acoshf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.8 2008/02/22 02:30:34 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/e_acosl.c b/src/e_acosl.c index fe6270f..9b3df20 100644 --- a/src/e_acosl.c +++ b/src/e_acosl.c @@ -21,9 +21,9 @@ */ #include +#include #include "invtrig.h" -#include "openlibm.h" #include "math_private.h" static const long double diff --git a/src/e_asin.c b/src/e_asin.c index a0e76f5..67d1d0f 100644 --- a/src/e_asin.c +++ b/src/e_asin.c @@ -45,8 +45,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/e_asinf.c b/src/e_asinf.c index 4db4550..78b1012 100644 --- a/src/e_asinf.c +++ b/src/e_asinf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.13 2008/08/08 00:21:27 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/e_asinl.c b/src/e_asinl.c index 6de8f0a..c1877f0 100644 --- a/src/e_asinl.c +++ b/src/e_asinl.c @@ -21,9 +21,9 @@ */ #include +#include #include "invtrig.h" -#include "openlibm.h" #include "math_private.h" static const long double diff --git a/src/e_atan2.c b/src/e_atan2.c index d676c7e..bf5b15c 100644 --- a/src/e_atan2.c +++ b/src/e_atan2.c @@ -43,8 +43,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static volatile double diff --git a/src/e_atan2f.c b/src/e_atan2f.c index 2dfc31f..f067a18 100644 --- a/src/e_atan2f.c +++ b/src/e_atan2f.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.12 2008/08/03 17:39:54 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static volatile float diff --git a/src/e_atan2l.c b/src/e_atan2l.c index 3bad12f..776bbf5 100644 --- a/src/e_atan2l.c +++ b/src/e_atan2l.c @@ -22,9 +22,9 @@ */ #include +#include #include "invtrig.h" -#include "openlibm.h" #include "math_private.h" static volatile long double diff --git a/src/e_atanh.c b/src/e_atanh.c index d09ba50..0cf09da 100644 --- a/src/e_atanh.c +++ b/src/e_atanh.c @@ -33,7 +33,8 @@ * */ -#include "openlibm.h" +#include + #include "math_private.h" static const double one = 1.0, huge = 1e300; diff --git a/src/e_atanhf.c b/src/e_atanhf.c index e69bf48..bb2a2f6 100644 --- a/src/e_atanhf.c +++ b/src/e_atanhf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.7 2008/02/22 02:30:34 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float one = 1.0, huge = 1e30; diff --git a/src/e_cosh.c b/src/e_cosh.c index a8a5c6c..bb04ec9 100644 --- a/src/e_cosh.c +++ b/src/e_cosh.c @@ -35,7 +35,8 @@ * only cosh(0)=1 is exact for finite x. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double one = 1.0, half=0.5, huge = 1.0e300; diff --git a/src/e_coshf.c b/src/e_coshf.c index f5e8202..ad2de96 100644 --- a/src/e_coshf.c +++ b/src/e_coshf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.9 2011/10/21 06:28:47 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float one = 1.0, half=0.5, huge = 1.0e30; diff --git a/src/e_exp.c b/src/e_exp.c index 88a90f7..6b2e728 100644 --- a/src/e_exp.c +++ b/src/e_exp.c @@ -77,8 +77,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/e_expf.c b/src/e_expf.c index 15d622b..88e0408 100644 --- a/src/e_expf.c +++ b/src/e_expf.c @@ -17,8 +17,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/e_expf.c,v 1.16 2011/10/21 06:26:38 das Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" static const float diff --git a/src/e_fmod.c b/src/e_fmod.c index 83076fb..b91793e 100644 --- a/src/e_fmod.c +++ b/src/e_fmod.c @@ -20,7 +20,8 @@ * Method: shift and subtract */ -#include "openlibm.h" +#include + #include "math_private.h" static const double one = 1.0, Zero[] = {0.0, -0.0,}; diff --git a/src/e_fmodf.c b/src/e_fmodf.c index 14ee260..3ea43ba 100644 --- a/src/e_fmodf.c +++ b/src/e_fmodf.c @@ -22,7 +22,8 @@ * Method: shift and subtract */ -#include "openlibm.h" +#include + #include "math_private.h" static const float one = 1.0, Zero[] = {0.0, -0.0,}; diff --git a/src/e_fmodl.c b/src/e_fmodl.c index 452d155..7aacc2a 100644 --- a/src/e_fmodl.c +++ b/src/e_fmodl.c @@ -14,10 +14,11 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/e_fmodl.c,v 1.2 2008/07/31 20:09:47 das Exp $"); #include +#include #include #include "fpmath.h" -#include "openlibm.h" + #include "math_private.h" #define BIAS (LDBL_MAX_EXP - 1) diff --git a/src/e_gamma.c b/src/e_gamma.c index f256a15..ff7b257 100644 --- a/src/e_gamma.c +++ b/src/e_gamma.c @@ -21,7 +21,8 @@ * Method: call __ieee754_gamma_r */ -#include "openlibm.h" +#include + #include "math_private.h" extern int signgam; diff --git a/src/e_gamma_r.c b/src/e_gamma_r.c index 3d4e767..9d452f9 100644 --- a/src/e_gamma_r.c +++ b/src/e_gamma_r.c @@ -22,7 +22,8 @@ * Method: See __ieee754_lgamma_r */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/e_gammaf.c b/src/e_gammaf.c index 7350ab3..465efb4 100644 --- a/src/e_gammaf.c +++ b/src/e_gammaf.c @@ -22,7 +22,8 @@ * Method: call __ieee754_gammaf_r */ -#include "openlibm.h" +#include + #include "math_private.h" extern int signgam; diff --git a/src/e_gammaf_r.c b/src/e_gammaf_r.c index 68fefd2..264d833 100644 --- a/src/e_gammaf_r.c +++ b/src/e_gammaf_r.c @@ -23,7 +23,8 @@ * Method: See __ieee754_lgammaf_r */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/e_hypot.c b/src/e_hypot.c index db1745f..058a9fd 100644 --- a/src/e_hypot.c +++ b/src/e_hypot.c @@ -47,8 +47,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT double diff --git a/src/e_hypotf.c b/src/e_hypotf.c index 7c2885a..046e55e 100644 --- a/src/e_hypotf.c +++ b/src/e_hypotf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.14 2011/10/15 07:00:28 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/e_hypotl.c b/src/e_hypotl.c index 269233b..7211ce7 100644 --- a/src/e_hypotl.c +++ b/src/e_hypotl.c @@ -16,9 +16,9 @@ /* long double version of hypot(). See e_hypot.c for most comments. */ #include +#include #include "fpmath.h" -#include "openlibm.h" #include "math_private.h" #define GET_LDBL_MAN(h, l, v) do { \ diff --git a/src/e_j0.c b/src/e_j0.c index 684bd56..af22cb5 100644 --- a/src/e_j0.c +++ b/src/e_j0.c @@ -61,7 +61,8 @@ * 3. Special cases: y0(0)=-inf, y0(x<0)=NaN, y0(inf)=0. */ -#include "openlibm.h" +#include + #include "math_private.h" static double pzero(double), qzero(double); diff --git a/src/e_j0f.c b/src/e_j0f.c index ee32fe1..e3cbc8f 100644 --- a/src/e_j0f.c +++ b/src/e_j0f.c @@ -18,7 +18,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.8 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static float pzerof(float), qzerof(float); diff --git a/src/e_j1.c b/src/e_j1.c index b084dd9..1dbcd29 100644 --- a/src/e_j1.c +++ b/src/e_j1.c @@ -61,7 +61,8 @@ * by method mentioned above. */ -#include "openlibm.h" +#include + #include "math_private.h" static double pone(double), qone(double); diff --git a/src/e_j1f.c b/src/e_j1f.c index c103f2e..90429f1 100644 --- a/src/e_j1f.c +++ b/src/e_j1f.c @@ -18,7 +18,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.8 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static float ponef(float), qonef(float); diff --git a/src/e_jn.c b/src/e_jn.c index 883e45c..30bfb82 100644 --- a/src/e_jn.c +++ b/src/e_jn.c @@ -40,7 +40,8 @@ * */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/e_jnf.c b/src/e_jnf.c index 30853e4..7ff3a2d 100644 --- a/src/e_jnf.c +++ b/src/e_jnf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.11 2010/11/13 10:54:10 uqs Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/e_lgamma.c b/src/e_lgamma.c index 469b38f..da25f44 100644 --- a/src/e_lgamma.c +++ b/src/e_lgamma.c @@ -21,7 +21,8 @@ * Method: call __ieee754_lgamma_r */ -#include "openlibm.h" +#include + #include "math_private.h" extern int signgam; diff --git a/src/e_lgamma_r.c b/src/e_lgamma_r.c index ad2c2ed..3944f36 100644 --- a/src/e_lgamma_r.c +++ b/src/e_lgamma_r.c @@ -83,7 +83,8 @@ * */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/e_lgammaf.c b/src/e_lgammaf.c index 8ac900c..922be5a 100644 --- a/src/e_lgammaf.c +++ b/src/e_lgammaf.c @@ -22,7 +22,8 @@ * Method: call __ieee754_lgammaf_r */ -#include "openlibm.h" +#include + #include "math_private.h" extern int signgam; diff --git a/src/e_lgammaf_r.c b/src/e_lgammaf_r.c index 5d9fc87..52b06c3 100644 --- a/src/e_lgammaf_r.c +++ b/src/e_lgammaf_r.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.12 2011/10/15 07:00:28 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/e_lgammal.c b/src/e_lgammal.c index e608eb1..2e68630 100644 --- a/src/e_lgammal.c +++ b/src/e_lgammal.c @@ -1,5 +1,7 @@ #include "cdefs-compat.h" -#include "openlibm.h" + +#include + #include "math_private.h" extern int signgam; diff --git a/src/e_log.c b/src/e_log.c index ee73d74..e55390b 100644 --- a/src/e_log.c +++ b/src/e_log.c @@ -65,7 +65,8 @@ * to produce the hexadecimal values shown. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/e_log10.c b/src/e_log10.c index a6f9dd6..d0a4034 100644 --- a/src/e_log10.c +++ b/src/e_log10.c @@ -22,7 +22,8 @@ * in not-quite-routine extra precision. */ -#include "openlibm.h" +#include + #include "math_private.h" #include "k_log.h" diff --git a/src/e_log10f.c b/src/e_log10f.c index 9ebce9a..38e1a22 100644 --- a/src/e_log10f.c +++ b/src/e_log10f.c @@ -16,7 +16,8 @@ * Float version of e_log10.c. See the latter for most comments. */ -#include "openlibm.h" +#include + #include "math_private.h" #include "k_logf.h" diff --git a/src/e_log2.c b/src/e_log2.c index 0784679..590b3d1 100644 --- a/src/e_log2.c +++ b/src/e_log2.c @@ -24,7 +24,8 @@ * in not-quite-routine extra precision. */ -#include "openlibm.h" +#include + #include "math_private.h" #include "k_log.h" diff --git a/src/e_log2f.c b/src/e_log2f.c index 99fa397..3997e2d 100644 --- a/src/e_log2f.c +++ b/src/e_log2f.c @@ -16,7 +16,8 @@ * Float version of e_log2.c. See the latter for most comments. */ -#include "openlibm.h" +#include + #include "math_private.h" #include "k_logf.h" diff --git a/src/e_logf.c b/src/e_logf.c index c360cb7..fd06a44 100644 --- a/src/e_logf.c +++ b/src/e_logf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_logf.c,v 1.11 2008/03/29 16:37:59 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/e_pow.c b/src/e_pow.c index f1a0c32..2cff6ad 100644 --- a/src/e_pow.c +++ b/src/e_pow.c @@ -57,7 +57,8 @@ * to produce the hexadecimal values shown. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/e_powf.c b/src/e_powf.c index c1e9e8b..d524526 100644 --- a/src/e_powf.c +++ b/src/e_powf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_powf.c,v 1.16 2011/10/21 06:26:07 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/e_rem_pio2.c b/src/e_rem_pio2.c index 2b47309..716abda 100644 --- a/src/e_rem_pio2.c +++ b/src/e_rem_pio2.c @@ -23,8 +23,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" /* diff --git a/src/e_rem_pio2f.c b/src/e_rem_pio2f.c index 0f534aa..a66adbd 100644 --- a/src/e_rem_pio2f.c +++ b/src/e_rem_pio2f.c @@ -25,8 +25,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" /* diff --git a/src/e_remainder.c b/src/e_remainder.c index 1b1410f..cc1e4c5 100644 --- a/src/e_remainder.c +++ b/src/e_remainder.c @@ -24,8 +24,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double zero = 0.0; diff --git a/src/e_remainderf.c b/src/e_remainderf.c index 867c40a..5d49d23 100644 --- a/src/e_remainderf.c +++ b/src/e_remainderf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.8 2008/02/12 17:11:36 bde Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float zero = 0.0; diff --git a/src/e_scalb.c b/src/e_scalb.c index e0c9165..abf05f7 100644 --- a/src/e_scalb.c +++ b/src/e_scalb.c @@ -20,7 +20,8 @@ * should use scalbn() instead. */ -#include "openlibm.h" +#include + #include "math_private.h" #ifdef _SCALB_INT diff --git a/src/e_scalbf.c b/src/e_scalbf.c index 7472d37..6154fb0 100644 --- a/src/e_scalbf.c +++ b/src/e_scalbf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.13 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" #ifdef _SCALB_INT diff --git a/src/e_sinh.c b/src/e_sinh.c index 5fc451e..f9ffd9e 100644 --- a/src/e_sinh.c +++ b/src/e_sinh.c @@ -32,7 +32,8 @@ * only sinh(0)=0 is exact for finite x. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double one = 1.0, shuge = 1.0e307; diff --git a/src/e_sinhf.c b/src/e_sinhf.c index 9a97834..461502f 100644 --- a/src/e_sinhf.c +++ b/src/e_sinhf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.10 2011/10/21 06:28:47 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float one = 1.0, shuge = 1.0e37; diff --git a/src/e_sqrt.c b/src/e_sqrt.c index df6eec4..f89b852 100644 --- a/src/e_sqrt.c +++ b/src/e_sqrt.c @@ -85,8 +85,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double one = 1.0, tiny=1.0e-300; diff --git a/src/e_sqrtf.c b/src/e_sqrtf.c index e842efe..f863c7a 100644 --- a/src/e_sqrtf.c +++ b/src/e_sqrtf.c @@ -13,7 +13,8 @@ * ==================================================== */ -#include "openlibm.h" +#include + #include "math_private.h" static const float one = 1.0, tiny=1.0e-30; diff --git a/src/e_sqrtl.c b/src/e_sqrtl.c index 80f3d61..910bfc7 100644 --- a/src/e_sqrtl.c +++ b/src/e_sqrtl.c @@ -28,10 +28,10 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/e_sqrtl.c,v 1.1 2008/03/02 01:47:58 das Exp $"); #include +#include +#include #include "fpmath.h" -#include "openlibm.h" -#include "openlibm_fenv.h" #include "math_private.h" /* Return (x + ulp) for normal positive x. Assumes no overflow. */ diff --git a/src/k_cos.c b/src/k_cos.c index b468594..db7a959 100644 --- a/src/k_cos.c +++ b/src/k_cos.c @@ -53,7 +53,8 @@ * any extra precision in w. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/k_cosf.c b/src/k_cosf.c index 6daeb65..f1a5eac 100644 --- a/src/k_cosf.c +++ b/src/k_cosf.c @@ -19,7 +19,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.18 2009/06/03 08:16:34 ed Exp $"); #endif -#include "openlibm.h" +#include + #include "math_private.h" /* |cos(x) - c(x)| < 2**-34.1 (~[-5.37e-11, 5.295e-11]). */ diff --git a/src/k_rem_pio2.c b/src/k_rem_pio2.c index ba6fd3c..b9637de 100644 --- a/src/k_rem_pio2.c +++ b/src/k_rem_pio2.c @@ -130,8 +130,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const int init_jk[] = {3,4,4,6}; /* initial value for jk */ diff --git a/src/k_sin.c b/src/k_sin.c index 8b7c1e5..0fa59e5 100644 --- a/src/k_sin.c +++ b/src/k_sin.c @@ -44,7 +44,8 @@ * sin(x) = x + (S1*x + (x *(r-y/2)+y)) */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/k_sinf.c b/src/k_sinf.c index 374d610..fb9f22b 100644 --- a/src/k_sinf.c +++ b/src/k_sinf.c @@ -19,7 +19,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.16 2009/06/03 08:16:34 ed Exp $"); #endif -#include "openlibm.h" +#include + #include "math_private.h" /* |sin(x)/x - s(x)| < 2**-37.5 (~[-4.89e-12, 4.824e-12]). */ diff --git a/src/k_tan.c b/src/k_tan.c index 090304c..cda5e67 100644 --- a/src/k_tan.c +++ b/src/k_tan.c @@ -49,8 +49,10 @@ * = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y))) */ -#include "openlibm.h" +#include + #include "math_private.h" + static const double xxx[] = { 3.33333333333334091986e-01, /* 3FD55555, 55555563 */ 1.33333333333201242699e-01, /* 3FC11111, 1110FE7A */ diff --git a/src/k_tanf.c b/src/k_tanf.c index 3dac110..a81a516 100644 --- a/src/k_tanf.c +++ b/src/k_tanf.c @@ -18,7 +18,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.23 2009/06/03 08:16:34 ed Exp $"); #endif -#include "openlibm.h" +#include + #include "math_private.h" /* |tan(x)/x - t(x)| < 2**-25.5 (~[-2e-08, 2e-08]). */ diff --git a/src/polevll.c b/src/polevll.c index 78cd75c..3b31ec3 100644 --- a/src/polevll.c +++ b/src/polevll.c @@ -60,7 +60,7 @@ * */ -#include "openlibm.h" +#include #include "math_private.h" diff --git a/src/s_asinh.c b/src/s_asinh.c index 70d1002..d30ae08 100644 --- a/src/s_asinh.c +++ b/src/s_asinh.c @@ -24,7 +24,8 @@ * := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2))) */ -#include "openlibm.h" +#include + #include "math_private.h" static const double diff --git a/src/s_asinhf.c b/src/s_asinhf.c index 8a988df..8b2b951 100644 --- a/src/s_asinhf.c +++ b/src/s_asinhf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.9 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/s_atan.c b/src/s_atan.c index 60d8df8..9a08b9f 100644 --- a/src/s_atan.c +++ b/src/s_atan.c @@ -34,8 +34,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double atanhi[] = { diff --git a/src/s_atanf.c b/src/s_atanf.c index 505c3e8..b28deed 100644 --- a/src/s_atanf.c +++ b/src/s_atanf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.10 2008/08/01 01:24:25 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float atanhi[] = { diff --git a/src/s_atanl.c b/src/s_atanl.c index ee47f4e..9fe682e 100644 --- a/src/s_atanl.c +++ b/src/s_atanl.c @@ -20,9 +20,9 @@ */ #include +#include #include "invtrig.h" -#include "openlibm.h" #include "math_private.h" static const long double diff --git a/src/s_cbrt.c b/src/s_cbrt.c index 2fccb92..17a64a4 100644 --- a/src/s_cbrt.c +++ b/src/s_cbrt.c @@ -15,7 +15,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.17 2011/03/12 16:50:39 kargl Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" /* cbrt(x) diff --git a/src/s_cbrtf.c b/src/s_cbrtf.c index ccb7957..5ca255b 100644 --- a/src/s_cbrtf.c +++ b/src/s_cbrtf.c @@ -17,7 +17,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.18 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" /* cbrtf(x) diff --git a/src/s_cbrtl.c b/src/s_cbrtl.c index d43d0af..ddd818b 100644 --- a/src/s_cbrtl.c +++ b/src/s_cbrtl.c @@ -18,11 +18,11 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtl.c,v 1.1 2011/03/12 19:37:35 kargl Exp $"); #include +#include // VBS //#include -#include "fpmath.h" -#include "openlibm.h" +#include "fpmath.h" #include "math_private.h" #if defined(_WIN32) && defined(__i386__) #include "i387/bsd_ieeefp.h" diff --git a/src/s_ceil.c b/src/s_ceil.c index 7c02043..93ce46b 100644 --- a/src/s_ceil.c +++ b/src/s_ceil.c @@ -23,8 +23,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double huge = 1.0e300; diff --git a/src/s_ceilf.c b/src/s_ceilf.c index 8fb20e5..cd42474 100644 --- a/src/s_ceilf.c +++ b/src/s_ceilf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.8 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float huge = 1.0e30; diff --git a/src/s_copysign.c b/src/s_copysign.c index 12b777d..27be952 100644 --- a/src/s_copysign.c +++ b/src/s_copysign.c @@ -19,7 +19,8 @@ * with the sign bit of y. */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/s_copysignf.c b/src/s_copysignf.c index f7e8415..3fcf21e 100644 --- a/src/s_copysignf.c +++ b/src/s_copysignf.c @@ -22,7 +22,8 @@ * with the sign bit of y. */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/s_cos.c b/src/s_cos.c index 2d3c4bb..63e52a3 100644 --- a/src/s_cos.c +++ b/src/s_cos.c @@ -45,8 +45,8 @@ */ #include +#include -#include "openlibm.h" //#define INLINE_REM_PIO2 #include "math_private.h" //#include "e_rem_pio2.c" diff --git a/src/s_cosf.c b/src/s_cosf.c index 1d4e725..72b2551 100644 --- a/src/s_cosf.c +++ b/src/s_cosf.c @@ -18,8 +18,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $"); #include +#include -#include "openlibm.h" //#define INLINE_KERNEL_COSDF //#define INLINE_KERNEL_SINDF //#define INLINE_REM_PIO2F diff --git a/src/s_cosl.c b/src/s_cosl.c index d9147ae..365d74e 100644 --- a/src/s_cosl.c +++ b/src/s_cosl.c @@ -33,8 +33,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" #if LDBL_MANT_DIG == 64 #include "../ld80/e_rem_pio2l.h" diff --git a/src/s_erf.c b/src/s_erf.c index d6504b5..acccd57 100644 --- a/src/s_erf.c +++ b/src/s_erf.c @@ -107,8 +107,8 @@ * erfc/erf(NaN) is NaN */ +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/s_erff.c b/src/s_erff.c index 18a8f49..c4e1f5f 100644 --- a/src/s_erff.c +++ b/src/s_erff.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_erff.c,v 1.8 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/s_exp2.c b/src/s_exp2.c index 598268b..e1863f5 100644 --- a/src/s_exp2.c +++ b/src/s_exp2.c @@ -28,8 +28,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" #define TBLBITS 8 diff --git a/src/s_exp2f.c b/src/s_exp2f.c index 9409bd4..696d63e 100644 --- a/src/s_exp2f.c +++ b/src/s_exp2f.c @@ -28,8 +28,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.9 2008/02/22 02:27:34 das Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" #define TBLBITS 4 diff --git a/src/s_expm1.c b/src/s_expm1.c index ff99652..001e3ac 100644 --- a/src/s_expm1.c +++ b/src/s_expm1.c @@ -109,8 +109,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/s_expm1f.c b/src/s_expm1f.c index 9d29ac4..9fd2f8d 100644 --- a/src/s_expm1f.c +++ b/src/s_expm1f.c @@ -17,8 +17,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.12 2011/10/21 06:26:38 das Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" static const float diff --git a/src/s_fabs.c b/src/s_fabs.c index 6c53c80..077e02c 100644 --- a/src/s_fabs.c +++ b/src/s_fabs.c @@ -14,7 +14,8 @@ * fabs(x) returns the absolute value of x. */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/s_fabsf.c b/src/s_fabsf.c index f5b4525..8792332 100644 --- a/src/s_fabsf.c +++ b/src/s_fabsf.c @@ -20,7 +20,8 @@ * fabsf(x) returns the absolute value of x. */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/s_finite.c b/src/s_finite.c index 46f84e7..c8c1d0d 100644 --- a/src/s_finite.c +++ b/src/s_finite.c @@ -18,7 +18,8 @@ * no branching! */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT int diff --git a/src/s_finitef.c b/src/s_finitef.c index 6d189a5..44239c1 100644 --- a/src/s_finitef.c +++ b/src/s_finitef.c @@ -21,7 +21,8 @@ * no branching! */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT int diff --git a/src/s_floor.c b/src/s_floor.c index 95891ef..6825492 100644 --- a/src/s_floor.c +++ b/src/s_floor.c @@ -23,8 +23,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double huge = 1.0e300; diff --git a/src/s_floorf.c b/src/s_floorf.c index 678bb11..b056584 100644 --- a/src/s_floorf.c +++ b/src/s_floorf.c @@ -25,7 +25,8 @@ * Inexact flag raised if x not equal to floorf(x). */ -#include "openlibm.h" +#include + #include "math_private.h" static const float huge = 1.0e30; diff --git a/src/s_fmaf.c b/src/s_fmaf.c index b697f9a..e56489e 100644 --- a/src/s_fmaf.c +++ b/src/s_fmaf.c @@ -27,8 +27,9 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.3 2011/10/15 04:16:58 das Exp $"); -#include "openlibm.h" -#include "openlibm_fenv.h" +#include +#include + #include "math_private.h" /* diff --git a/src/s_frexp.c b/src/s_frexp.c index 3a7d3bd..c836375 100644 --- a/src/s_frexp.c +++ b/src/s_frexp.c @@ -24,8 +24,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/s_frexpf.c b/src/s_frexpf.c index 1f31aa1..c80f553 100644 --- a/src/s_frexpf.c +++ b/src/s_frexpf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.10 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/s_ilogb.c b/src/s_ilogb.c index 14e4265..bbac525 100644 --- a/src/s_ilogb.c +++ b/src/s_ilogb.c @@ -21,8 +21,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT int diff --git a/src/s_ilogbf.c b/src/s_ilogbf.c index d83857c..1e556c3 100644 --- a/src/s_ilogbf.c +++ b/src/s_ilogbf.c @@ -17,8 +17,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.8 2008/02/22 02:30:35 das Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT int diff --git a/src/s_log1p.c b/src/s_log1p.c index 2752cd2..70d4bcc 100644 --- a/src/s_log1p.c +++ b/src/s_log1p.c @@ -79,8 +79,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/s_log1pf.c b/src/s_log1pf.c index 04120ea..d162f7b 100644 --- a/src/s_log1pf.c +++ b/src/s_log1pf.c @@ -17,8 +17,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.12 2008/03/29 16:37:59 das Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" static const float diff --git a/src/s_logb.c b/src/s_logb.c index 4fb376a..9549301 100644 --- a/src/s_logb.c +++ b/src/s_logb.c @@ -20,8 +20,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/s_logbf.c b/src/s_logbf.c index 26a36b5..e1926a3 100644 --- a/src/s_logbf.c +++ b/src/s_logbf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.9 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/s_modf.c b/src/s_modf.c index 2615729..319c963 100644 --- a/src/s_modf.c +++ b/src/s_modf.c @@ -20,7 +20,8 @@ * No exception. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double one = 1.0; diff --git a/src/s_modff.c b/src/s_modff.c index 7deee06..a8bbf98 100644 --- a/src/s_modff.c +++ b/src/s_modff.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_modff.c,v 1.9 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float one = 1.0; diff --git a/src/s_nextafter.c b/src/s_nextafter.c index f3c695e..2e02a32 100644 --- a/src/s_nextafter.c +++ b/src/s_nextafter.c @@ -21,8 +21,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" DLLEXPORT double diff --git a/src/s_nextafterf.c b/src/s_nextafterf.c index 1a070a6..dac81e9 100644 --- a/src/s_nextafterf.c +++ b/src/s_nextafterf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.11 2008/02/22 02:30:35 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/s_nextafterl.c b/src/s_nextafterl.c index 2874350..27c002e 100644 --- a/src/s_nextafterl.c +++ b/src/s_nextafterl.c @@ -21,9 +21,9 @@ */ #include +#include #include "fpmath.h" -#include "openlibm.h" #include "math_private.h" #if LDBL_MAX_EXP != 0x4000 diff --git a/src/s_nexttoward.c b/src/s_nexttoward.c index eca0370..483c933 100644 --- a/src/s_nexttoward.c +++ b/src/s_nexttoward.c @@ -20,9 +20,9 @@ */ #include +#include #include "fpmath.h" -#include "openlibm.h" #include "math_private.h" #if LDBL_MAX_EXP != 0x4000 diff --git a/src/s_nexttowardf.c b/src/s_nexttowardf.c index d708062..4726cbd 100644 --- a/src/s_nexttowardf.c +++ b/src/s_nexttowardf.c @@ -13,9 +13,9 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_nexttowardf.c,v 1.3 2011/02/10 07:38:38 das Exp $"); #include +#include #include "fpmath.h" -#include "openlibm.h" #include "math_private.h" #define LDBL_INFNAN_EXP (LDBL_MAX_EXP * 2 - 1) diff --git a/src/s_remquo.c b/src/s_remquo.c index 7b63b76..ca62639 100644 --- a/src/s_remquo.c +++ b/src/s_remquo.c @@ -14,8 +14,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquo.c,v 1.2 2008/03/30 20:47:26 das Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" static const double Zero[] = {0.0, -0.0,}; diff --git a/src/s_remquof.c b/src/s_remquof.c index 579dec0..72a0316 100644 --- a/src/s_remquof.c +++ b/src/s_remquof.c @@ -13,7 +13,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquof.c,v 1.1 2005/03/25 04:40:44 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float Zero[] = {0.0, -0.0,}; diff --git a/src/s_remquol.c b/src/s_remquol.c index 0100cae..69734dd 100644 --- a/src/s_remquol.c +++ b/src/s_remquol.c @@ -14,10 +14,10 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquol.c,v 1.2 2008/07/31 20:09:47 das Exp $"); #include +#include #include #include "fpmath.h" -#include "openlibm.h" #include "math_private.h" #define BIAS (LDBL_MAX_EXP - 1) diff --git a/src/s_rint.c b/src/s_rint.c index b246e00..ba0e104 100644 --- a/src/s_rint.c +++ b/src/s_rint.c @@ -24,8 +24,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double diff --git a/src/s_rintf.c b/src/s_rintf.c index 91d05c0..f593c1a 100644 --- a/src/s_rintf.c +++ b/src/s_rintf.c @@ -17,9 +17,9 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.12 2008/02/22 02:30:35 das Exp $"); #include +#include #include -#include "openlibm.h" #include "math_private.h" static const float diff --git a/src/s_scalbn.c b/src/s_scalbn.c index de2c98f..1071ac3 100644 --- a/src/s_scalbn.c +++ b/src/s_scalbn.c @@ -18,9 +18,10 @@ */ #include "cdefs-compat.h" -#include -#include "openlibm.h" +#include +#include + #include "math_private.h" static const double diff --git a/src/s_scalbnf.c b/src/s_scalbnf.c index e353e24..57d53ca 100644 --- a/src/s_scalbnf.c +++ b/src/s_scalbnf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" -#include "openlibm.h" +#include + #include "math_private.h" static const float diff --git a/src/s_signgam.c b/src/s_signgam.c index b5650f6..7e197a0 100644 --- a/src/s_signgam.c +++ b/src/s_signgam.c @@ -1,3 +1,5 @@ -#include "openlibm.h" +#include + #include "math_private.h" + int signgam = 0; diff --git a/src/s_significand.c b/src/s_significand.c index d6d06ea..51e51fd 100644 --- a/src/s_significand.c +++ b/src/s_significand.c @@ -19,7 +19,8 @@ * for exercising the fraction-part(F) IEEE 754-1985 test vector. */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT double diff --git a/src/s_significandf.c b/src/s_significandf.c index 781f786..3cc5011 100644 --- a/src/s_significandf.c +++ b/src/s_significandf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.8 2008/02/22 02:30:36 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT float diff --git a/src/s_sin.c b/src/s_sin.c index 31ed70a..9f50764 100644 --- a/src/s_sin.c +++ b/src/s_sin.c @@ -45,8 +45,8 @@ */ #include +#include -#include "openlibm.h" //#define INLINE_REM_PIO2 #include "math_private.h" //#include "e_rem_pio2.c" diff --git a/src/s_sincos.c b/src/s_sincos.c index c10a15d..a6b7cab 100644 --- a/src/s_sincos.c +++ b/src/s_sincos.c @@ -35,8 +35,8 @@ */ #include +#include -#include "openlibm.h" //#define INLINE_REM_PIO2 #include "math_private.h" //#include "e_rem_pio2.c" diff --git a/src/s_sincosf.c b/src/s_sincosf.c index 26ebca0..8908ae6 100644 --- a/src/s_sincosf.c +++ b/src/s_sincosf.c @@ -10,8 +10,9 @@ */ #include "cdefs-compat.h" + #include -#include "openlibm.h" +#include //#define INLINE_KERNEL_COSDF //#define INLINE_KERNEL_SINDF diff --git a/src/s_sincosl.c b/src/s_sincosl.c index 2ca1e97..72ada33 100644 --- a/src/s_sincosl.c +++ b/src/s_sincosl.c @@ -9,11 +9,11 @@ * ==================================================== */ - #include "cdefs-compat.h" +#include "cdefs-compat.h" - #include +#include +#include -#include "openlibm.h" #include "math_private.h" #if LDBL_MANT_DIG == 64 #include "../ld80/e_rem_pio2l.h" diff --git a/src/s_sinf.c b/src/s_sinf.c index 97a2c92..c76a99e 100644 --- a/src/s_sinf.c +++ b/src/s_sinf.c @@ -18,8 +18,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); #include +#include -#include "openlibm.h" //#define INLINE_KERNEL_COSDF //#define INLINE_KERNEL_SINDF //#define INLINE_REM_PIO2F diff --git a/src/s_sinl.c b/src/s_sinl.c index 5c73c33..b460b07 100644 --- a/src/s_sinl.c +++ b/src/s_sinl.c @@ -28,8 +28,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_sinl.c,v 1.3 2011/05/30 19:41:28 kargl Exp $"); #include +#include -#include "openlibm.h" #include "math_private.h" #if LDBL_MANT_DIG == 64 #include "../ld80/e_rem_pio2l.h" diff --git a/src/s_tan.c b/src/s_tan.c index 4392776..e830a19 100644 --- a/src/s_tan.c +++ b/src/s_tan.c @@ -44,8 +44,8 @@ */ #include +#include -#include "openlibm.h" //#define INLINE_REM_PIO2 #include "math_private.h" //#include "e_rem_pio2.c" diff --git a/src/s_tanf.c b/src/s_tanf.c index ccf37a9..f711507 100644 --- a/src/s_tanf.c +++ b/src/s_tanf.c @@ -18,8 +18,8 @@ //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); #include +#include -#include "openlibm.h" //#define INLINE_KERNEL_TANDF //#define INLINE_REM_PIO2F #include "math_private.h" diff --git a/src/s_tanh.c b/src/s_tanh.c index a400fd6..aee5df0 100644 --- a/src/s_tanh.c +++ b/src/s_tanh.c @@ -37,7 +37,8 @@ * only tanh(0)=0 is exact for finite argument. */ -#include "openlibm.h" +#include + #include "math_private.h" static const double one = 1.0, two = 2.0, tiny = 1.0e-300, huge = 1.0e300; diff --git a/src/s_tanhf.c b/src/s_tanhf.c index 85b5d18..0fdf18d 100644 --- a/src/s_tanhf.c +++ b/src/s_tanhf.c @@ -16,7 +16,8 @@ #include "cdefs-compat.h" //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.9 2008/02/22 02:30:36 das Exp $"); -#include "openlibm.h" +#include + #include "math_private.h" static const float one=1.0, two=2.0, tiny = 1.0e-30, huge = 1.0e30; diff --git a/src/s_tanl.c b/src/s_tanl.c index ab3046a..ea78714 100644 --- a/src/s_tanl.c +++ b/src/s_tanl.c @@ -34,8 +34,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" #if LDBL_MANT_DIG == 64 #include "../ld80/e_rem_pio2l.h" diff --git a/src/s_trunc.c b/src/s_trunc.c index f3d56ae..7f59cf3 100644 --- a/src/s_trunc.c +++ b/src/s_trunc.c @@ -23,8 +23,8 @@ */ #include +#include -#include "openlibm.h" #include "math_private.h" static const double huge = 1.0e300; diff --git a/src/s_truncf.c b/src/s_truncf.c index 470d894..ffbefdf 100644 --- a/src/s_truncf.c +++ b/src/s_truncf.c @@ -22,7 +22,8 @@ * Inexact flag raised if x not equal to truncf(x). */ -#include "openlibm.h" +#include + #include "math_private.h" static const float huge = 1.0e30F; diff --git a/src/w_dremf.c b/src/w_dremf.c index 09a76b4..c469fba 100644 --- a/src/w_dremf.c +++ b/src/w_dremf.c @@ -6,7 +6,8 @@ */ /* $FreeBSD: src/lib/msun/src/w_dremf.c,v 1.3 2004/07/28 05:53:18 kan Exp $ */ -#include "openlibm.h" +#include + #include "math_private.h" DLLEXPORT float From a2afb267cf8230513917310dfe9b6f54e71bfb26 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Fri, 9 Jan 2015 14:29:56 +0100 Subject: [PATCH 9/9] Remove switch from tests to include system headers. We can now simply use -DOPENLIBM_USE_HOST_*_H to do this. --- test/libm-test.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/test/libm-test.c b/test/libm-test.c index 340a330..d98f45f 100644 --- a/test/libm-test.c +++ b/test/libm-test.c @@ -116,16 +116,10 @@ #endif #include "libm-test-ulps.h" -#ifdef SYS_MATH_H /* XXX scp XXX */ -#include -#include #include -#include -#else -#include "openlibm.h" -#include "openlibm_fenv.h" -#include "float.h" -#endif +#include +#include +#include #if 0 /* XXX scp XXX */ #define FE_INEXACT FE_INEXACT