From 5e3798ca484b48843662c84967cc6ac88fa789dd Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 17 Nov 2022 12:08:31 +0100 Subject: arch/arm: Use unified assembly syntax Taken from Linux which also updated these files. Clang only works with this syntax, so this fixes builds for arm. TESTED on qemu vexpress-a9 and verstage on google/vilboz with BUILD_TIMELESS=1, binaries remain the same. Change-Id: Ia320dc2c460c99d934b8f17dee7748a9def4e750 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/63058 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) --- src/arch/arm/memcpy.S | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/arch/arm/memcpy.S') diff --git a/src/arch/arm/memcpy.S b/src/arch/arm/memcpy.S index d5e28ac147..b46944a9bd 100644 --- a/src/arch/arm/memcpy.S +++ b/src/arch/arm/memcpy.S @@ -6,6 +6,8 @@ #include #include "asmlib.h" +.syntax unified + #define LDR1W_SHIFT 0 #define STR1W_SHIFT 0 @@ -22,7 +24,7 @@ .endm .macro ldr1b ptr reg cond=al abort - ldr\cond\()b \reg, [\ptr], #1 + ldrb\cond \reg, [\ptr], #1 .endm .macro str1w ptr reg abort @@ -34,7 +36,7 @@ .endm .macro str1b ptr reg cond=al abort - str\cond\()b \reg, [\ptr], #1 + strb\cond \reg, [\ptr], #1 .endm .macro enter reg1 reg2 @@ -197,7 +199,7 @@ ENTRY(memcpy) orr r9, r9, ip, push #\push mov ip, ip, pull #\pull orr ip, ip, lr, push #\push - str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f + str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f bge 12b PLD( cmn r2, #96 ) PLD( bge 13b ) -- cgit v1.2.3