Module Name: src
Committed By: matt
Date: Thu Aug 15 22:25:10 UTC 2013
Modified Files:
src/sys/arch/arm/include: cdefs.h
Log Message:
Add _ARM_ARCH_T2 to indicate Thumb2 support
Don't define _ARM_ARCH_DWORD_OK disappear if compiling for Thumb1
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/cdefs.h
diff -u src/sys/arch/arm/include/cdefs.h:1.7 src/sys/arch/arm/include/cdefs.h:1.8
--- src/sys/arch/arm/include/cdefs.h:1.7 Sun Aug 5 04:13:19 2012
+++ src/sys/arch/arm/include/cdefs.h Thu Aug 15 22:25:10 2013
@@ -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_ */
