aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2015-08-26 17:10:43 +0000
committerWarner Losh <imp@FreeBSD.org>2015-08-26 17:10:43 +0000
commite0874a7ea6a37340ab9d22215e267d7572266ee7 (patch)
treeebf2ad121fa849e4176a6896a0e44aa69907db7e
parent57031f7912939178ee8425e52f7f15ff69562fd1 (diff)
downloadsrc-e0874a7ea6a37340ab9d22215e267d7572266ee7.tar.gz
src-e0874a7ea6a37340ab9d22215e267d7572266ee7.zip
After consultations with the arm community, don't define softfp for
armv6. It's too ambiguous. We do use the softfp ABI for the moment on armv6, but we allow floating point register use (and the compilers will generate it). This is too ambiguous to use it as a decider for which algorithms to use on the platform. Err on the side of caution and not define it. Submitted by: ian@ Reviewed by: andrew@
Notes
Notes: svn path=/head/; revision=287167
-rw-r--r--share/mk/bsd.cpu.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index f9710436b345..112c2d5490fe 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -282,7 +282,11 @@ MACHINE_CPU += arm
. if ${MACHINE_ARCH:Marmv6*} != ""
MACHINE_CPU += armv6
. endif
-. if ${MACHINE_ARCH:M*hf} == ""
+# armv6 is a hybrid. It uses the softfp ABI, but doesn't emulate
+# floating point in the general case, so don't define softfp for
+# it at this time. arm and armeb are pure softfp, so define it
+# for them.
+. if ${MACHINE_ARCH:Marmv6*} == ""
MACHINE_CPU += softfp
. endif
.if ${MACHINE_ARCH} == "armv6"