ArmPkg/ArmSmcLib: 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/Library/ArmSmcLib/AArch64/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S
index 46c17674c199aae7fc94a0d62539b76bb6f41ac7..a8dbb911de5ea2b43ff93832da47682a346a18fb 100644 (file)
--- a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S
+++ b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S
@@ -11,12 +11,9 @@
 //\r
 //\r
 \r
-.text\r
-.align 3\r
+#include <AsmMacroIoLibV8.h>\r
 \r
-GCC_ASM_EXPORT(ArmCallSmc)\r
-\r
-ASM_PFX(ArmCallSmc):\r
+ASM_FUNC(ArmCallSmc)\r
   // Push x0 on the stack - The stack must always be quad-word aligned\r
   str   x0, [sp, #-16]!\r
 \r

diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
index 260fb10fe86b9bf696b8908967f48f51a7414892..afb2e9bc901c827ab1a5ac33c9bc2e3db8a5bc43 100644 (file)
--- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
+++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
@@ -11,13 +11,11 @@
 //\r
 //\r
 \r
-.text\r
-.align 3\r
-.arch_extension sec\r
+#include <AsmMacroIoLibV8.h>\r
 \r
-GCC_ASM_EXPORT(ArmCallSmc)\r
+.arch_extension sec\r
 \r
-ASM_PFX(ArmCallSmc):\r
+ASM_FUNC(ArmCallSmc)\r
     push    {r4-r8}\r
     // r0 will be popped just after the SMC call\r
     push    {r0}\r