From 5bf512d380d0cd2ac5f3172bac29910011f6886d Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Tue, 11 Aug 2015 12:32:38 +0000 Subject: [PATCH] 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 Acked-by: Laszlo Ersek git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18202 6f19259b-4bc3-4df7-8a09-765794883524 --- .../ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S | 4 ++-- 1 file 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 -- 2.39.2