From bbdaec0dbdbe131584f37ac48279de6eaa673980 Mon Sep 17 00:00:00 2001 From: mmel Date: Sat, 30 Jan 2016 08:02:12 +0000 Subject: ARM: Split swtch.S into common, ARMv4 and ARMv6 parts. Cleanup them. --- sys/conf/files.arm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/conf/files.arm') diff --git a/sys/conf/files.arm b/sys/conf/files.arm index e6b89a1..bf0e262 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -74,6 +74,8 @@ arm/arm/stdatomic.c standard \ compile-with "${NORMAL_C:N-Wmissing-prototypes}" arm/arm/support.S standard arm/arm/swtch.S standard +arm/arm/swtch-v4.S optional !armv6 +arm/arm/swtch-v6.S optional armv6 arm/arm/sys_machdep.c standard arm/arm/syscall.c standard arm/arm/trap.c optional !armv6 -- cgit v1.1 From f6859814fe79dccdcede33e2a31616ec07fa1f28 Mon Sep 17 00:00:00 2001 From: mmel Date: Tue, 2 Feb 2016 14:53:34 +0000 Subject: ARM: All remaining functions in cpufunc_asm_arm10.S are identical with functions in cpufunc_asm_arm9.S. Use arm9 variants and remove cpufunc_asm_arm10.S completly. --- sys/conf/files.arm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sys/conf/files.arm') diff --git a/sys/conf/files.arm b/sys/conf/files.arm index bf0e262..9f3a6bf 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -11,8 +11,7 @@ arm/arm/busdma_machdep-v6.c optional armv6 arm/arm/copystr.S standard arm/arm/cpufunc.c standard arm/arm/cpufunc_asm.S standard -arm/arm/cpufunc_asm_arm9.S optional cpu_arm9 -arm/arm/cpufunc_asm_arm10.S optional cpu_arm9e +arm/arm/cpufunc_asm_arm9.S optional cpu_arm9 | cpu_arm9e arm/arm/cpufunc_asm_arm11.S optional cpu_arm1176 arm/arm/cpufunc_asm_arm11x6.S optional cpu_arm1176 arm/arm/cpufunc_asm_armv4.S optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_80321 | cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_80219 | cpu_xscale_81342 -- cgit v1.1