diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-08-11 12:32:38 +0000 |
|---|---|---|
| committer | abiesheuvel <abiesheuvel@Edk2> | 2015-08-11 12:32:38 +0000 |
| commit | 5bf512d380d0cd2ac5f3172bac29910011f6886d (patch) | |
| tree | ca7614605dbecf153e12bf90672b338225f3bfb3 /ArmVirtPkg/Library/ArmXenRelocatablePlatformLib | |
| parent | 3d0a49ad47619c30c84bbee8a33f54b64dddbcec (diff) | |
| download | edk2-platforms-5bf512d380d0cd2ac5f3172bac29910011f6886d.tar.xz | |
ArmVirtPkg: avoid relocated immediates in AARCH64 asm
The relocated immediate notation supported by GNU as (e.g., #:lo12:foo)
is not supported by clang. Since we are loading a constant value, they
were not entirely appropriate here anyway, so simply replace them with
assembler arithmetic expressions.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18202 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmVirtPkg/Library/ArmXenRelocatablePlatformLib')
| -rw-r--r-- | ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S index 2bdaa3c951..6eef9d7667 100644 --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S @@ -99,8 +99,8 @@ find_memnode: /*
* Check the DTB magic at offset 0
*/
- movz w4, #:abs_g0_nc:FDT_MAGIC
- movk w4, #:abs_g1:FDT_MAGIC
+ movz w4, #(FDT_MAGIC & 0xffff)
+ movk w4, #(FDT_MAGIC >> 16), lsl #16
ldr w5, [xDTP]
cmp w4, w5
bne err_invalid_magic
|