From a40f7273f17a12f3962427936dad4d54bbc9d925 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 11 May 2015 08:51:24 +0000
Subject: [PATCH] Use the ACLE spelling of _ARM_ARCH_6: "__ARM_ARCH >= 6"

---
 sys/arm/arm/swtch.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/arm/arm/swtch.S b/sys/arm/arm/swtch.S
index 0a0e97ea5c16..77d1c55e4b2c 100644
--- a/sys/arm/arm/swtch.S
+++ b/sys/arm/arm/swtch.S
@@ -81,6 +81,7 @@
 #include "assym.s"
 #include "opt_sched.h"
 
+#include <machine/acle-compat.h>
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
@@ -88,7 +89,7 @@
 
 __FBSDID("$FreeBSD$");
 
-#if defined(_ARM_ARCH_6) && defined(SMP)
+#if __ARM_ARCH >= 6 && defined(SMP)
 #define GET_PCPU(tmp, tmp2) \
 	mrc 	p15, 0, tmp, c0, c0, 5;	\
 	and	tmp, tmp, #0xf;		\