diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2022-11-17 12:08:31 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-11-24 15:15:41 +0000 |
| commit | 5e3798ca484b48843662c84967cc6ac88fa789dd (patch) | |
| tree | a8c972d01ac40965d6009db37d6e4ca40640da8c /src/arch/arm/memcpy.S | |
| parent | a9921bcadb7e8c179c656b7b115bce37cb45f0eb (diff) | |
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 <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63058
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/arch/arm/memcpy.S')
| -rw-r--r-- | src/arch/arm/memcpy.S | 8 |
1 files changed, 5 insertions, 3 deletions
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 <arch/asm.h> #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 ) |