From 1cb41e9715cce6abce9d0f4b4dcc32e590d78e61 Mon Sep 17 00:00:00 2001 From: Shrikant Tudavekar Date: Tue, 12 Sep 2017 00:37:30 -0500 Subject: [PATCH] use default macro for armcc --- TESTS/mbed_hal/flash/functional_tests/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TESTS/mbed_hal/flash/functional_tests/main.cpp b/TESTS/mbed_hal/flash/functional_tests/main.cpp index b6fa8cf740..156899410a 100644 --- a/TESTS/mbed_hal/flash/functional_tests/main.cpp +++ b/TESTS/mbed_hal/flash/functional_tests/main.cpp @@ -74,13 +74,13 @@ static void delay_loop(uint32_t count) : "cc" ); } -#else // GCC +#elif defined ( __GNUC__ ) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)) MBED_NOINLINE static void delay_loop(uint32_t count) { __asm__ volatile ( "%=:\n\t" -#if defined(__thumb__) && !defined(__thumb2__) && !defined(TOOLCHAIN_ARMC6) +#if defined(__thumb__) && !defined(__thumb2__) && !defined(__ARMCC_VERSION) "SUB %0, #1\n\t" #else "SUBS %0, %0, #1\n\t"