Index: sys/conf/Makefile.arm
===================================================================
--- sys/conf/Makefile.arm	(revision 335864)
+++ sys/conf/Makefile.arm	(working copy)
@@ -72,17 +72,33 @@
 		${KERNEL_KO}.bin; \
 		rm ${FULLKERNEL}.noheader
 
-FILES_CPU_FUNC = \
-	$S/$M/$M/cpufunc_asm_arm9.S \
-	$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
-	$S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \
-	$S/$M/$M/cpufunc_asm_fa526.S $S/$M/$M/cpufunc_asm_sheeva.S \
-	$S/$M/$M/cpufunc_asm_pj4b.S $S/$M/$M/cpufunc_asm_armv6.S \
-	$S/$M/$M/cpufunc_asm_armv7.S
+%BEFORE_DEPEND
 
+%OBJS
+
+%FILES.c
+
+%FILES.s
+
+%FILES.m
+
+%CLEAN
+
+CLEAN+=	ldscript.$M ${KERNEL_KO}.bin ldscript.$M.noheader
+
+CLEAN+= ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin ldscript.$M.tramp \
+	ldscript.$M.tramp.noheader ${KERNEL_KO}.gz.tramp \
+	${KERNEL_KO}.gz.tramp.bin
+
+ldscript.$M: $S/conf/ldscript.$M
+	cat $S/conf/ldscript.$M|sed s/KERNPHYSADDR/${KERNPHYSADDR}/g| \
+	  sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
+
 .if ${MACHINE_ARCH:Marmv[67]*} == "" && defined(KERNPHYSADDR)
 KERNEL_EXTRA=trampoline
 KERNEL_EXTRA_INSTALL=kernel.gz.tramp
+FILES_CPU_FUNC = ${SFILES:M*/cpufunc_asm*.S}
+
 trampoline: ${KERNEL_KO}.tramp
 ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c
 	echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h 
@@ -149,27 +165,6 @@
 	    inflate-tramp.o tmphack.S
 .endif
 
-%BEFORE_DEPEND
-
-%OBJS
-
-%FILES.c
-
-%FILES.s
-
-%FILES.m
-
-%CLEAN
-
-CLEAN+=	ldscript.$M ${KERNEL_KO}.bin ldscript.$M.noheader
-
-CLEAN+= ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin ldscript.$M.tramp \
-	ldscript.$M.tramp.noheader ${KERNEL_KO}.gz.tramp \
-	${KERNEL_KO}.gz.tramp.bin
-
-ldscript.$M: $S/conf/ldscript.$M
-	cat $S/conf/ldscript.$M|sed s/KERNPHYSADDR/${KERNPHYSADDR}/g| \
-	  sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
 %RULES
 	
 .include "$S/conf/kern.post.mk"