From owner-svn-src-all@FreeBSD.ORG Fri Dec 26 14:26:58 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B4BD778; Fri, 26 Dec 2014 14:26:58 +0000 (UTC) Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FA602449; Fri, 26 Dec 2014 14:26:57 +0000 (UTC) Received: from [73.34.117.227] (helo=ilsoft.org) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Y4Vqt-000CSz-GY; Fri, 26 Dec 2014 14:26:51 +0000 Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id sBQEQnxl039286; Fri, 26 Dec 2014 07:26:49 -0700 (MST) (envelope-from ian@freebsd.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 73.34.117.227 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+QBPDbuiEowHfPEG0xSfg6 Message-ID: <1419604009.1018.185.camel@freebsd.org> Subject: Re: svn commit: r276212 - head/sys/arm/include From: Ian Lepore To: Andrew Turner Date: Fri, 26 Dec 2014 07:26:49 -0700 In-Reply-To: <20141226114659.37e384b3@bender> References: <201412251908.sBPJ8ej0079939@svn.freebsd.org> <20141226114659.37e384b3@bender> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.8 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Dec 2014 14:26:58 -0000 On Fri, 2014-12-26 at 11:46 +0000, Andrew Turner wrote: > On Thu, 25 Dec 2014 19:08:40 +0000 (UTC) > Ian Lepore wrote: > > > Author: ian > > Date: Thu Dec 25 19:08:39 2014 > > New Revision: 276212 > > URL: https://svnweb.freebsd.org/changeset/base/276212 > > > > Log: > > Add macros for asm barrier instructions with arch-specific > > implementations. > > > > Modified: > > head/sys/arm/include/asm.h > > > > Modified: head/sys/arm/include/asm.h > > ============================================================================== > > --- head/sys/arm/include/asm.h Thu Dec 25 18:22:22 2014 > > (r276211) +++ head/sys/arm/include/asm.h Thu Dec 25 19:08:39 > > 2014 (r276212) @@ -39,6 +39,7 @@ > > #ifndef _MACHINE_ASM_H_ > > #define _MACHINE_ASM_H_ > > #include > > +#include > > > > #define _C_LABEL(x) x > > #define _ASM_LABEL(x) x > > @@ -221,4 +222,18 @@ > > # define RETc(c) mov##c pc, lr > > #endif > > > > +#if __ARM_ARCH >= 7 > > Either this file or all other files that include it should include > to pick up __ARM_ARCH when building with gcc. > > Andrew > It was already picking up acle-compat.h via sysreg.h (it passed a gcc arm-universe build). But in general I think that anything, header or source file, that refers to the acle symbols should directly include acle-compat.h for itself (because the contents of that file are essentially an extension of the compiler's builtin predefines). We're overdue for a big cleanup of arm "what arch am I?" symbols, but with intrng and new-pmap in the works, doing it right now will just create lots of merge conflicts. -- Ian