diff options
Diffstat (limited to 'os/nil/ports/ARMCMx/nilcore_v6m.h')
| -rw-r--r-- | os/nil/ports/ARMCMx/nilcore_v6m.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/os/nil/ports/ARMCMx/nilcore_v6m.h b/os/nil/ports/ARMCMx/nilcore_v6m.h index a03e3c900..3a500d2b0 100644 --- a/os/nil/ports/ARMCMx/nilcore_v6m.h +++ b/os/nil/ports/ARMCMx/nilcore_v6m.h @@ -99,7 +99,8 @@ * @name Architecture and Compiler
* @{
*/
-#if (CORTEX_MODEL == CORTEX_M0) || defined(__DOXYGEN__)
+#if ((CORTEX_MODEL == 0) && !defined(__CORE_CM0PLUS_H_DEPENDANT)) || \
+ defined(__DOXYGEN__)
/**
* @brief Macro defining the specific ARM architecture.
*/
@@ -115,7 +116,7 @@ */
#define PORT_CORE_VARIANT_NAME "Cortex-M0"
-#elif (CORTEX_MODEL == CORTEX_M0PLUS)
+#elif (CORTEX_MODEL == 0) && defined(__CORE_CM0PLUS_H_DEPENDANT)
#define PORT_ARCHITECTURE_ARM_v6M
#define PORT_ARCHITECTURE_NAME "ARMv6-M"
#define PORT_CORE_VARIANT_NAME "Cortex-M0+"
|