diff options
42 files changed, 8 insertions, 54 deletions
diff --git a/sys/arm/arm/bcopyinout.S b/sys/arm/arm/bcopyinout.S index 1c7e0fd..0a2e835 100644 --- a/sys/arm/arm/bcopyinout.S +++ b/sys/arm/arm/bcopyinout.S @@ -38,7 +38,6 @@ #include "assym.s" -#include <machine/acle-compat.h> #include <machine/asm.h> #include <sys/errno.h> diff --git a/sys/arm/arm/bcopyinout_xscale.S b/sys/arm/arm/bcopyinout_xscale.S index 79a5027..ca75347 100644 --- a/sys/arm/arm/bcopyinout_xscale.S +++ b/sys/arm/arm/bcopyinout_xscale.S @@ -38,8 +38,6 @@ #include <machine/asm.h> __FBSDID("$FreeBSD$"); -#include <machine/acle-compat.h> - .syntax unified .text .align 2 diff --git a/sys/arm/arm/bus_space_base.c b/sys/arm/arm/bus_space_base.c index 345ca53..e7fec46 100644 --- a/sys/arm/arm/bus_space_base.c +++ b/sys/arm/arm/bus_space_base.c @@ -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" diff --git a/sys/arm/arm/copystr.S b/sys/arm/arm/copystr.S index 4cb8469..130e6ef 100644 --- a/sys/arm/arm/copystr.S +++ b/sys/arm/arm/copystr.S @@ -39,7 +39,6 @@ */ #include "assym.s" -#include <machine/acle-compat.h> #include <machine/asm.h> #include <machine/armreg.h> __FBSDID("$FreeBSD$"); diff --git a/sys/arm/arm/cpu_asm-v6.S b/sys/arm/arm/cpu_asm-v6.S index 7ab02cf..ea15e17 100644 --- a/sys/arm/arm/cpu_asm-v6.S +++ b/sys/arm/arm/cpu_asm-v6.S @@ -28,7 +28,6 @@ */ #include "assym.s" -#include <machine/acle-compat.h> #include <machine/asm.h> #include <machine/asmacros.h> #include <machine/armreg.h> diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index 9e4c3a7..b2f9982 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -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> diff --git a/sys/arm/arm/disassem.c b/sys/arm/arm/disassem.c index b7aa099..81dbe10 100644 --- a/sys/arm/arm/disassem.c +++ b/sys/arm/arm/disassem.c @@ -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> /* diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c index 2ec659a..a962ee8 100644 --- a/sys/arm/arm/elf_machdep.c +++ b/sys/arm/arm/elf_machdep.c @@ -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> diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index 9466cf6..e7c9e05 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -48,7 +48,6 @@ #include "assym.s" -#include <machine/acle-compat.h> #include <machine/asm.h> #include <machine/armreg.h> #include <machine/asmacros.h> diff --git a/sys/arm/arm/fiq.c b/sys/arm/arm/fiq.c index f5ddcc6..e55aa12 100644 --- a/sys/arm/arm/fiq.c +++ b/sys/arm/arm/fiq.c @@ -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> diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S index ba50e67..79e7ca1 100644 --- a/sys/arm/arm/fusu.S +++ b/sys/arm/arm/fusu.S @@ -33,7 +33,6 @@ * */ -#include <machine/acle-compat.h> #include <machine/asm.h> #include <machine/armreg.h> #include "assym.s" diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c index 9c67018..944eff8 100644 --- a/sys/arm/arm/genassym.c +++ b/sys/arm/arm/genassym.c @@ -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> diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S index 5152842..2303127 100644 --- a/sys/arm/arm/locore-v6.S +++ b/sys/arm/arm/locore-v6.S @@ -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> diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index 09bf424..960fa6a 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -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> diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c index 1218ea4..096988d 100644 --- a/sys/arm/arm/mem.c +++ b/sys/arm/arm/mem.c @@ -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> diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c index db52622..bb3c570 100644 --- a/sys/arm/arm/mp_machdep.c +++ b/sys/arm/arm/mp_machdep.c @@ -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> diff --git a/sys/arm/arm/stdatomic.c b/sys/arm/arm/stdatomic.c index b12a82e..29ff7f5 100644 --- a/sys/arm/arm/stdatomic.c +++ b/sys/arm/arm/stdatomic.c @@ -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> diff --git a/sys/arm/arm/swtch-v4.S b/sys/arm/arm/swtch-v4.S index 21924dc..4576ef4 100644 --- a/sys/arm/arm/swtch-v4.S +++ b/sys/arm/arm/swtch-v4.S @@ -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> diff --git a/sys/arm/arm/swtch-v6.S b/sys/arm/arm/swtch-v6.S index c3e6eb2..a534f43 100644 --- a/sys/arm/arm/swtch-v6.S +++ b/sys/arm/arm/swtch-v6.S @@ -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> diff --git a/sys/arm/arm/sys_machdep.c b/sys/arm/arm/sys_machdep.c index b893a90..6781572 100644 --- a/sys/arm/arm/sys_machdep.c +++ b/sys/arm/arm/sys_machdep.c @@ -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> diff --git a/sys/arm/arm/trap-v6.c b/sys/arm/arm/trap-v6.c index d081917..018a8ea 100644 --- a/sys/arm/arm/trap-v6.c +++ b/sys/arm/arm/trap-v6.c @@ -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> diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index fec2ca0..93c3d20 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -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> diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h index 5596b7f..411517b 100644 --- a/sys/arm/include/armreg.h +++ b/sys/arm/include/armreg.h @@ -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 */ diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h index 44b9d2b..83e525c 100644 --- a/sys/arm/include/asm.h +++ b/sys/arm/include/asm.h @@ -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 diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h index ee89f06..0cf69c9 100644 --- a/sys/arm/include/atomic.h +++ b/sys/arm/include/atomic.h @@ -42,8 +42,6 @@ #include <sys/types.h> #include <machine/armreg.h> -#include <machine/acle-compat.h> - #ifndef _KERNEL #include <machine/sysarch.h> #else diff --git a/sys/arm/include/bus.h b/sys/arm/include/bus.h index d83ae8f..3fbbf93 100644 --- a/sys/arm/include/bus.h +++ b/sys/arm/include/bus.h @@ -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, diff --git a/sys/arm/include/cpu-v4.h b/sys/arm/include/cpu-v4.h index 606a4be..bd383d3 100644 --- a/sys/arm/include/cpu-v4.h +++ b/sys/arm/include/cpu-v4.h @@ -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> diff --git a/sys/arm/include/cpu-v6.h b/sys/arm/include/cpu-v6.h index eed3a41..45a91316 100644 --- a/sys/arm/include/cpu-v6.h +++ b/sys/arm/include/cpu-v6.h @@ -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> diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h index 0d79e68..1ef5798 100644 --- a/sys/arm/include/cpu.h +++ b/sys/arm/include/cpu.h @@ -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> diff --git a/sys/arm/include/db_machdep.h b/sys/arm/include/db_machdep.h index 0988fe3..e741ce0 100644 --- a/sys/arm/include/db_machdep.h +++ b/sys/arm/include/db_machdep.h @@ -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) diff --git a/sys/arm/include/machdep.h b/sys/arm/include/machdep.h index 24c8a95..9442b8b 100644 --- a/sys/arm/include/machdep.h +++ b/sys/arm/include/machdep.h @@ -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; diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h index 4b089e2..e96fe4a 100644 --- a/sys/arm/include/param.h +++ b/sys/arm/include/param.h @@ -46,7 +46,6 @@ */ #include <machine/_align.h> -#include <machine/acle-compat.h> #define STACKALIGNBYTES (8 - 1) #define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h index b4814fc..19cb666 100644 --- a/sys/arm/include/pcpu.h +++ b/sys/arm/include/pcpu.h @@ -32,7 +32,6 @@ #ifdef _KERNEL -#include <machine/acle-compat.h> #include <machine/cpuconf.h> #define ALT_STACK_SIZE 128 diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h index 777216f..044483d 100644 --- a/sys/arm/include/pmap.h +++ b/sys/arm/include/pmap.h @@ -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 diff --git a/sys/arm/include/sf_buf.h b/sys/arm/include/sf_buf.h index 5228864..c711a42 100644 --- a/sys/arm/include/sf_buf.h +++ b/sys/arm/include/sf_buf.h @@ -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) { diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h index ac0a64d..43abb00 100644 --- a/sys/arm/include/sysarch.h +++ b/sys/arm/include/sysarch.h @@ -37,7 +37,6 @@ #ifndef _ARM_SYSARCH_H_ #define _ARM_SYSARCH_H_ -#include <machine/acle-compat.h> #include <machine/armreg.h> /* diff --git a/sys/arm/include/sysreg.h b/sys/arm/include/sysreg.h index bbe6a29..f3fab5b 100644 --- a/sys/arm/include/sysreg.h +++ b/sys/arm/include/sysreg.h @@ -39,8 +39,6 @@ #ifndef MACHINE_SYSREG_H #define MACHINE_SYSREG_H -#include <machine/acle-compat.h> - /* * CP14 registers */ diff --git a/sys/arm/include/vm.h b/sys/arm/include/vm.h index 2bcc261..9c6d420 100644 --- a/sys/arm/include/vm.h +++ b/sys/arm/include/vm.h @@ -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) diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c index 6abedb0..73972c3 100644 --- a/sys/arm/mv/mv_machdep.c +++ b/sys/arm/mv/mv_machdep.c @@ -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> diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 6adf0da..1ee4e9b 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -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 diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c index 52f873a..ab0d487 100644 --- a/sys/kern/subr_devmap.c +++ b/sys/kern/subr_devmap.c @@ -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; diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 530359f..11c4d1e 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -781,6 +781,14 @@ #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 * * Clang provides additional attributes to enable checking type safety |
