Revision: 18202
          http://sourceforge.net/p/edk2/code/18202
Author:   abiesheuvel
Date:     2015-08-11 12:32:38 +0000 (Tue, 11 Aug 2015)
Log Message:
-----------
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 <[email protected]>
Acked-by: Laszlo Ersek <[email protected]>

Modified Paths:
--------------
    
trunk/edk2/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S

Modified: 
trunk/edk2/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S
===================================================================
--- 
trunk/edk2/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S
  2015-08-11 11:07:17 UTC (rev 18201)
+++ 
trunk/edk2/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S
  2015-08-11 12:32:38 UTC (rev 18202)
@@ -99,8 +99,8 @@
   /*
    * 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


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to