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

diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S
index 2bdaa3c951109f76760a03f9c362a7617f6ff7e6..6eef9d7667e3e0b33bf10fc30ac289c6f129be41 100644 (file)
--- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S
+++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S
@@ -99,8 +99,8 @@ find_memnode:
   /*\r
    * Check the DTB magic at offset 0\r
    */\r
-  movz  w4, #:abs_g0_nc:FDT_MAGIC\r
-  movk  w4, #:abs_g1:FDT_MAGIC\r
+  movz  w4, #(FDT_MAGIC & 0xffff)\r
+  movk  w4, #(FDT_MAGIC >> 16), lsl #16\r
   ldr  w5, [xDTP]\r
   cmp  w4, w5\r
   bne  err_invalid_magic\r