d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include machine/acle-compat.h in cdefs.h on arm if the compiler doesn't

Browse Source 
have ACLE support built in.  The ACLE (ARM C Language Extensions) defines
a set of standardized symbols which indicate the architecture version and
features available.  ACLE support is built in to modern compilers (both
clang and gcc), but absent from gcc prior to 4.4.

ARM (the company) provides the acle-compat.h header file to define the
right symbols for older versions of gcc.  Basically, acle-compat.h does
for arm about the same thing cdefs.h does for freebsd: defines
standardized macros that work no matter which compiler you use.  If ARM
hadn't provided this file we would have ended up with a big #ifdef __arm__
section in cdefs.h with our own compatibility shims.

Remove #include <machine/acle-compat.h> from the zillion other places (an
ever-growing list) that it appears.  Since style(9) requires sys/types.h
or sys/param.h early in the include list, and both of those lead to
including cdefs.h, only a couple special cases still need to include
acle-compat.h directly.

Loves it:     imp
This commit is contained in:
Ian Lepore 2016-05-25 19:44:26 +00:00
parent 92a58a9246
commit a66dc0c52b
42 changed files with 8 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/arm/arm/bcopyinout.S
View File

@ -38,7 +38,6 @@
#include "assym.s"
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <sys/errno.h>

2
sys/arm/arm/bcopyinout_xscale.S
View File

@ -38,8 +38,6 @@
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
#include <machine/acle-compat.h>
.syntax unified
.text
.align 2

1
sys/arm/arm/bus_space_base.c
View File

@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include <machine/acle-compat.h>
#include "opt_platform.h"

1
sys/arm/arm/copystr.S
View File

@ -39,7 +39,6 @@
*/
#include "assym.s"
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <machine/armreg.h>
__FBSDID("$FreeBSD$");

1
sys/arm/arm/cpu_asm-v6.S
View File

@ -28,7 +28,6 @@
*/
#include "assym.s"
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <machine/asmacros.h>
#include <machine/armreg.h>

1
sys/arm/arm/cpufunc.c
View File

@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <vm/uma.h>
#include <machine/acle-compat.h>
#include <machine/cpuconf.h>
#include <machine/cpufunc.h>

1
sys/arm/arm/disassem.c
View File

@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <machine/disassem.h>
#include <machine/armreg.h>
#include <machine/acle-compat.h>
#include <ddb/ddb.h>
/*

1
sys/arm/arm/elf_machdep.c
View File

@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <vm/vm_param.h>
#include <machine/acle-compat.h>
#include <machine/elf.h>
#include <machine/md_var.h>

1
sys/arm/arm/exception.S
View File

@ -48,7 +48,6 @@
#include "assym.s"
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <machine/armreg.h>
#include <machine/asmacros.h>

1
sys/arm/arm/fiq.c
View File

@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/acle-compat.h>
#include <machine/armreg.h>
#include <machine/cpufunc.h>
#include <machine/fiq.h>

1
sys/arm/arm/fusu.S
View File

@ -33,7 +33,6 @@
*
*/
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <machine/armreg.h>
#include "assym.s"

1
sys/arm/arm/genassym.c
View File

@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <machine/acle-compat.h>
#include <machine/armreg.h>
#include <machine/frame.h>
#include <machine/pcb.h>

1
sys/arm/arm/locore-v6.S
View File

@ -30,7 +30,6 @@
#include "assym.s"
#include <sys/syscall.h>
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <machine/asmacros.h>
#include <machine/armreg.h>

1
sys/arm/arm/machdep.c
View File

@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
#include <machine/acle-compat.h>
#include <machine/armreg.h>
#include <machine/atags.h>
#include <machine/cpu.h>

1
sys/arm/arm/mem.c
View File

@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <machine/acle-compat.h>
#include <machine/memdev.h>
#include <machine/vmparam.h>

1
sys/arm/arm/mp_machdep.c
View File

@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_kern.h>
#include <vm/pmap.h>
#include <machine/acle-compat.h>
#include <machine/armreg.h>
#include <machine/cpu.h>
#include <machine/cpufunc.h>

1
sys/arm/arm/stdatomic.c
View File

@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include <sys/stdatomic.h>
#include <sys/types.h>
#include <machine/acle-compat.h>
#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/sysarch.h>

1
sys/arm/arm/swtch-v4.S
View File

@ -81,7 +81,6 @@
#include "assym.s"
#include "opt_sched.h"
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <machine/asmacros.h>
#include <machine/armreg.h>

1
sys/arm/arm/swtch-v6.S
View File

@ -81,7 +81,6 @@
#include "assym.s"
#include "opt_sched.h"
#include <machine/acle-compat.h>
#include <machine/asm.h>
#include <machine/asmacros.h>
#include <machine/armreg.h>

1
sys/arm/arm/sys_machdep.c
View File

@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <machine/acle-compat.h>
#include <machine/cpu.h>
#include <machine/sysarch.h>
#include <machine/vmparam.h>

1
sys/arm/arm/trap-v6.c
View File

@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
#include <machine/acle-compat.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/machdep.h>

2
sys/arm/arm/vm_machdep.c
View File

@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sysent.h>
#include <sys/unistd.h>
#include <machine/acle-compat.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/pcb.h>
@ -76,7 +75,6 @@ __FBSDID("$FreeBSD$");
#include <vm/uma.h>
#include <vm/uma_int.h>
#include <machine/acle-compat.h>
#include <machine/md_var.h>
#include <machine/vfp.h>

2
sys/arm/include/armreg.h
View File

