diff options
author | imp <imp@FreeBSD.org> | 2015-12-11 05:39:45 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2015-12-11 05:39:45 +0000 |
commit | 2071b9ab0af45f19d7244b1be2ad9df911442ddc (patch) | |
tree | 09ef0fe8c8e8a8b5d5155b531be2e91634e13df3 | |
parent | 50899ae1223da0a12572256f0c01bb0c6df61047 (diff) | |
download | FreeBSD-src-2071b9ab0af45f19d7244b1be2ad9df911442ddc.zip FreeBSD-src-2071b9ab0af45f19d7244b1be2ad9df911442ddc.tar.gz |
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.
-rw-r--r-- | share/mk/bsd.cpu.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index b9880a3..1ab7595 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -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 -mfpu=vfp # 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 |