Diff: targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/experimental_section_vars/section_vars.h

Revision:

174:b96e65c34a4d

Parent:

165:e614a9f1c9e2

--- a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/experimental_section_vars/section_vars.h	Fri Sep 15 14:59:18 2017 +0100
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/experimental_section_vars/section_vars.h	Mon Oct 02 15:33:19 2017 +0100
@@ -63,7 +63,7 @@
  *
  * @param[in]   section_name    Name of the section to register.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 // Not required by this compiler.
 #define NRF_SECTION_VARS_REGISTER_SECTION(section_name)
@@ -88,7 +88,7 @@
  *
  * @param[in]   section_name    Name of the section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #define NRF_SECTION_VARS_START_SYMBOL(section_name)         section_name ## $$Base
 
@@ -109,7 +109,7 @@
  *
  * @param[in]   section_name    Name of the section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #define NRF_SECTION_VARS_END_SYMBOL(section_name)           section_name ## $$Limit
 
@@ -130,7 +130,7 @@
  *
  * @param[in]   section_name    Name of the section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #define NRF_SECTION_VARS_LENGTH(section_name) \
     ((uint32_t)&NRF_SECTION_VARS_END_SYMBOL(section_name) - (uint32_t)&NRF_SECTION_VARS_START_SYMBOL(section_name))
@@ -152,7 +152,7 @@
  *
  * param[in]    section_name    Name of the section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #define NRF_SECTION_VARS_START_ADDR(section_name)       (uint32_t)&NRF_SECTION_VARS_START_SYMBOL(section_name)
 
@@ -171,7 +171,7 @@
  *
  * @param[in]   section_name    Name of the section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #define NRF_SECTION_VARS_END_ADDR(section_name)         (uint32_t)&NRF_SECTION_VARS_END_SYMBOL(section_name)
 
@@ -193,7 +193,7 @@
  * @param[in]   type_name       Name of the type stored in the section.
  * @param[in]   section_name    Name of the section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #define NRF_SECTION_VARS_REGISTER_SYMBOLS(type_name, section_name)  \
     extern type_name * NRF_SECTION_VARS_START_SYMBOL(section_name); \
@@ -229,7 +229,7 @@
  * @param[in]   section_name    Name of the section.
  * @param[in]   type_def        Datatype of the variable to place in the given section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
     
 #define NRF_SECTION_VARS_ADD(section_name, type_def) \
     static type_def __attribute__ ((section(#section_name))) __attribute__((used))
@@ -259,7 +259,7 @@
  * @param[in]   type_name       Type name of item in section.
  * @param[in]   section_name    Name of the section.
  */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #define NRF_SECTION_VARS_GET(i, type_name, section_name) \
     (type_name*)(NRF_SECTION_VARS_START_ADDR(section_name) + i * sizeof(type_name))