From owner-svn-src-all@FreeBSD.ORG  Sun Mar 10 10:13:06 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 4D4AAB96;
 Sun, 10 Mar 2013 10:13:06 +0000 (UTC)
 (envelope-from rdivacky@vlakno.cz)
Received: from vlakno.cz (mail.vlakno.cz [178.238.39.38])
 by mx1.freebsd.org (Postfix) with ESMTP id 10A246B5;
 Sun, 10 Mar 2013 10:13:05 +0000 (UTC)
Received: by vlakno.cz (Postfix, from userid 1002)
 id 737E21CC55A0; Sun, 10 Mar 2013 11:12:58 +0100 (CET)
Date: Sun, 10 Mar 2013 11:12:58 +0100
From: Roman Divacky <rdivacky@freebsd.org>
To: Andrew Turner <andrew@FreeBSD.org>
Subject: Re: svn commit: r248119 - in head/sys/arm: arm include
Message-ID: <20130310101258.GA50734@freebsd.org>
References: <201303092355.r29NtORC061569@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201303092355.r29NtORC061569@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Mar 2013 10:13:06 -0000

Should clang define __FreeBSD_ARCH_armv6__ ? Any other define thats missing
and should be defined?

Roman

On Sat, Mar 09, 2013 at 11:55:24PM +0000, Andrew Turner wrote:
> 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