svn commit: r287167 - head/share/mk

[Warner Losh]

Author: imp
Date: Wed Aug 26 17:10:43 2015
New Revision: 287167
URL: https://svnweb.freebsd.org/changeset/base/287167

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

Modified:
  head/share/mk/bsd.cpu.mk

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Wed Aug 26 16:36:41 2015	(r287166)
+++ head/share/mk/bsd.cpu.mk	Wed Aug 26 17:10:43 2015	(r287167)
@@ -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"