From owner-svn-src-projects@FreeBSD.ORG Tue Jan 31 15:51:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 87C771065687;
Tue, 31 Jan 2012 15:51:34 +0000 (UTC)
(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 76B098FC0A;
Tue, 31 Jan 2012 15:51:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0VFpYMo043179;
Tue, 31 Jan 2012 15:51:34 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0VFpYOY043175;
Tue, 31 Jan 2012 15:51:34 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201311551.q0VFpYOY043175@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Tue, 31 Jan 2012 15:51:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r230824 - in projects/armv6: share/mk sys/arm/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jan 2012 15:51:34 -0000
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