git: ca3d8cb087cd - main - lib/msun: Move the files to appropriate locations in the Makefile

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=ca3d8cb087cd5b40369478b1693f3e4038b5fa23

commit ca3d8cb087cd5b40369478b1693f3e4038b5fa23
Author:     Steve Kargl <kargl@FreeBSD.org>
AuthorDate: 2021-10-26 20:53:51 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-10-26 22:34:12 +0000

    lib/msun: Move the files to appropriate locations in the Makefile
    
    Fixes:  dce5f3abed7181cc533ca5ed
    PR:     218514
    MFC after:      1 week
---
 lib/msun/Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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