mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 21:05:08 +00:00
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
This commit is contained in:
parent
5c33688475
commit
ae902a5be9
|
@ -124,8 +124,7 @@ NOASM=
|
||||||
.include "${LIBC_SRCTOP}/rpc/Makefile.inc"
|
.include "${LIBC_SRCTOP}/rpc/Makefile.inc"
|
||||||
.include "${LIBC_SRCTOP}/uuid/Makefile.inc"
|
.include "${LIBC_SRCTOP}/uuid/Makefile.inc"
|
||||||
.include "${LIBC_SRCTOP}/xdr/Makefile.inc"
|
.include "${LIBC_SRCTOP}/xdr/Makefile.inc"
|
||||||
.if (${LIBC_ARCH} == "arm" && \
|
.if (${LIBC_ARCH} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*})) || \
|
||||||
(${MACHINE_ARCH:Marmv[67]*} == "" || (defined(CPUTYPE) && ${CPUTYPE:M*soft*}))) || \
|
|
||||||
(${LIBC_ARCH} == "riscv" && ${MACHINE_ARCH:Mriscv*sf} != "")
|
(${LIBC_ARCH} == "riscv" && ${MACHINE_ARCH:Mriscv*sf} != "")
|
||||||
.include "${LIBC_SRCTOP}/softfloat/Makefile.inc"
|
.include "${LIBC_SRCTOP}/softfloat/Makefile.inc"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
@ -11,7 +11,7 @@ SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map
|
||||||
|
|
||||||
.include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc"
|
.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
|
SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol_vfp.map
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
|
@ -5,14 +5,13 @@
|
||||||
SRCS+= aeabi_atexit.c \
|
SRCS+= aeabi_atexit.c \
|
||||||
aeabi_unwind_cpp.c \
|
aeabi_unwind_cpp.c \
|
||||||
aeabi_unwind_exidx.c
|
aeabi_unwind_exidx.c
|
||||||
.if (${MACHINE_ARCH:Marmv[67]*} && defined(CPUTYPE) && ${CPUTYPE:M*soft*} != "") || \
|
.if defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
|
||||||
${MACHINE_ARCH:Marmv[67]*} == ""
|
|
||||||
SRCS+= aeabi_asm_double.S \
|
SRCS+= aeabi_asm_double.S \
|
||||||
aeabi_asm_float.S \
|
aeabi_asm_float.S \
|
||||||
aeabi_double.c \
|
aeabi_double.c \
|
||||||
aeabi_float.c
|
aeabi_float.c
|
||||||
.endif
|
.endif
|
||||||
.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
|
.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == ""
|
||||||
SRCS+= aeabi_vfp_double.S \
|
SRCS+= aeabi_vfp_double.S \
|
||||||
aeabi_vfp_float.S
|
aeabi_vfp_float.S
|
||||||
.endif
|
.endif
|
||||||
|
|
|
@ -23,7 +23,7 @@ MAN+= \
|
||||||
arm_drain_writebuf.2 \
|
arm_drain_writebuf.2 \
|
||||||
arm_sync_icache.2 \
|
arm_sync_icache.2 \
|
||||||
|
|
||||||
.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
|
.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == ""
|
||||||
|
|
||||||
SRCS+= \
|
SRCS+= \
|
||||||
fpgetmask_vfp.c \
|
fpgetmask_vfp.c \
|
||||||
|
|
|
@ -128,7 +128,7 @@ SYM_MAPS+= ${LIBC_SRCTOP}/sys/Symbol.map
|
||||||
CLEANFILES+= ${SASM} ${SPSEUDO}
|
CLEANFILES+= ${SASM} ${SPSEUDO}
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
|
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
|
||||||
${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH:Marmv[67]*}
|
${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
|
||||||
NOTE_GNU_STACK='\t.section .note.GNU-stack,"",%%progbits\n'
|
NOTE_GNU_STACK='\t.section .note.GNU-stack,"",%%progbits\n'
|
||||||
.else
|
.else
|
||||||
NOTE_GNU_STACK=''
|
NOTE_GNU_STACK=''
|
||||||
|
|
|
@ -226,7 +226,7 @@ SRCF+= stdatomic
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.for file in ${SRCF}
|
.for file in ${SRCF}
|
||||||
.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") \
|
.if ${MACHINE_CPUARCH} == "arm" && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") \
|
||||||
&& exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
|
&& exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
|
||||||
SRCS+= ${file}vfp.S
|
SRCS+= ${file}vfp.S
|
||||||
. elif exists(${CRTSRC}/${CRTARCH}/${file}.S)
|
. elif exists(${CRTSRC}/${CRTARCH}/${file}.S)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
LDBL_PREC = 53
|
LDBL_PREC = 53
|
||||||
SYM_MAPS += ${.CURDIR}/arm/Symbol.map
|
SYM_MAPS += ${.CURDIR}/arm/Symbol.map
|
||||||
|
|
||||||
.if ${MACHINE_ARCH:Marmv[67]*} && defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
|
.if defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
|
||||||
ARCH_SRCS = fenv-softfp.c fenv-vfp.c
|
ARCH_SRCS = fenv-softfp.c fenv-vfp.c
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue