Oversight on armv7 bulk commit: Make MACHINE_ARCH be armv7 for new

enough processors. This isn't ideal, because one could still compile
MACHINE_ARCH armv6, but with armv7 options enabled. We don't normally
do that, and it's a bit of an edge case so accept the less than ideal
solution here in the absence of something better.

Reported by: strejda@
Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-10-06 13:43:16 +00:00
parent 1e515e9434
commit 31329820e5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=324363

View File

@ -52,10 +52,12 @@
#define __PCI_REROUTE_INTERRUPT
#if __ARM_ARCH >= 6
#define _V6_SUFFIX "v6"
#if __ARM_ARCH >= 7
#define _V_SUFFIX "v7"
#elif __ARM_ARCH >= 6
#define _V_SUFFIX "v6"
#else
#define _V6_SUFFIX ""
#define _V_SUFFIX ""
#endif
#ifdef __ARM_BIG_ENDIAN
@ -68,7 +70,7 @@
#define MACHINE "arm"
#endif
#ifndef MACHINE_ARCH
#define MACHINE_ARCH "arm" _V6_SUFFIX _EB_SUFFIX
#define MACHINE_ARCH "arm" _V_SUFFIX _EB_SUFFIX
#endif
#if defined(SMP) || defined(KLD_MODULE)