| Message ID | 1470842282-8415-15-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 86a4d91bda59be0a8880983e159795b16f577292 |
| Headers | show |
diff --git a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S index 46c17674c199..a8dbb911de5e 100644 --- a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S +++ b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S @@ -11,12 +11,9 @@ // // -.text -.align 3 +#include <AsmMacroIoLibV8.h> -GCC_ASM_EXPORT(ArmCallSmc) - -ASM_PFX(ArmCallSmc): +ASM_FUNC(ArmCallSmc) // Push x0 on the stack - The stack must always be quad-word aligned str x0, [sp, #-16]! diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S index 260fb10fe86b..afb2e9bc901c 100644 --- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S +++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S @@ -11,13 +11,11 @@ // // -.text -.align 3 -.arch_extension sec +#include <AsmMacroIoLibV8.h> -GCC_ASM_EXPORT(ArmCallSmc) +.arch_extension sec -ASM_PFX(ArmCallSmc): +ASM_FUNC(ArmCallSmc) push {r4-r8} // r0 will be popped just after the SMC call push {r0}
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> --- ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S | 7 ++----- ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel