aboutsummaryrefslogtreecommitdiffstats
path: root/os/nil/ports
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-02-06 10:37:50 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-02-06 10:37:50 +0000
commitcf957f9d4a54d49f66d9af4ee7c7b4bb90660409 (patch)
treea7b63f1e94ec6a9d280a4ad9aadd1c20846aab5c /os/nil/ports
parent23f759922d415d9adaab70424b2c67ff0d9b7181 (diff)
downloadChibiOS-cf957f9d4a54d49f66d9af4ee7c7b4bb90660409.tar.gz
ChibiOS-cf957f9d4a54d49f66d9af4ee7c7b4bb90660409.tar.bz2
ChibiOS-cf957f9d4a54d49f66d9af4ee7c7b4bb90660409.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6668 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/nil/ports')
-rw-r--r--os/nil/ports/ARMCMx/nilcore.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/os/nil/ports/ARMCMx/nilcore.h b/os/nil/ports/ARMCMx/nilcore.h
index 9d9c643b4..60202222a 100644
--- a/os/nil/ports/ARMCMx/nilcore.h
+++ b/os/nil/ports/ARMCMx/nilcore.h
@@ -42,6 +42,11 @@
*/
#define PORT_ARCHITECTURE_ARM
+/* The following code is not processed when the file is included from an
+ asm module because those intrinsic macros are not necessarily defined
+ by the assembler too.*/
+#if !defined(_FROM_ASM_)
+
/**
* @brief Compiler name and version.
*/
@@ -57,6 +62,9 @@
#else
#error "unsupported compiler"
#endif
+
+#endif /* !defined(_FROM_ASM_) */
+
/** @} */
/**