d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up detection of hard-float ABIs. As with big-endian in r272368 we

Browse Source 
can check against arm*hf*.
This commit is contained in:
Andrew Turner 2014-10-01 16:08:19 +00:00
parent 66c5f84baf
commit eabf853d8d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/arm/Makefile.inc
View File

@ -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

2
lib/libc/arm/aeabi/Makefile.inc
View File

@ -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

4
lib/libcompiler_rt/Makefile
View File

@ -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