ArmPkg/BaseMemoryLibSm: 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/BaseMemoryLibStm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
index 7985b59279ba438ae80ea1b30cb5905d3b433fa8..f90589c225940f081e6588c23e596fabc608733e 100644 (file)
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/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-r11, lr}\r
   // Save the input parameters in extra registers (r11 = destination, r14 = source, r12 = length)\r
   mov  r11, r0\r

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
index 970d030ca36801000184e897ca10aeba0c383665..242de95f74d1152af3b38036b757a88fb2509432 100644 (file)
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/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
@@ -35,12 +37,9 @@ InternalMemSetMem (
   )\r
 **/\r
 \r
-.text\r
 .syntax unified\r
-.align 2\r
-GCC_ASM_EXPORT(InternalMemSetMem)\r
 \r
-ASM_PFX(InternalMemSetMem):\r
+ASM_FUNC(InternalMemSetMem)\r
   stmfd  sp!, {r4-r11, lr}\r
   tst    r0, #3\r
   movne  r3, #0\r