Build the cpufunc_asm_* files based on the cpu type, not which config file

we happen to be building.

26 files changed, 12 insertions, 35 deletions

diff --git a/sys/arm/allwinner/a20/files.a20 b/sys/arm/allwinner/a20/files.a20
index ecb47db..0edd6e8 100644
--- a/sys/arm/allwinner/a20/files.a20
+++ b/sys/arm/allwinner/a20/files.a20
@@ -3,7 +3,6 @@ kern/kern_clocksource.c 		standard
 
 arm/arm/bus_space_asm_generic.S 	standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 arm/arm/gic.c				standard
 
 arm/allwinner/a20/a20_cpu_cfg.c 	standard
diff --git a/sys/arm/allwinner/files.a10 b/sys/arm/allwinner/files.a10
index ed290db..8dda7cf 100644
--- a/sys/arm/allwinner/files.a10
+++ b/sys/arm/allwinner/files.a10
@@ -3,7 +3,6 @@ kern/kern_clocksource.c			standard
 
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 
 arm/allwinner/a10_clk.c			standard
 arm/allwinner/a10_common.c		standard
diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga
index 0dbbc15..7f425ec 100644
--- a/sys/arm/altera/socfpga/files.socfpga
+++ b/sys/arm/altera/socfpga/files.socfpga
@@ -4,7 +4,6 @@ kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91
index e3061e1..7f4cb89 100644
--- a/sys/arm/at91/files.at91
+++ b/sys/arm/at91/files.at91
@@ -1,6 +1,5 @@
 # $FreeBSD$
 arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm9.S	standard
 arm/at91/at91_machdep.c		standard
 arm/at91/at91_aic.c		standard
 arm/at91/at91.c			standard
diff --git a/sys/arm/broadcom/bcm2835/files.bcm2835 b/sys/arm/broadcom/bcm2835/files.bcm2835
index a0dddcd..7293790 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm2835
+++ b/sys/arm/broadcom/bcm2835/files.bcm2835
@@ -1,6 +1,3 @@
 # $FreeBSD$
 
 arm/broadcom/bcm2835/bcm2835_systimer.c		standard
-
-arm/arm/cpufunc_asm_arm11.S                     standard
-arm/arm/cpufunc_asm_arm11x6.S                   standard
diff --git a/sys/arm/broadcom/bcm2835/files.bcm2836 b/sys/arm/broadcom/bcm2835/files.bcm2836
index f3c1f70..f797cf7 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm2836
+++ b/sys/arm/broadcom/bcm2835/files.bcm2836
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/generic_timer.c				standard
 
 arm/broadcom/bcm2835/bcm2836.c			standard
diff --git a/sys/arm/broadcom/bcm2835/files.bcm283x b/sys/arm/broadcom/bcm2835/files.bcm283x
index 6f12104..f028496 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm283x
+++ b/sys/arm/broadcom/bcm2835/files.bcm283x
@@ -18,7 +18,6 @@ arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt
 arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c                     standard
 arm/arm/bus_space_asm_generic.S                 standard
-arm/arm/cpufunc_asm_armv6.S                     standard
 
 kern/kern_clocksource.c                         standard
 
diff --git a/sys/arm/cavium/cns11xx/files.econa b/sys/arm/cavium/cns11xx/files.econa
index 14d9151..13e1bf6 100644
--- a/sys/arm/cavium/cns11xx/files.econa
+++ b/sys/arm/cavium/cns11xx/files.econa
@@ -1,5 +1,4 @@
 # $FreeBSD$
-arm/arm/cpufunc_asm_fa526.S	standard
 arm/cavium/cns11xx/econa_machdep.c		standard
 arm/cavium/cns11xx/econa.c			standard
 arm/cavium/cns11xx/timer.c			standard
diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51
index d0b3c63..b779ee2 100644
--- a/sys/arm/freescale/imx/files.imx51
+++ b/sys/arm/freescale/imx/files.imx51
@@ -1,7 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 # Init
diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx53
index e070b2e..6ca4ffd 100644
--- a/sys/arm/freescale/imx/files.imx53
+++ b/sys/arm/freescale/imx/files.imx53
@@ -1,7 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 # Init
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index 8317116..f38eca4 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -5,7 +5,6 @@
 #
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 kern/kern_clocksource.c			standard
 
 #
diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid
index 4ee48f9..194a975 100644
--- a/sys/arm/freescale/vybrid/files.vybrid
+++ b/sys/arm/freescale/vybrid/files.vybrid
@@ -4,7 +4,6 @@ kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
diff --git a/sys/arm/lpc/files.lpc b/sys/arm/lpc/files.lpc
index e6d8b8b..01715d3 100644
--- a/sys/arm/lpc/files.lpc
+++ b/sys/arm/lpc/files.lpc
@@ -1,7 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_arm9.S		standard
 arm/lpc/lpc_machdep.c			standard
 arm/lpc/lpc_pwr.c			standard
 arm/lpc/lpc_intc.c			standard
diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv
index 37e0c14..fd5c5f1 100644
--- a/sys/arm/mv/files.mv
+++ b/sys/arm/mv/files.mv
@@ -14,12 +14,6 @@
 #
 arm/arm/bus_space_base.c	standard
 arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm10.S	standard
-arm/arm/cpufunc_asm_arm11.S	standard
-arm/arm/cpufunc_asm_armv5_ec.S	standard
-arm/arm/cpufunc_asm_armv7.S	standard
-arm/arm/cpufunc_asm_sheeva.S	standard
-arm/arm/cpufunc_asm_pj4b.S	standard
 
 arm/mv/gpio.c			standard
 arm/mv/mv_common.c		standard
diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx
index be2ca7c..bfce36c 100644
--- a/sys/arm/rockchip/files.rk30xx
+++ b/sys/arm/rockchip/files.rk30xx
@@ -3,7 +3,6 @@ kern/kern_clocksource.c			standard
 
 arm/arm/bus_space_asm_generic.S		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_armv7.S		standard
 
 arm/arm/gic.c				standard
 arm/arm/mpcore_timer.c			standard
diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5
index d96a2fb..2e84f6c 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -4,7 +4,6 @@ kern/kern_clocksource.c				standard
 
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
diff --git a/sys/arm/samsung/s3c2xx0/files.s3c2xx0 b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
index 7b6c7e4..7748c4f 100644
--- a/sys/arm/samsung/s3c2xx0/files.s3c2xx0
+++ b/sys/arm/samsung/s3c2xx0/files.s3c2xx0
@@ -2,7 +2,6 @@
 arm/arm/bus_space_base.c	standard
 arm/arm/bus_space_asm_generic.S	standard
 arm/arm/bus_space_generic.c	standard
-arm/arm/cpufunc_asm_arm9.S	standard
 arm/samsung/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
 arm/samsung/s3c2xx0/s3c24x0_rtc.c	standard
 arm/samsung/s3c2xx0/s3c24x0_machdep.c	standard
diff --git a/sys/arm/ti/files.ti b/sys/arm/ti/files.ti
index f65a393..2be467e 100644
--- a/sys/arm/ti/files.ti
+++ b/sys/arm/ti/files.ti
@@ -5,7 +5,6 @@ kern/kern_clocksource.c				standard
 arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/pmu.c					optional	hwpmc
 
 arm/ti/ti_common.c				standard
diff --git a/sys/arm/versatile/files.versatile b/sys/arm/versatile/files.versatile
index b8ac4e75..958821e 100644
--- a/sys/arm/versatile/files.versatile
+++ b/sys/arm/versatile/files.versatile
@@ -3,9 +3,6 @@
 arm/arm/bus_space_base.c 			standard
 arm/arm/bus_space_asm_generic.S			standard
 arm/arm/bus_space_generic.c                     standard
-arm/arm/cpufunc_asm_arm11.S                     standard
-arm/arm/cpufunc_asm_arm11x6.S			standard
-arm/arm/cpufunc_asm_armv6.S                     standard
 
 arm/versatile/pl050.c				optional sc
 arm/versatile/sp804.c				standard
