ArmPkg/BaseMemoryLibVstm: 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/BaseMemoryLibVstm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
index 0a6e039af9dc1461ac2af2bf1e9b3b7a508d81ff..69de4c1fd48e6cff19e3bbe994fcf00b8e1c344c 100644 (file)
--- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
@@ -17,6 +17,8 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
+#include <AsmMacroIoLib.h>\r
+\r
 /**\r
   Copy Length bytes from Source to Destination. Overlap is OK.\r
 \r
@@ -37,11 +39,7 @@ InternalMemCopyMem (
   IN      UINTN                     Length\r
   )\r
 **/\r
-.text\r
-.align 2\r
-GCC_ASM_EXPORT(InternalMemCopyMem)\r
-\r
-ASM_PFX(InternalMemCopyMem):\r
+ASM_FUNC(InternalMemCopyMem)\r
   stmfd  sp!, {r4, r9, lr}\r
   tst  r0, #3\r
   mov  r4, r0\r

diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
index 6a6bb20ec14f7c96a4fa80d90281e6080e19c3b2..28ba38b79c6aa06fbadb9083c92509a547562ce4 100644 (file)
--- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
@@ -17,6 +17,8 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
+#include <AsmMacroIoLib.h>\r
+\r
 /**\r
   Set Buffer to Value for Size bytes.\r
 \r
@@ -34,12 +36,7 @@ InternalMemSetMem (
   IN      UINT8                     Value\r
   )\r
 **/\r
-\r
-.text\r
-.align 2\r
-GCC_ASM_EXPORT(InternalMemSetMem)\r
-\r
-ASM_PFX(InternalMemSetMem):\r
+ASM_FUNC(InternalMemSetMem)\r
   stmfd  sp!, {r4-r7, lr}\r
   tst    r0, #3\r
   movne  r3, #0\r