svn commit: r272209 - in head/sys/arm: arm include

[Andreas Tobler]

Hi Andrew,

On 27.09.14 11:57, Andrew Turner wrote:
> Author: andrew
> Date: Sat Sep 27 09:57:34 2014
> New Revision: 272209
> URL: http://svnweb.freebsd.org/changeset/base/272209
>
> Log:
>    Add machine/sysreg.h to simplify accessing the system control coprocessor
>    registers and use it in the ARMv7 CPU functions.
>
>    The sysreg.h file has been checked by hand, however it may contain errors
>    with the comments on when a register was first introduced. The ARMv7 cpu
>    functions have been checked by compiling both the previous and this version
>    and comparing the md5 of the object files.
>
>    Submitted by:	Svatopluk Kraus <onwahe at gmail.com>
>    Submitted by:	Michal Meloun <meloun at miracle.cz>
>    Reviewed by:	ian, rpaulo
>    Differential Revision: https://reviews.freebsd.org/D795
>
> Added:
>    head/sys/arm/include/sysreg.h   (contents, props changed)

This one breaks kernel build with gcc-4.2.1.

__ARM_ARCH not defined. On gcc-4.2.1 there is no __ARM_ARCH builtin.
Later gcc do have it.

The include below fixes the build.

Andreas

Index: sys/arm/arm/cpufunc_asm_armv7.S
===================================================================
--- sys/arm/arm/cpufunc_asm_armv7.S	(revision 272282)
+++ sys/arm/arm/cpufunc_asm_armv7.S	(working copy)
@@ -33,6 +33,7 @@
  #include <machine/asm.h>
  __FBSDID("$FreeBSD$");

+#include <machine/acle-compat.h>
  #include <machine/sysreg.h>

  	.cpu cortex-a8