From 7589d9dbcfbfbe75cce4b402cdf81fed7e00b863 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 10 Aug 2016 14:37:28 +0200 Subject: 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 Reviewed-by: Leif Lindholm --- ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S | 8 +++----- ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'ArmPkg/Library') 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 + /** 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 + /** 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 -- cgit v1.2.3