svn commit: r276212 - head/sys/arm/include

Ian Lepore ian at freebsd.org
Fri Dec 26 14:26:58 UTC 2014


On Fri, 2014-12-26 at 11:46 +0000, Andrew Turner wrote:
> On Thu, 25 Dec 2014 19:08:40 +0000 (UTC)
> Ian Lepore <ian at FreeBSD.org> 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 <sys/cdefs.h>
> > +#include <machine/sysreg.h>
> >  
> >  #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
> <machine/acle-compat.h> 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



More information about the svn-src-all mailing list