Module Name: src
Committed By: matt
Date: Thu Dec 19 01:17:06 UTC 2013
Modified Files:
src/sys/arch/arm/include [matt-nb5-mips64]: cdefs.h
Log Message:
Pull from HEAD (for post armv6 defines).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.38.1 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.3 src/sys/arch/arm/include/cdefs.h:1.3.38.1
--- src/sys/arch/arm/include/cdefs.h:1.3 Wed Oct 17 19:53:41 2007
+++ src/sys/arch/arm/include/cdefs.h Thu Dec 19 01:17:06 2013
@@ -1,15 +1,31 @@
-/* $NetBSD: cdefs.h,v 1.3 2007/10/17 19:53:41 garbled Exp $ */
+/* $NetBSD: cdefs.h,v 1.3.38.1 2013/12/19 01:17:06 matt Exp $ */
-#ifndef _MACHINE_CDEFS_H_
-#define _MACHINE_CDEFS_H_
+#ifndef _ARM_CDEFS_H_
+#define _ARM_CDEFS_H_
-#if defined (__ARM_ARCH_6__) || defined (__ARM_ARCH_6J__)
+#if defined (__ARM_ARCH_7__) || defined (__ARM_ARCH_7A__) || \
+ defined (__ARM_ARCH_7R__) || defined (__ARM_ARCH_7M__) || \
+ defined (__ARM_ARCH_7EM__) /* 7R, 7M, 7EM are for non MMU arms */
+#define _ARM_ARCH_7
+#endif
+
+#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_6ZM__)
#define _ARM_ARCH_6
#endif
-#if defined (_ARM_ARCH_6) || defined (__ARM_ARCH_5__) || \
- defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || \
- defined (__ARM_ARCH_5TEJ__)
+#if defined (_ARM_ARCH_6) || defined (__ARM_ARCH_5T__) || \
+ defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__)
+#define _ARM_ARCH_5T
+#endif
+
+#if defined (_ARM_ARCH_6) || defined (_ARM_ARCH_5T) || defined (__ARM_ARCH_5__)
#define _ARM_ARCH_5
#endif
@@ -17,4 +33,17 @@
#define _ARM_ARCH_4T
#endif
-#endif /* !_MACHINE_CDEFS_H_ */
+#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
+
+#ifdef __ARM_EABI__
+#define __ALIGNBYTES (8 - 1)
+#else
+#define __ALIGNBYTES (sizeof(int) - 1)
+#endif
+
+#endif /* !_ARM_CDEFS_H_ */
