2 files changed, 4 insertions, 2 deletions

diff --git a/firmware/asm/arm/corelock.c b/firmware/asm/arm/corelock.c
index 07ec77a60e..a60299436f 100644
--- a/firmware/asm/arm/corelock.c
+++ b/firmware/asm/arm/corelock.c
@@ -61,7 +61,7 @@ int corelock_try_lock(struct corelock *cl)
 
     /* Relies on the fact that core IDs are complementary bitmasks (0x55,0xaa) */
     asm volatile (
-        ".syntax unified             \n"
+        BEGIN_ARM_ASM_SYNTAX_UNIFIED
         "mov    r1, %[id]            \n" /* r1 = PROCESSOR_ID */
         "ldrb   r1, [r1]             \n"
         "strb   r1, [%[cl], r1, lsr #7] \n" /* cl->myl[core] = core */
@@ -74,6 +74,7 @@ int corelock_try_lock(struct corelock *cl)
         "ands   %[rv], %[rv], r1     \n"
         "strbeq %[rv], [%[cl], r1, lsr #7] \n" /* if not, cl->myl[core] = 0 */
     "1:                              \n" /* Done */
+        END_ARM_ASM_SYNTAX_UNIFIED
         : [rv] "=r"(rval)
         : [id] "i" (&PROCESSOR_ID), [cl] "r" (cl)
         : "r1","r2","cc"
diff --git a/firmware/asm/arm/thread.c b/firmware/asm/arm/thread.c
index bd9f950616..30df56e0d9 100644
--- a/firmware/asm/arm/thread.c
+++ b/firmware/asm/arm/thread.c
@@ -73,7 +73,7 @@ static inline void store_context(void* addr)
 static inline void load_context(const void* addr)
 {
     asm volatile(
-        ".syntax unified                \n"
+        BEGIN_ARM_ASM_SYNTAX_UNIFIED
         "ldr     r0, [%0, #40]          \n" /* Load start pointer */
         "cmp     r0, #0                 \n" /* Check for NULL */
 
@@ -86,6 +86,7 @@ static inline void load_context(const void* addr)
 #endif
 
         "ldmia   %0, { r4-r11, sp, lr } \n" /* Load regs r4 to r14 from context */
+        END_ARM_ASM_SYNTAX_UNIFIED
         : : "r" (addr) : "r0" /* only! */
     );
 }