From owner-svn-src-head@freebsd.org Sat Jan 16 10:12:51 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBC67A839C3; Sat, 16 Jan 2016 10:12:51 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B8E441CDF; Sat, 16 Jan 2016 10:12:51 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0GACoMg011969; Sat, 16 Jan 2016 10:12:50 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0GACoq1011968; Sat, 16 Jan 2016 10:12:50 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201601161012.u0GACoq1011968@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sat, 16 Jan 2016 10:12:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294138 - head/sys/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.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2016 10:12:52 -0000 Author: andrew Date: Sat Jan 16 10:12:50 2016 New Revision: 294138 URL: https://svnweb.freebsd.org/changeset/base/294138 Log: Use __ARM_ARCH to decide when ARM_TP_ADDRESS needs to be set. This fixes an issue with clang 3.8.0 where none of the __ARM_ARCH_*__ macros were defined on some ARMv6 kernel configs. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/include/sysarch.h Modified: head/sys/arm/include/sysarch.h ============================================================================== --- head/sys/arm/include/sysarch.h Sat Jan 16 10:06:33 2016 (r294137) +++ head/sys/arm/include/sysarch.h Sat Jan 16 10:12:50 2016 (r294138) @@ -37,7 +37,9 @@ #ifndef _ARM_SYSARCH_H_ #define _ARM_SYSARCH_H_ +#include #include + /* * The ARM_TP_ADDRESS points to a special purpose page, which is used as local * store for the ARM per-thread data and Restartable Atomic Sequences support. @@ -53,11 +55,7 @@ /* ARM_TP_ADDRESS is needed for processors that don't support * the exclusive-access opcodes introduced with ARMv6K. */ -/* TODO: #if !defined(_HAVE_ARMv6K_INSTRUCTIONS) */ -#if !defined (__ARM_ARCH_7__) && \ - !defined (__ARM_ARCH_7A__) && \ - !defined (__ARM_ARCH_6K__) && \ - !defined (__ARM_ARCH_6ZK__) +#if __ARM_ARCH <= 5 #define ARM_TP_ADDRESS (ARM_VECTORS_HIGH + 0x1000) #define ARM_RAS_START (ARM_TP_ADDRESS + 4) #define ARM_RAS_END (ARM_TP_ADDRESS + 8)