Thu May 9 19:54:38 2024 UTC (10d)
libm: No divtc3.c or multc3.c in sparc64's compat sparc library.

compat/sparc64/sparc/bsd.sparc.mk doesn't define LIBC_MACHINE_CPU,
only LIBC_MACHINE_ARCH, so when the compat build gets to this
conditional, LIBC_MACHINE_CPU is just MACHINE_CPU, i.e., sparc64.

Since there's no `sparc64el' or `sparc64hf-el' that we need to
canonicalize by MACHINE_ARCH -> MACHINE_CPU, just use
LIBC_MACHINE_ARCH here.


(riastradh)
diff -r1.11 -r1.12 src/lib/libm/compiler_rt/Makefile.inc
cvs diff -r1.11 -r1.12 src/lib/libm/compiler_rt/Makefile.inc (expand / switch to unified diff)

--- src/lib/libm/compiler_rt/Makefile.inc 2021/06/16 05:21:08 1.11
+++ src/lib/libm/compiler_rt/Makefile.inc 2024/05/09 19:54:38 1.12
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile.inc,v 1.11 2021/06/16 05:21:08 rin Exp $ 1# $NetBSD: Makefile.inc,v 1.12 2024/05/09 19:54:38 riastradh Exp $
2 2
3COMPILER_RT_DIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt 3COMPILER_RT_DIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt
4COMPILER_RT_SRCDIR= ${COMPILER_RT_DIR}/dist 4COMPILER_RT_SRCDIR= ${COMPILER_RT_DIR}/dist
5 5
6.if ${MACHINE_CPU} == "powerpc" 6.if ${MACHINE_CPU} == "powerpc"
7COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc 7COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
8COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc 8COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
9.else 9.else
10COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU} 10COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
11COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH} 11COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
12.endif 12.endif
13 13
14.PATH: ${COMPILER_RT_CPU_DIR} 14.PATH: ${COMPILER_RT_CPU_DIR}
15.PATH: ${COMPILER_RT_ARCH_DIR} 15.PATH: ${COMPILER_RT_ARCH_DIR}
16.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins 16.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
17 17
18# Needs scaling support 18# Needs scaling support
19GENERIC_SRCS+= \ 19GENERIC_SRCS+= \
20 muldc3.c \ 20 muldc3.c \
21 mulsc3.c \ 21 mulsc3.c \
22 mulxc3.c \ 22 mulxc3.c \
23 divdc3.c \ 23 divdc3.c \
24 divsc3.c \ 24 divsc3.c \
25 divxc3.c 25 divxc3.c
26 26
27.if ${MACHINE_CPU} == "powerpc" || ${LIBC_MACHINE_CPU:U} == "sparc64" || ${LIBC_MACHINE_CPU:U} == "aarch64" 27.if ${MACHINE_CPU} == "powerpc" || ${LIBC_MACHINE_ARCH:U} == "sparc64" || ${LIBC_MACHINE_CPU:U} == "aarch64"
28GENERIC_SRCS+= \ 28GENERIC_SRCS+= \
29 divtc3.c \ 29 divtc3.c \
30 multc3.c 30 multc3.c
31.endif 31.endif
32 32
33.for src in ${GENERIC_SRCS} 33.for src in ${GENERIC_SRCS}
34. if exists(${COMPILER_RT_CPU_DIR}/${src:R}.S) || \ 34. if exists(${COMPILER_RT_CPU_DIR}/${src:R}.S) || \
35 exists(${COMPILER_RT_ARCH_DIR}/${src:R}.S) 35 exists(${COMPILER_RT_ARCH_DIR}/${src:R}.S)
36SRCS+= ${src:R}.S 36SRCS+= ${src:R}.S
37. else 37. else
38SRCS+= ${src} 38SRCS+= ${src}
39COPTS.${src}+= -Wno-error=missing-prototypes 39COPTS.${src}+= -Wno-error=missing-prototypes
40. endif 40. endif