[src/trunk]: src/sys/arch/arm/conf CPU_ARMV[67] imply ARM32_DISABLE_ALIGNMENT...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cef8fd238fa6
branches:  trunk
changeset: 791307:cef8fd238fa6
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Nov 12 17:05:09 2013 +0000

description:
CPU_ARMV[67] imply ARM32_DISABLE_ALIGNMENT_FAULTS
Make it explicit.

diffstat:

 sys/arch/arm/conf/files.arm |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r d28bf2220851 -r cef8fd238fa6 sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm       Tue Nov 12 16:57:30 2013 +0000
+++ b/sys/arch/arm/conf/files.arm       Tue Nov 12 17:05:09 2013 +0000
@@ -1,10 +1,15 @@
-#      $NetBSD: files.arm,v 1.122 2013/08/17 22:21:02 matt Exp $
+#      $NetBSD: files.arm,v 1.123 2013/11/12 17:05:09 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag                                ARM32
 
+# predefine for CPU_ARMV6 and CPU_ARMV7
+defflag        opt_cpuoptions.h        ARM32_DISABLE_ALIGNMENT_FAULTS
+
 # CPU types.  Make sure to update <arm/cpuconf.h> if you change this list.
-defflag        opt_cputypes.h          CPU_PRE_ARMV6 CPU_ARMV6 CPU_ARMV7
+defflag        opt_cputypes.h          CPU_PRE_ARMV6
+defflag        opt_cputypes.h          CPU_ARMV6: ARM32_DISABLE_ALIGNMENT_FAULTS
+defflag        opt_cputypes.h          CPU_ARMV7: ARM32_DISABLE_ALIGNMENT_FAULTS
 defflag        opt_cputypes.h          CPU_ARM2: CPU_PRE_ARMV6
 defflag        opt_cputypes.h          CPU_ARM250: CPU_PRE_ARMV6
 defflag        opt_cputypes.h          CPU_ARM3: CPU_PRE_ARMV6
@@ -44,7 +49,6 @@
 defflag  opt_cpuoptions.h      XSCALE_CACHE_WRITE_BACK
 defflag  opt_cpuoptions.h      XSCALE_NO_COALESCE_WRITES
 defflag  opt_cpuoptions.h      XSCALE_CACHE_READ_WRITE_ALLOCATE
-defflag  opt_cpuoptions.h      ARM32_DISABLE_ALIGNMENT_FAULTS
 defflag  opt_cpuoptions.h      ARM9_CACHE_WRITE_THROUGH
 defflag  opt_cpuoptions.h      TPIDRPRW_IS_CURLWP
 defflag  opt_cpuoptions.h      TPIDRPRW_IS_CURCPU