ArmPkg/SemihostLib: 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/SemihostLib/AArch64/GccSemihost.S b/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S
index 42211cf4ff8f377edb156d795163c5dc360d0b42..43a780c9ed3e9eb09ead5b312dc583ae5fca1097 100644 (file)
--- a/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S
+++ b/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S
@@ -13,11 +13,8 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.text\r
-.align 2\r
+#include <AsmMacroIoLibV8.h>\r
 \r
-.globl ASM_PFX(GccSemihostCall)\r
-\r
-ASM_PFX(GccSemihostCall):\r
+ASM_FUNC(GccSemihostCall)\r
   hlt     #0xf000\r
   ret\r

diff --git a/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S b/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S
index c9d13183f61ea94cd10d2faf036ba8602c50c66b..770e512cfbca9cd8e53af80bbdf3bac70c7db56b 100644 (file)
--- a/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S
+++ b/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S
@@ -12,11 +12,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.text\r
-.align 2\r
-\r
-.globl ASM_PFX(GccSemihostCall)\r
-INTERWORK_FUNC(GccSemihostCall)\r
+#include <AsmMacroIoLib.h>\r
 \r
 /*\r
   Semihosting operation request mechanism\r
@@ -32,7 +28,7 @@ INTERWORK_FUNC(GccSemihostCall)
        the svc lr register. That happens to be the one we are using, so we must\r
        save it or we will not be able to return.\r
  */\r
-ASM_PFX(GccSemihostCall):\r
+ASM_FUNC(GccSemihostCall)\r
   stmfd   sp!, {lr}\r
   svc     #0x123456\r
   ldmfd   sp!, {lr}\r