ArmPkg/ArmCpuLib: switch to ASM_FUNC() asm macro

Annotate functions with ASM_FUNC() so that they are emitted into
separate sections.

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/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S
index e5fbc86bc1c42f32671cdb38b22473eff9f47ae5..ba3d48f11f6ddf95c8fd17fdecf618c9ad6e024c 100644 (file)
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/AArch64/ArmCortexA5xHelper.S
@@ -14,16 +14,11 @@
 \r
 #include <AsmMacroIoLibV8.h>\r
 \r
-.text\r
-.align 3\r
-GCC_ASM_EXPORT (ArmReadCpuExCr)\r
-GCC_ASM_EXPORT (ArmWriteCpuExCr)\r
-\r
-ASM_PFX(ArmReadCpuExCr):\r
+ASM_FUNC(ArmReadCpuExCr)\r
   mrs   x0, S3_1_c15_c2_1\r
   ret\r
 \r
-ASM_PFX(ArmWriteCpuExCr):\r
+ASM_FUNC(ArmWriteCpuExCr)\r
   msr   S3_1_c15_c2_1, x0\r
   dsb   sy\r
   isb\r

diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
index 5db58619220636d3dfabcc3a620124cf1c18c3b4..365d57d7e8bd0f1f1497b8c26f7b7df6e63403ea 100644 (file)
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
@@ -12,17 +12,10 @@
 //\r
 \r
 #include <AsmMacroIoLib.h>\r
-#include <Library/ArmCpuLib.h>\r
-#include <Chipset/ArmCortexA9.h>\r
-\r
-.text\r
-.align 3\r
-\r
-GCC_ASM_EXPORT(ArmGetScuBaseAddress)\r
 \r
 // IN None\r
 // OUT r0 = SCU Base Address\r
-ASM_PFX(ArmGetScuBaseAddress):\r
+ASM_FUNC(ArmGetScuBaseAddress)\r
   // Read Configuration Base Address Register. ArmCBar cannot be called to get\r
   // the Configuration BAR as a stack is not necessary setup. The SCU is at the\r
   // offset 0x0000 from the Private Memory Region.\r