diff --git a/arch/arm/src/armv8-r/arm_fpuconfig.S b/arch/arm/src/armv8-r/arm_fpuconfig.S index 2986655fd67..0d2c8583a1c 100644 --- a/arch/arm/src/armv8-r/arm_fpuconfig.S +++ b/arch/arm/src/armv8-r/arm_fpuconfig.S @@ -50,7 +50,9 @@ ****************************************************************************/ .text +#ifndef __ghs__ .syntax unified +#endif .arm /**************************************************************************** diff --git a/arch/arm/src/armv8-r/arm_head.S b/arch/arm/src/armv8-r/arm_head.S index 36a5e0a7fba..57d3d5bbcc2 100644 --- a/arch/arm/src/armv8-r/arm_head.S +++ b/arch/arm/src/armv8-r/arm_head.S @@ -129,7 +129,9 @@ */ .text +#ifndef __ghs__ .syntax unified +#endif .arm .global __start #ifdef __ghs__ diff --git a/arch/arm/src/armv8-r/arm_saveusercontext.S b/arch/arm/src/armv8-r/arm_saveusercontext.S index b95f5858c65..6854d79397f 100644 --- a/arch/arm/src/armv8-r/arm_saveusercontext.S +++ b/arch/arm/src/armv8-r/arm_saveusercontext.S @@ -30,7 +30,9 @@ .file "arm_saveusercontext.S" .text +#ifndef __ghs__ .syntax unified +#endif .arm /**************************************************************************** diff --git a/arch/arm/src/armv8-r/arm_vectors.S b/arch/arm/src/armv8-r/arm_vectors.S index f9cf7f94fbe..db98d8bedec 100644 --- a/arch/arm/src/armv8-r/arm_vectors.S +++ b/arch/arm/src/armv8-r/arm_vectors.S @@ -137,7 +137,9 @@ ****************************************************************************/ .text +#ifndef __ghs__ .syntax unified +#endif .arm /**************************************************************************** diff --git a/arch/arm/src/armv8-r/arm_vectortab.S b/arch/arm/src/armv8-r/arm_vectortab.S index 5ea4de18c1a..90d424041f8 100644 --- a/arch/arm/src/armv8-r/arm_vectortab.S +++ b/arch/arm/src/armv8-r/arm_vectortab.S @@ -40,7 +40,9 @@ .eabi_attribute Tag_ABI_align_preserved, 1 #endif +#ifndef __ghs__ .syntax unified +#endif .arm .globl _sys_vector_start diff --git a/arch/arm/src/common/gnu/arm_fetchadd.S b/arch/arm/src/common/gnu/arm_fetchadd.S index 79eb592594f..7435bb501ed 100644 --- a/arch/arm/src/common/gnu/arm_fetchadd.S +++ b/arch/arm/src/common/gnu/arm_fetchadd.S @@ -26,7 +26,9 @@ #include +#ifndef __ghs__ .syntax unified +#endif .file "arm_fetchadd.S" /****************************************************************************