libc/compiler_rt: Consistently use LIBC_MACHINE_{ARCH,CPU}

Instead of MACHINE_{ARCH,CPU}, respectively.

With this change, unnecessary comparetf2.c is no longer
compiled in for 32-bit compat libc on aarch64.
This commit is contained in:
rin 2023-11-09 07:29:26 +00:00
parent d77dad0e9e
commit 79de40626c
1 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.41 2022/10/05 10:28:19 nia Exp $
# $NetBSD: Makefile.inc,v 1.42 2023/11/09 07:29:26 rin Exp $
COMPILER_RT_DIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt
COMPILER_RT_SRCDIR= ${COMPILER_RT_DIR}/dist
@ -76,7 +76,7 @@ GENERIC_SRCS+= \
umodti3.c
# only used for machines using IEEE 754 floating point formats
.if ${MACHINE_ARCH} != "vax"
.if ${LIBC_MACHINE_ARCH} != "vax"
.if 0
# Conflicts with soft-float
@ -127,13 +127,13 @@ GENERIC_SRCS+= \
.endif # IEEE 754 only machines
.if ${MACHINE_ARCH} != "m68k"
.if ${LIBC_MACHINE_ARCH} != "m68k"
GENERIC_SRCS+= \
fixxfdi.c
.endif
.if ${MACHINE_CPU} == "aarch64"
.if ${LIBC_MACHINE_CPU} == "aarch64"
GENERIC_SRCS+= \
comparetf2.c
.endif