ArmPkg: remove LoadConstantXxx() asm macros

This is ancient cruft that is no longer used, so remove it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index 936e01e3388f2020501b0fc3209409682cf92162..16d2a307291c32aa8f8fc7c40834cedf6ebda627 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -19,39 +19,6 @@
 #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

diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc
index 4bc3146fb399bbb2d960aa609d9925284c548709..ce7a1488daea088c0b42b11790b589e5c7e21307 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLib.inc
+++ b/ArmPkg/Include/AsmMacroIoLib.inc
@@ -16,16 +16,6 @@
 ;**/\r
 \r
 \r
-  MACRO\r
-  LoadConstantMacro $Data\r
-  ldr  r0, =($Data)\r
-  MEND\r
-\r
-  MACRO\r
-  LoadConstantToRegMacro $Data, $Reg\r
-  ldr  $Reg, =($Data)\r
-  MEND\r
-\r
   MACRO\r
   adrll   $Reg, $Symbol\r
   add     $Reg, pc, #-8\r

diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/ArmPkg/Include/AsmMacroIoLibV8.h
index e9285f78e7d619ab4350ec5094f35e8a882cc6d8..db43d3b52e5a0ab80e509d48bef22110110f0685 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLibV8.h
+++ b/ArmPkg/Include/AsmMacroIoLibV8.h
@@ -42,36 +42,6 @@
         cbnz   SAFE_XREG, 1f        ;\\r
         b      .                    ;// We should never get here\r
 \r
-#if defined(__clang__)\r
-\r
-// load x0 with _Data\r
-#define LoadConstant(_Data)              \\r
-  ldr  x0, 1f                          ; \\r
-  b    2f                              ; \\r
-.align(8)                              ; \\r
-1:                                       \\r
-  .8byte (_Data)                       ; \\r
-2:\r
-\r
-// load _Reg with _Data\r
-#define LoadConstantToReg(_Data, _Reg)    \\r
-  ldr  _Reg, 1f                         ; \\r
-  b    2f                               ; \\r
-.align(8)                               ; \\r
-1:                                        \\r
-  .8byte (_Data)                        ; \\r
-2:\r
-\r
-#elif defined (__GNUC__)\r
-\r
-#define LoadConstant(Data) \\r
-  ldr  x0, =Data\r
-\r
-#define LoadConstantToReg(Data, Reg) \\r
-  ldr  Reg, =Data\r
-\r
-#endif // __GNUC__\r
-\r
 #define _ASM_FUNC(Name, Section)    \\r
   .global   Name                  ; \\r
   .section  #Section, "ax"        ; \\r