mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-31 16:57:10 +00:00
Code Issues Releases 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 Lepore 2014-12-24 03:09:55 +00:00
parent 6783238b2d
commit 0236b3314f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=276166
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