Author: andrew
Date: Wed Oct 1 16:08:19 2014
New Revision: 272369
URL: https://svnweb.freebsd.org/changeset/base/272369
Log:
Clean up detection of hard-float ABIs. As with big-endian in r272368 we
can check against arm*hf*.
Modified:
head/lib/libc/arm/Makefile.inc
head/lib/libc/arm/aeabi/Makefile.inc
head/lib/libcompiler_rt/Makefile
Modified: head/lib/libc/arm/Makefile.inc
==============================================================================
--- head/lib/libc/arm/Makefile.inc Wed Oct 1 16:00:21 2014
(r272368)
+++ head/lib/libc/arm/Makefile.inc Wed Oct 1 16:08:19 2014
(r272369)
@@ -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
Modified: head/lib/libc/arm/aeabi/Makefile.inc
==============================================================================
--- head/lib/libc/arm/aeabi/Makefile.inc Wed Oct 1 16:00:21 2014
(r272368)
+++ head/lib/libc/arm/aeabi/Makefile.inc Wed Oct 1 16:08:19 2014
(r272369)
@@ -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
Modified: head/lib/libcompiler_rt/Makefile
==============================================================================
--- head/lib/libcompiler_rt/Makefile Wed Oct 1 16:00:21 2014
(r272368)
+++ head/lib/libcompiler_rt/Makefile Wed Oct 1 16:08:19 2014
(r272369)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
