From cf957f9d4a54d49f66d9af4ee7c7b4bb90660409 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 6 Feb 2014 10:37:50 +0000
Subject: git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6668
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/nil/ports/ARMCMx/nilcore.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'os/nil')

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_) */
+
 /** @} */
 
 /**
-- 
cgit v1.2.3