summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-08-10 14:37:28 +0200
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2016-08-11 12:29:31 +0200
commit7589d9dbcfbfbe75cce4b402cdf81fed7e00b863 (patch)
tree6c71abe6495bb7c7627a536b7787a7bb6091ab07
parent8ca934aab50be35099039db69c206acb5bdb006c (diff)
downloadedk2-platforms-7589d9dbcfbfbe75cce4b402cdf81fed7e00b863.tar.xz
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>
-rw-r--r--ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S8
-rw-r--r--ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S9
2 files changed, 6 insertions, 11 deletions
diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
index 0a6e039af9..69de4c1fd4 100644
--- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
@@ -17,6 +17,8 @@
#
#------------------------------------------------------------------------------
+#include <AsmMacroIoLib.h>
+
/**
Copy Length bytes from Source to Destination. Overlap is OK.
@@ -37,11 +39,7 @@ InternalMemCopyMem (
IN UINTN Length
)
**/
-.text
-.align 2
-GCC_ASM_EXPORT(InternalMemCopyMem)
-
-ASM_PFX(InternalMemCopyMem):
+ASM_FUNC(InternalMemCopyMem)
stmfd sp!, {r4, r9, lr}
tst r0, #3
mov r4, r0
diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
index 6a6bb20ec1..28ba38b79c 100644
--- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
@@ -17,6 +17,8 @@
#
#------------------------------------------------------------------------------
+#include <AsmMacroIoLib.h>
+
/**
Set Buffer to Value for Size bytes.
@@ -34,12 +36,7 @@ InternalMemSetMem (
IN UINT8 Value
)
**/
-
-.text
-.align 2
-GCC_ASM_EXPORT(InternalMemSetMem)
-
-ASM_PFX(InternalMemSetMem):
+ASM_FUNC(InternalMemSetMem)
stmfd sp!, {r4-r7, lr}
tst r0, #3
movne r3, #0