From 62604bb35c9abc158454ce336d30e69634a7a399 Mon Sep 17 00:00:00 2001 From: ccli8 Date: Fri, 27 Apr 2018 14:19:12 +0800 Subject: [PATCH] Fix compile error with MBED_MEM_TRACING_ENABLED and ARMC6 --- platform/mbed_retarget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mbed_retarget.cpp b/platform/mbed_retarget.cpp index 81cae4da56..1b14fd84e5 100644 --- a/platform/mbed_retarget.cpp +++ b/platform/mbed_retarget.cpp @@ -1374,7 +1374,7 @@ extern "C" void __cxa_guard_abort(int *guard_object_p) #endif -#if defined(MBED_MEM_TRACING_ENABLED) && (defined(__CC_ARM) || defined(__ICCARM__)) +#if defined(MBED_MEM_TRACING_ENABLED) && (defined(__CC_ARM) || defined(__ICCARM__) || (defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))) // If the memory tracing is enabled, the wrappers in mbed_alloc_wrappers.cpp // provide the implementation for these. Note: this needs to use the wrappers