aboutsummaryrefslogtreecommitdiff
path: root/lib/libc/arm
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2023-02-14 16:48:51 +0000
committerWarner Losh <imp@FreeBSD.org>2023-02-14 16:53:08 +0000
commitae902a5be9b814332269a70350f4e27cb4eb1d94 (patch)
tree4af50c1aa5f8723f1941a726fe9888a6032c830c /lib/libc/arm
parent5c33688475a5bb97d644079d5320068991c26b76 (diff)
downloadsrc-ae902a5be9b814332269a70350f4e27cb4eb1d94.tar.gz
src-ae902a5be9b814332269a70350f4e27cb4eb1d94.zip
libc: Simplify soft-float on 32-bit arm
Simplify the tests for 32-bit arm soft float support. For the files included only on arm, drop the test entirely. For others, test MACHINE_CPUARCH against arm. No functional change intended. File lists appear the same before / after the change. Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38582
Diffstat (limited to 'lib/libc/arm')
-rw-r--r--lib/libc/arm/Makefile.inc2
-rw-r--r--lib/libc/arm/aeabi/Makefile.inc5
-rw-r--r--lib/libc/arm/gen/Makefile.inc2
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/libc/arm/Makefile.inc b/lib/libc/arm/Makefile.inc
index c4b3458ba2cd..c844c32778b8 100644
--- a/lib/libc/arm/Makefile.inc
+++ b/lib/libc/arm/Makefile.inc
@@ -11,7 +11,7 @@ SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map
.include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc"
-.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
+.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == ""
SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol_vfp.map
.endif
diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc
index 9ccabc2186f9..dfb640564bdf 100644
--- a/lib/libc/arm/aeabi/Makefile.inc
+++ b/lib/libc/arm/aeabi/Makefile.inc
@@ -5,14 +5,13 @@
SRCS+= aeabi_atexit.c \
aeabi_unwind_cpp.c \
aeabi_unwind_exidx.c
-.if (${MACHINE_ARCH:Marmv[67]*} && defined(CPUTYPE) && ${CPUTYPE:M*soft*} != "") || \
- ${MACHINE_ARCH:Marmv[67]*} == ""
+.if defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
SRCS+= aeabi_asm_double.S \
aeabi_asm_float.S \
aeabi_double.c \
aeabi_float.c
.endif
-.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
+.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == ""
SRCS+= aeabi_vfp_double.S \
aeabi_vfp_float.S
.endif
diff --git a/lib/libc/arm/gen/Makefile.inc b/lib/libc/arm/gen/Makefile.inc
index 77c995f70cbc..4a35a0eb7efd 100644
--- a/lib/libc/arm/gen/Makefile.inc
+++ b/lib/libc/arm/gen/Makefile.inc
@@ -23,7 +23,7 @@ MAN+= \
arm_drain_writebuf.2 \
arm_sync_icache.2 \
-.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
+.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == ""
SRCS+= \
fpgetmask_vfp.c \