Attachment 229051 Details for Bug 218514 – More build fixes: Makefile (by kargl) and msun/ld128/s_tanpil.c

[patch] More build fixes: Makefile (by kargl) and msun/ld128/s_tanpil.c

1.patch (text/plain), 2.55 KB, created by Konstantin Belousov on 2021-10-26 21:29:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Belousov

Created: 2021-10-26 21:29:54 UTC

Size: 2.55 KB

patch

obsolete

>diff --git a/lib/msun/Makefile b/lib/msun/Makefile
>index dcee5572f949..1d94e371e61f 100644
>--- a/lib/msun/Makefile
>+++ b/lib/msun/Makefile
>@@ -89,6 +89,11 @@ COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \
> 	s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_tgammaf.c s_trunc.c s_truncf.c \
> 	w_cabs.c w_cabsf.c w_drem.c w_dremf.c
> 
>+# IEEE-754 2008 and ISO/IEC TS 18661-4 half-cycle trignometric functions
>+COMMON_SRCS+= s_cospi.c s_cospif.c \
>+	s_sinpi.c s_sinpif.c \
>+	s_tanpi.c s_tanpif.c
>+
> # Location of fpmath.h and _fpmath.h
> .if exists(${LIBCSRCDIR}/${MACHINE_ARCH})
> LIBC_ARCH=${MACHINE_ARCH}
>@@ -113,12 +118,12 @@ COMMON_SRCS+=	catrigl.c \
> 	e_remainderl.c e_sinhl.c e_sqrtl.c \
> 	invtrig.c k_cosl.c k_sinl.c k_tanl.c \
> 	s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c \
>-	s_clogl.c s_cosl.c s_cprojl.c \
>+	s_clogl.c s_cosl.c s_cospil.c s_cprojl.c \
> 	s_csqrtl.c s_erfl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \
> 	s_fmaxl.c s_fminl.c s_frexpl.c s_logbl.c s_logl.c s_nanl.c \
> 	s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \
>-	s_scalbnl.c s_sinl.c s_sincosl.c \
>-	s_tanhl.c s_tanl.c s_truncl.c w_cabsl.c
>+	s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c \
>+	s_tanhl.c s_tanl.c s_tanpil.c s_truncl.c w_cabsl.c
> # Work around this warning from gcc:
> #     lib/msun/ld80/e_powl.c:275:1: error: floating constant exceeds range of
> #     'long double' [-Werror=overflow]
>@@ -126,12 +131,6 @@ COMMON_SRCS+=	catrigl.c \
> # See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=130067
> .if ${COMPILER_TYPE} == "gcc"
> CFLAGS.e_powl.c+= -Wno-error=overflow
>-
>-# IEEE-754 2008 and ISO/IEC TS 18661-4 half-cycle trignometric functions
>-COMMON_SRCS+=	s_cospi.c s_cospif.c s_cospil.c \
>-	s_sinpi.c s_sinpif.c s_sinpil.c \
>-	s_tanpi.c s_tanpif.c s_tanpil.c
>-
> .endif
> .endif
> 
>diff --git a/lib/msun/ld128/s_tanpil.c b/lib/msun/ld128/s_tanpil.c
>index 33a61cf3115d..7cbbdc8a5d05 100644
>--- a/lib/msun/ld128/s_tanpil.c
>+++ b/lib/msun/ld128/s_tanpil.c
>@@ -42,7 +42,7 @@ pi_hi = 3.14159265358979322702026593105983920e+00L,
> pi_lo = 1.14423774522196636802434264184180742e-17L;
> 
> static inline long double
>-__kernel_tanpi(long double x)
>+__kernel_tanpil(long double x)
> {
> 	long double hi, lo, t;
> 
>@@ -72,7 +72,7 @@ volatile static const double vzero = 0;
> long double
> tanpil(long double x)
> {
>-	long double ax, hi, lo, xf;
>+	long double ax, hi, lo, xf, t;
> 	uint32_t ix;
> 
> 	ax = fabsl(ax);
>@@ -83,7 +83,7 @@ tanpil(long double x)
> 				if (x == 0)
> 					return (x);
> 				hi = (double)x;
>-				hi *= 0x1p113L
>+				hi *= 0x1p113L;
> 				lo = x * 0x1p113L - hi;
> 				t = (pi_lo + pi_hi) * lo + pi_lo * lo +
> 				    pi_hi * hi;

Actions: View | Diff

Attachments on bug 218514: 181622 | 182139 | 182648 | 229008 | 229010 | 229037 | 229047 | 229051 | 229108 | 229180 | 229215