From owner-svn-src-projects@FreeBSD.ORG  Wed Nov  2 21:15:12 2011
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 AC539106566B;
	Wed,  2 Nov 2011 21:15:12 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C3DF8FC15;
	Wed,  2 Nov 2011 21:15:12 +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 pA2LFCf4038759;
	Wed, 2 Nov 2011 21:15:12 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA2LFC7W038757;
	Wed, 2 Nov 2011 21:15:12 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201111022115.pA2LFC7W038757@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Wed, 2 Nov 2011 21:15:12 +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: r227038 - projects/armv6/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 &quot; projects&quot;
	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: Wed, 02 Nov 2011 21:15:12 -0000

Author: cognet
Date: Wed Nov  2 21:15:12 2011
New Revision: 227038
URL: http://svn.freebsd.org/changeset/base/227038

Log:
  Define _ARM_ARCH_6 if _ARM_ARCH_7 is defined, too.

Modified:
  projects/armv6/sys/arm/include/asm.h

Modified: projects/armv6/sys/arm/include/asm.h
==============================================================================
--- projects/armv6/sys/arm/include/asm.h	Wed Nov  2 21:13:34 2011	(r227037)
+++ projects/armv6/sys/arm/include/asm.h	Wed Nov  2 21:15:12 2011	(r227038)
@@ -134,7 +134,8 @@
 #define _ARM_ARCH_7
 #endif
 
-#if defined (__ARM_ARCH_6__) || defined (__ARM_ARCH_6J__)
+#if defined(_ARM_ARCH_7) || defined (__ARM_ARCH_6__) || \
+    defined (__ARM_ARCH_6J__)
 #define _ARM_ARCH_6
 #endif