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.biesheu...@linaro.org>
---
 ArmVirtPkg/Library/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 2bdaa3c95110..6eef9d7667e3 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
-- 
1.9.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to