svn commit: r230824 - in projects/armv6: share/mk sys/arm/include

[Grzegorz Bernacki]

Author: gber
Date: Tue Jan 31 15:51:34 2012
New Revision: 230824
URL: http://svn.freebsd.org/changeset/base/230824

Log:
  Correct building world with/without CPUTYPE=armv6
  
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/share/mk/bsd.cpu.mk
  projects/armv6/sys/arm/include/atomic.h
  projects/armv6/sys/arm/include/cpuconf.h

Modified: projects/armv6/share/mk/bsd.cpu.mk
==============================================================================
--- projects/armv6/share/mk/bsd.cpu.mk	Tue Jan 31 15:50:18 2012	(r230823)
+++ projects/armv6/share/mk/bsd.cpu.mk	Tue Jan 31 15:51:34 2012	(r230824)
@@ -99,7 +99,7 @@ _CPUCFLAGS = -march=${CPUTYPE}
 #_CPUCFLAGS = -mcpu=xscale
 _CPUCFLAGS = -march=armv5te -D__XSCALE__
 . elif ${CPUTYPE} == "armv6"
-_CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6
+_CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6=1
 .  else
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 .  endif

Modified: projects/armv6/sys/arm/include/atomic.h
==============================================================================
--- projects/armv6/sys/arm/include/atomic.h	Tue Jan 31 15:50:18 2012	(r230823)
+++ projects/armv6/sys/arm/include/atomic.h	Tue Jan 31 15:51:34 2012	(r230824)
@@ -61,7 +61,7 @@
 #endif
 
 /* XXX: Rethink for userland later as those won't be defined */
-#if defined(ARM_ARCH_6) || defined(ARM_ARCH_7) 
+#if ARM_ARCH_6 || ARM_ARCH_7A
 
 static __inline void
 atomic_set_32(volatile uint32_t *address, uint32_t setmask)

Modified: projects/armv6/sys/arm/include/cpuconf.h
==============================================================================
--- projects/armv6/sys/arm/include/cpuconf.h	Tue Jan 31 15:50:18 2012	(r230823)
+++ projects/armv6/sys/arm/include/cpuconf.h	Tue Jan 31 15:51:34 2012	(r230824)
@@ -88,11 +88,13 @@
 #define	ARM_ARCH_5	0
 #endif
 
+#if !defined(ARM_ARCH_6)
 #if defined(CPU_ARM11) || defined(CPU_MV_PJ4B)
 #define ARM_ARCH_6	1
 #else
 #define ARM_ARCH_6	0
 #endif
+#endif
 
 #if defined(CPU_CORTEXA)
 #define ARM_ARCH_7A	1