svn commit: r292085 - head/share/mk

[Warner Losh]

Author: imp
Date: Fri Dec 11 05:39:45 2015
New Revision: 292085
URL: https://svnweb.freebsd.org/changeset/base/292085

Log:
  Handle CPUTYPE=armv[4567]* better. gcc expects those to be either
  -march=foo or -mcpu=generic-foo. Catch the armvX* case and pass
  the right args for it.

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

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Fri Dec 11 05:39:44 2015	(r292084)
+++ head/share/mk/bsd.cpu.mk	Fri Dec 11 05:39:45 2015	(r292085)
@@ -110,7 +110,12 @@ _CPUCFLAGS = -march=armv5te -D__XSCALE__
 _CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6=1
 . elif ${CPUTYPE} == "cortexa"
 _CPUCFLAGS = -march=armv7 -DARM_ARCH_6=1 -mfpu=vfp
-.  else
+. elif ${CPUTYPE:Marmv[4567]*} != ""
+# Handle all the armvX types that FreeBSD runs:
+#	armv4, armv4t, armv5, armv5te, armv6, armv6t2, armv7, armv7-a, armv7ve
+# they require -march=. All the others require -mcpu=.
+_CPUCFLAGS = -march=${CPUTYPE}
+. else
 # Common values for FreeBSD
 # arm:
 #	arm920t, arm926ej-s, marvell-pj4, fa526, fa626,
@@ -120,7 +125,7 @@ _CPUCFLAGS = -march=armv7 -DARM_ARCH_6=1
 #	cortex-a9, cortex-a12, cortex-a15, cortex-a17, cortex-a53, cortex-a57,
 #	cortex-a72, exynos-m1
 _CPUCFLAGS = -mcpu=${CPUTYPE}
-.  endif
+. endif
 . elif ${MACHINE_ARCH} == "powerpc"
 .  if ${CPUTYPE} == "e500"
 _CPUCFLAGS = -Wa,-me500 -msoft-float