Merge pull request #5073 from studavekar/fix-buuld-error-armc6

use gcc assembly for arm 6
pull/5080/head
Anna Bridge 2017-09-12 11:01:16 +01:00 committed by GitHub
commit 5e437fe5ea
1 changed files with 2 additions and 2 deletions

View File

@ -74,13 +74,13 @@ static void delay_loop(uint32_t count)
: "cc" : "cc"
); );
} }
#else // GCC #elif defined ( __GNUC__ ) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
MBED_NOINLINE MBED_NOINLINE
static void delay_loop(uint32_t count) static void delay_loop(uint32_t count)
{ {
__asm__ volatile ( __asm__ volatile (
"%=:\n\t" "%=:\n\t"
#if defined(__thumb__) && !defined(__thumb2__) #if defined(__thumb__) && !defined(__thumb2__) && !defined(__ARMCC_VERSION)
"SUB %0, #1\n\t" "SUB %0, #1\n\t"
#else #else
"SUBS %0, %0, #1\n\t" "SUBS %0, %0, #1\n\t"