[src/trunk]: src/sys/arch/arm/include Add _ARM_ARCH_T2 to indicate Thumb2 sup...

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

details:   https://anonhg.NetBSD.org/src/rev/f9fdf1532885
branches:  trunk
changeset: 789345:f9fdf1532885
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Aug 15 22:25:10 2013 +0000

description:
Add _ARM_ARCH_T2 to indicate Thumb2 support
Don't define _ARM_ARCH_DWORD_OK disappear if compiling for Thumb1

diffstat:

 sys/arch/arm/include/cdefs.h |  22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r 14fc64f5055d -r f9fdf1532885 sys/arch/arm/include/cdefs.h
--- a/sys/arch/arm/include/cdefs.h      Thu Aug 15 22:13:48 2013 +0000
+++ b/sys/arch/arm/include/cdefs.h      Thu Aug 15 22:25:10 2013 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: cdefs.h,v 1.7 2012/08/05 04:13:19 matt Exp $   */
+/*     $NetBSD: cdefs.h,v 1.8 2013/08/15 22:25:10 matt Exp $   */
 
-#ifndef        _MACHINE_CDEFS_H_
-#define        _MACHINE_CDEFS_H_
+#ifndef        _ARM_CDEFS_H_
+#define        _ARM_CDEFS_H_
 
 #if defined (__ARM_ARCH_7__) || defined (__ARM_ARCH_7A__) || \
     defined (__ARM_ARCH_7R__) || defined (__ARM_ARCH_7M__) || \
@@ -9,10 +9,14 @@
 #define _ARM_ARCH_7
 #endif
 
-#if defined (_ARM_ARCH_7) || defined (__ARM_ARCH_6__) || \
+#if defined (_ARM_ARCH_7) || defined (__ARM_ARCH_6T2__)
+#define _ARM_ARCH_T2           /* Thumb2 */
+#endif
+
+#if defined (_ARM_ARCH_T2) || defined (__ARM_ARCH_6__) || \
     defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6K__) || \
     defined (__ARM_ARCH_6Z__) || defined (__ARM_ARCH_6ZK__) || \
-    defined (__ARM_ARCH_6T2__) || defined (__ARM_ARCH_6ZM__)
+    defined (__ARM_ARCH_6ZM__)
 #define _ARM_ARCH_6
 #endif
 
@@ -26,8 +30,10 @@
 #define _ARM_ARCH_4T
 #endif
 
-#if defined(_ARM_ARCH_6) || defined (__ARM_ARCH_5TE__) || \
-    defined (__ARM_ARCH_5TEJ__)
+#if defined (_ARM_ARCH_T2) || \
+    (!defined (__thumb__) && \
+     (defined (_ARM_ARCH_6) || defined (__ARM_ARCH_5TE__) || \
+      defined (__ARM_ARCH_5TEJ__)))
 #define        _ARM_ARCH_DWORD_OK
 #endif
 
@@ -37,4 +43,4 @@
 #define __ALIGNBYTES           (sizeof(int) - 1)
 #endif
 
-#endif /* !_MACHINE_CDEFS_H_ */
+#endif /* !_ARM_CDEFS_H_ */