svn commit: r276284 - stable/10/sys/arm/include

[Ian Lepore]

Author: ian
Date: Sat Dec 27 04:33:35 2014
New Revision: 276284
URL: https://svnweb.freebsd.org/changeset/base/276284

Log:
  MFC r274941: The arm PJ4B cpu is armv7 architecture, not v6.

Modified:
  stable/10/sys/arm/include/cpuconf.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/include/cpuconf.h
==============================================================================
--- stable/10/sys/arm/include/cpuconf.h	Sat Dec 27 04:30:42 2014	(r276283)
+++ stable/10/sys/arm/include/cpuconf.h	Sat Dec 27 04:33:35 2014	(r276284)
@@ -85,14 +85,14 @@
 #endif
 
 #if !defined(ARM_ARCH_6)
-#if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_MV_PJ4B)
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
 #define ARM_ARCH_6	1
 #else
 #define ARM_ARCH_6	0
 #endif
 #endif
 
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
 #define ARM_ARCH_7A	1
 #else
 #define ARM_ARCH_7A	0