d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert a glitched mismerge that got caught up in the prior commit.

Browse Source 
The PJ4B family is still armv7, not armv6.
This commit is contained in:
ian 2014-12-24 03:09:55 +00:00
parent d8272d0a83
commit 0a95065599
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm/include/cpuconf.h
View File

@ -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