Clean up detection of hard-float ABIs. As with big-endian in r272368 we
can check against arm*hf*.
This commit is contained in:
parent
66c5f84baf
commit
eabf853d8d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=272369
@ -11,7 +11,7 @@ SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map
|
||||
|
||||
.include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc"
|
||||
|
||||
.if ${MACHINE_ARCH} == "armv6hf"
|
||||
.if ${MACHINE_ARCH:Marm*hf*} != ""
|
||||
SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol_vfp.map
|
||||
.endif
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
SRCS+= aeabi_atexit.c \
|
||||
aeabi_unwind_cpp.c \
|
||||
aeabi_unwind_exidx.c
|
||||
.if ${MACHINE_ARCH} != "armv6hf"
|
||||
.if ${MACHINE_ARCH:Marm*hf*} == ""
|
||||
SRCS+= aeabi_double.c \
|
||||
aeabi_float.c
|
||||
.endif
|
||||
|
@ -164,9 +164,9 @@ SRCF+= stdatomic
|
||||
.endif
|
||||
|
||||
.for file in ${SRCF}
|
||||
. if ${MACHINE_ARCH} == "armv6hf" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
|
||||
. if ${MACHINE_ARCH:Marm*hf*} != "" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S)
|
||||
SRCS+= ${file}vfp.S
|
||||
. elif (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH} == "armv6hf") && exists(${CRTSRC}/${CRTARCH}/${file}.S)
|
||||
. elif !(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH:Marm*hf*} == "") && exists(${CRTSRC}/${CRTARCH}/${file}.S)
|
||||
SRCS+= ${file}.S
|
||||
. else
|
||||
SRCS+= ${file}.c
|
||||
|
Loading…
Reference in New Issue
Block a user