From e0874a7ea6a37340ab9d22215e267d7572266ee7 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 26 Aug 2015 17:10:43 +0000 Subject: [PATCH] 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@ --- share/mk/bsd.cpu.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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"