From fc92ec98bf2d28b27ba7a7bf88b687432f9a76b1 Mon Sep 17 00:00:00 2001
From: Joakim Gebart <joakim.gebart@eistec.se>
Date: Thu, 29 Jan 2015 10:14:49 +0100
Subject: [PATCH] cortexm: CMSIS: Add extern "C" to CMSIS headers

---
 cpu/cortexm_common/include/core_cmFunc.h  | 7 +++++++
 cpu/cortexm_common/include/core_cmInstr.h | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/cpu/cortexm_common/include/core_cmFunc.h b/cpu/cortexm_common/include/core_cmFunc.h
index 26fdd17cad..749a7a7a35 100644
--- a/cpu/cortexm_common/include/core_cmFunc.h
+++ b/cpu/cortexm_common/include/core_cmFunc.h
@@ -38,6 +38,9 @@
 #ifndef __CORE_CMFUNC_H
 #define __CORE_CMFUNC_H
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
 
 /* ###########################  Core Function Access  ########################### */
 /** \ingroup  CMSIS_Core_FunctionInterface
@@ -668,4 +671,8 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_FPSCR(uint32_t fps
 
 /*@} end of CMSIS_Core_RegAccFunctions */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CORE_CMFUNC_H */
diff --git a/cpu/cortexm_common/include/core_cmInstr.h b/cpu/cortexm_common/include/core_cmInstr.h
index fca425c51d..ed8a6f3cc5 100644
--- a/cpu/cortexm_common/include/core_cmInstr.h
+++ b/cpu/cortexm_common/include/core_cmInstr.h
@@ -38,6 +38,9 @@
 #ifndef __CORE_CMINSTR_H
 #define __CORE_CMINSTR_H
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
 
 /* ##########################  Core Instruction Access  ######################### */
 /** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface
@@ -913,4 +916,8 @@ __attribute__((always_inline)) __STATIC_INLINE void __STRT(uint32_t value, volat
 
 /*@}*/ /* end of group CMSIS_Core_InstructionInterface */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CORE_CMINSTR_H */