ArmPkg: Add support for GICv4

[mirror_edk2.git] / ArmPkg / Include / AsmMacroIoLib.h

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index fb73ea9a46945b1f743a4b1d99999988a78b553c..16d2a307291c32aa8f8fc7c40834cedf6ebda627 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -19,43 +19,11 @@
 #ifndef __MACRO_IO_LIB_H__\r
 #define __MACRO_IO_LIB_H__\r
 \r
-#if defined(__APPLE__)\r
-\r
-//\r
-//  ldr reg, =expr does not work with current Apple tool chain. So do the work our selves\r
-//\r
-\r
-// load _Reg with _Data\r
-#define LoadConstantToReg(_Data, _Reg)  \\r
-  ldr  _Reg, [pc, #0]   ;               \\r
-  b    1f               ;               \\r
-  .long (_Data)         ;               \\r
-1:\r
-\r
-#elif defined (__GNUC__)\r
-\r
-#define LoadConstantToReg(Data, Reg) \\r
-  ldr  Reg, =Data\r
-\r
-#else\r
-\r
-//\r
-// Use ARM assembly macros, form armasam\r
-//\r
-//  Less magic in the macros if ldr reg, =expr works\r
-//\r
-\r
-// load _Reg with _Data\r
-\r
-\r
-#define LoadConstantToReg(Data, Reg)  LoadConstantToRegMacro Data, Reg\r
-\r
-#endif\r
-\r
 #define _ASM_FUNC(Name, Section)    \\r
   .global   Name                  ; \\r
   .section  #Section, "ax"        ; \\r
   .type     Name, %function       ; \\r
+  .p2align  2                     ; \\r
   Name:\r
 \r
 #define ASM_FUNC(Name)            _ASM_FUNC(ASM_PFX(Name), .text. ## Name)\r