diff --git a/sys/arm/xilinx/files.zynq7 b/sys/arm/xilinx/files.zynq7
index cd5cb38..be3e599 100644
--- a/sys/arm/xilinx/files.zynq7
+++ b/sys/arm/xilinx/files.zynq7
@@ -8,7 +8,6 @@ kern/kern_clocksource.c				standard
 arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
-arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard
diff --git a/sys/arm/xscale/i80321/files.i80219 b/sys/arm/xscale/i80321/files.i80219
index 10b7630..1162161 100644
--- a/sys/arm/xscale/i80321/files.i80219
+++ b/sys/arm/xscale/i80321/files.i80219
@@ -4,7 +4,6 @@
 # 
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_dma.c		optional	dma
 arm/xscale/i80321/i80321_mcu.c		standard
diff --git a/sys/arm/xscale/i80321/files.i80321 b/sys/arm/xscale/i80321/files.i80321
index 48f9b08..4f41cec 100644
--- a/sys/arm/xscale/i80321/files.i80321
+++ b/sys/arm/xscale/i80321/files.i80321
@@ -1,7 +1,6 @@
 #$FreeBSD$
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_aau.c		optional	aau
 arm/xscale/i80321/i80321_dma.c		optional	dma
diff --git a/sys/arm/xscale/i8134x/files.i81342 b/sys/arm/xscale/i8134x/files.i81342
index 0893016..31c78d2 100644
--- a/sys/arm/xscale/i8134x/files.i81342
+++ b/sys/arm/xscale/i8134x/files.i81342
@@ -1,8 +1,6 @@
 # $FreeBSD$
 arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
-arm/arm/cpufunc_asm_xscale_c3.S		standard
 arm/xscale/i80321/i80321_timer.c	standard
 arm/xscale/i80321/i80321_wdog.c		optional	iopwdog
 arm/xscale/i8134x/i81342.c		standard
diff --git a/sys/arm/xscale/ixp425/files.ixp425 b/sys/arm/xscale/ixp425/files.ixp425
index 8d8855b..9a34b23 100644
--- a/sys/arm/xscale/ixp425/files.ixp425
+++ b/sys/arm/xscale/ixp425/files.ixp425
@@ -1,6 +1,5 @@
 #$FreeBSD$
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 arm/xscale/ixp425/ixp425.c		standard
 arm/xscale/ixp425/ixp425_mem.c		standard
 arm/xscale/ixp425/ixp425_space.c	standard
diff --git a/sys/arm/xscale/pxa/files.pxa b/sys/arm/xscale/pxa/files.pxa
index d2ea0c4..a9a4fcf 100644
--- a/sys/arm/xscale/pxa/files.pxa
+++ b/sys/arm/xscale/pxa/files.pxa
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 arm/arm/bus_space_generic.c		standard
-arm/arm/cpufunc_asm_xscale.S		standard
 
 arm/xscale/pxa/pxa_gpio.c		standard
 arm/xscale/pxa/pxa_icu.c		standard
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index bffb588..b8e6595 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -9,7 +9,19 @@ 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_arm11.S	optional	cpu_arm1176
+arm/arm/cpufunc_asm_arm11x6.S	optional	cpu_arm1176
 arm/arm/cpufunc_asm_armv4.S 	standard
+arm/arm/cpufunc_asm_armv5_ec.S 	optional	cpu_arm9e
+arm/arm/cpufunc_asm_armv6.S 	optional	cpu_arm1176
+arm/arm/cpufunc_asm_armv7.S	optional	cpu_cortexa | cpu_krait | cpu_mv_pj4b
+arm/arm/cpufunc_asm_fa526.S	optional	cpu_fa526
+arm/arm/cpufunc_asm_pj4b.S	optional	cpu_mv_pj4b
+arm/arm/cpufunc_asm_sheeva.S 	optional	cpu_arm9e
+arm/arm/cpufunc_asm_xscale.S	optional	cpu_xscale_80200 | cpu_xscale_80321 | cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_80219 | cpu_xscale_81342
+arm/arm/cpufunc_asm_xscale_c3.S	optional	cpu_xscale_81342
 arm/arm/cpuinfo.c		standard
 arm/arm/cpu_asm-v6.S		optional	armv6
 arm/arm/db_disasm.c		optional	ddb