diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-10 14:36:47 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-11 12:29:31 +0200 |
| commit | 86a4d91bda59be0a8880983e159795b16f577292 (patch) | |
| tree | 5df36de1d30359d6bd017a5f30fc14e3902bc11b | |
| parent | e4d37ada015fe4808eb451730bfa49167a6e3cbc (diff) | |
| download | edk2-platforms-86a4d91bda59be0a8880983e159795b16f577292.tar.xz | |
ArmPkg/ArmSmcLib: 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/ArmSmcLib/AArch64/ArmSmc.S | 7 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S index 46c17674c1..a8dbb911de 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 260fb10fe8..afb2e9bc90 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}
|