Skip to content

Commit 5e437fe

Browse files
authored
Merge pull request #5073 from studavekar/fix-buuld-error-armc6
use gcc assembly for arm 6
2 parents de6d291 + 1cb41e9 commit 5e437fe

File tree

1 file changed

+2
-2
lines changed
  • TESTS/mbed_hal/flash/functional_tests

1 file changed

+2
-2
lines changed

TESTS/mbed_hal/flash/functional_tests/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ static void delay_loop(uint32_t count)
7474
: "cc"
7575
);
7676
}
77-
#else // GCC
77+
#elif defined ( __GNUC__ ) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
7878
MBED_NOINLINE
7979
static void delay_loop(uint32_t count)
8080
{
8181
__asm__ volatile (
8282
"%=:\n\t"
83-
#if defined(__thumb__) && !defined(__thumb2__)
83+
#if defined(__thumb__) && !defined(__thumb2__) && !defined(__ARMCC_VERSION)
8484
"SUB %0, #1\n\t"
8585
#else
8686
"SUBS %0, %0, #1\n\t"

0 commit comments

Comments
 (0)