From owner-svn-src-head@FreeBSD.ORG  Sat Mar  9 23:55:24 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6D639E4E;
 Sat,  9 Mar 2013 23:55:24 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5EC4213F;
 Sat,  9 Mar 2013 23:55:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r29NtOuR061571;
 Sat, 9 Mar 2013 23:55:24 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r29NtORC061569;
 Sat, 9 Mar 2013 23:55:24 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201303092355.r29NtORC061569@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 9 Mar 2013 23:55:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248119 - in head/sys/arm: arm include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Mar 2013 23:55:24 -0000

Author: andrew
Date: Sat Mar  9 23:55:23 2013
New Revision: 248119
URL: http://svnweb.freebsd.org/changeset/base/248119

Log:
  __FreeBSD_ARCH_armv6__ is undefined on clang. We can use __ARM_ARCH in
  it's place. This makes 'uname -p' correctly output 'armv6' on a kernel
  built with clang.

Modified:
  head/sys/arm/arm/disassem.c
  head/sys/arm/include/param.h

Modified: head/sys/arm/arm/disassem.c
==============================================================================
--- head/sys/arm/arm/disassem.c	Sat Mar  9 23:05:19 2013	(r248118)
+++ head/sys/arm/arm/disassem.c	Sat Mar  9 23:55:23 2013	(r248119)
@@ -130,7 +130,7 @@ static const struct arm32_insn arm32_i[]
     { 0x0c500000, 0x04100000, "ldr",	"daW" },
     { 0x0c500000, 0x04400000, "strb",	"daW" },
     { 0x0c500000, 0x04500000, "ldrb",	"daW" },
-#ifdef	__FreeBSD_ARCH_armv6__
+#if defined(__FreeBSD_ARCH_armv6__)  || (defined(__ARM_ARCH) && __ARM_ARCH >= 6)
     { 0xffffffff, 0xf57ff01f, "clrex",	"c" },
     { 0x0ff00ff0, 0x01800f90, "strex",	"dmo" },
     { 0x0ff00fff, 0x01900f9f, "ldrex",	"do" },

Modified: head/sys/arm/include/param.h
==============================================================================
--- head/sys/arm/include/param.h	Sat Mar  9 23:05:19 2013	(r248118)
+++ head/sys/arm/include/param.h	Sat Mar  9 23:55:23 2013	(r248119)
@@ -56,7 +56,7 @@
 #define	MACHINE		"arm"
 #endif
 #ifndef MACHINE_ARCH
-#ifdef __FreeBSD_ARCH_armv6__
+#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6)
 #ifdef __ARMEB__
 #define	MACHINE_ARCH	"armv6eb"
 #else