@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.117 2013/05/19 15:51:10 rkujawa Exp $
+#	$NetBSD: files.arm,v 1.118 2013/06/12 07:12:10 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag				ARM32
@@ -6,16 +6,17 @@
 # CPU types.  Make sure to update <arm/cpuconf.h> if you change this list.
 defflag	opt_cputypes.h		CPU_ARM2 CPU_ARM250 CPU_ARM3
 defflag	opt_cputypes.h		CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
-				CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11
+				CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11 CPU_ARMV7
 				CPU_SA110 CPU_SA1100 CPU_SA1110 CPU_IXP12X0
-				CPU_FA526 CPU_CORTEX CPU_PJ4B
-				CPU_XSCALE_80200 CPU_XSCALE_80321
+				CPU_FA526 CPU_XSCALE_80200 CPU_XSCALE_80321
 				CPU_XSCALE_PXA250 CPU_XSCALE_PXA270
 				CPU_XSCALE_IXP425 
 				CPU_SHEEVA
 defflag	opt_cputypes.h		CPU_ARM1136: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM1176: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM11MPCORE: CPU_ARM11
+defflag	opt_cputypes.h		CPU_PJ4B: CPU_ARMV7
+defflag	opt_cputypes.h		CPU_CORTEX: CPU_ARMV7
 defflag	opt_cputypes.h		CPU_CORTEXA5: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA7: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA8: CPU_CORTEX