@ -41,8 +41,6 @@
#ifndef MACHINE_ARMREG_H
#define MACHINE_ARMREG_H
#include <machine/acle-compat.h>
#define INSN_SIZE 4
#define INSN_COND_MASK 0xf0000000 /* Condition mask */
#define PSR_MODE 0x0000001f /* mode mask */

1
sys/arm/include/asm.h
View File

@ -39,7 +39,6 @@
#ifndef _MACHINE_ASM_H_
#define _MACHINE_ASM_H_
#include <sys/cdefs.h>
#include <machine/acle-compat.h>
#include <machine/sysreg.h>
#define _C_LABEL(x) x

2
sys/arm/include/atomic.h
View File

@ -42,8 +42,6 @@
#include <sys/types.h>
#include <machine/armreg.h>
#include <machine/acle-compat.h>
#ifndef _KERNEL
#include <machine/sysarch.h>
#else

1
sys/arm/include/bus.h
View File

@ -67,7 +67,6 @@
#define _MACHINE_BUS_H_
#include <machine/_bus.h>
#include <machine/acle-compat.h>
/*
* int bus_space_map (bus_space_tag_t t, bus_addr_t addr,

1
sys/arm/include/cpu-v4.h
View File

@ -34,7 +34,6 @@
#error Only include this file in the kernel
#endif
#include <machine/acle-compat.h>
#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/cpuinfo.h>

1
sys/arm/include/cpu-v6.h
View File

@ -34,7 +34,6 @@
#error Only include this file in the kernel
#endif
#include <machine/acle-compat.h>
#include <machine/atomic.h>
#include <machine/cpufunc.h>
#include <machine/cpuinfo.h>

1
sys/arm/include/cpu.h
View File

@ -4,7 +4,6 @@
#ifndef MACHINE_CPU_H
#define MACHINE_CPU_H
#include <machine/acle-compat.h>
#include <machine/armreg.h>
#include <machine/frame.h>

1
sys/arm/include/db_machdep.h
View File

@ -33,7 +33,6 @@
#include <machine/frame.h>
#include <machine/trap.h>
#include <machine/armreg.h>
#include <machine/acle-compat.h>
#define T_BREAKPOINT (1)
#define T_WATCHPOINT (2)

2
sys/arm/include/machdep.h
View File

@ -4,8 +4,6 @@
#ifndef _MACHDEP_BOOT_MACHDEP_H_
#define _MACHDEP_BOOT_MACHDEP_H_
#include <machine/acle-compat.h>
/* Structs that need to be initialised by initarm */
#if __ARM_ARCH >= 6
extern vm_offset_t irqstack;

1
sys/arm/include/param.h
View File

@ -46,7 +46,6 @@
*/
#include <machine/_align.h>
#include <machine/acle-compat.h>
#define STACKALIGNBYTES (8 - 1)
#define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES)

1
sys/arm/include/pcpu.h
View File

@ -32,7 +32,6 @@
#ifdef _KERNEL
#include <machine/acle-compat.h>
#include <machine/cpuconf.h>
#define ALT_STACK_SIZE 128

2
sys/arm/include/pmap.h
View File

@ -30,8 +30,6 @@
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
#include <machine/acle-compat.h>
#if __ARM_ARCH >= 6
#include <machine/pmap-v6.h>
#else

2
sys/arm/include/sf_buf.h
View File

@ -29,8 +29,6 @@
#ifndef _MACHINE_SF_BUF_H_
#define _MACHINE_SF_BUF_H_
#include <machine/acle-compat.h>
static inline void
sf_buf_map(struct sf_buf *sf, int flags)
{

1
sys/arm/include/sysarch.h
View File

@ -37,7 +37,6 @@
#ifndef _ARM_SYSARCH_H_
#define _ARM_SYSARCH_H_
#include <machine/acle-compat.h>
#include <machine/armreg.h>
/*

2
sys/arm/include/sysreg.h
View File

@ -39,8 +39,6 @@
#ifndef MACHINE_SYSREG_H
#define MACHINE_SYSREG_H
#include <machine/acle-compat.h>
/*
* CP14 registers
*/

2
sys/arm/include/vm.h
View File

@ -29,8 +29,6 @@
#ifndef _MACHINE_VM_H_
#define _MACHINE_VM_H_
#include <machine/acle-compat.h>
#if __ARM_ARCH >= 6
#define VM_MEMATTR_WB_WA ((vm_memattr_t)0)
#define VM_MEMATTR_NOCACHE ((vm_memattr_t)1)

1
sys/arm/mv/mv_machdep.c
View File

@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/acle-compat.h>
#include <machine/bus.h>
#include <machine/fdt.h>
#include <machine/machdep.h>

3
sys/kern/imgact_elf.c
View File

@ -80,9 +80,6 @@ __FBSDID("$FreeBSD$");
#include <machine/elf.h>
#include <machine/md_var.h>
#ifdef __arm__
#include <machine/acle-compat.h>
#endif
#define ELF_NOTE_ROUNDSIZE 4
#define OLD_EI_BRAND 8

3
sys/kern/subr_devmap.c
View File

@ -37,9 +37,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/pmap.h>
#ifdef __arm__
#include <machine/acle-compat.h>
#endif
#include <machine/vmparam.h>
static const struct devmap_entry *devmap_table;

8
sys/sys/cdefs.h
View File

@ -780,6 +780,14 @@
#define __NO_TLS 1
#endif
/*
* Old versions of GCC use non-standard ARM arch symbols; acle-compat.h
* translates them to __ARM_ARCH and the modern feature symbols defined by ARM.
*/
#if defined(__arm__) && !defined(__ARM_ARCH)
#include <machine/acle-compat.h>
#endif
/*
* Type Safety Checking
*