diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-10 14:34:17 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-11 12:29:31 +0200 |
| commit | de656e666c61d1484088d2c74d374206d36fd002 (patch) | |
| tree | 9b1992420702e15fb3ac66371d48308bf0e1bd63 | |
| parent | f0883e35dea778ffe8aa79e3fb387f197c4342a7 (diff) | |
| download | edk2-de656e666c61d1484088d2c74d374206d36fd002.tar.gz edk2-de656e666c61d1484088d2c74d374206d36fd002.tar.bz2 edk2-de656e666c61d1484088d2c74d374206d36fd002.zip | |
ArmPkg/ArmHvcLib: 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/ArmHvcLib/AArch64/ArmHvc.S | 9 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S index 99a1d21ce7..e9140a0a9b 100644 --- a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S +++ b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S @@ -1,6 +1,6 @@ //
// Copyright (c) 2012-2014, ARM Limited. All rights reserved.
-// Copyright (c) 2014, Linaro Limited. All rights reserved.
+// Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,12 +12,9 @@ //
//
-.text
-.align 3
+#include <AsmMacroIoLibV8.h>
-GCC_ASM_EXPORT(ArmCallHvc)
-
-ASM_PFX(ArmCallHvc):
+ASM_FUNC(ArmCallHvc)
// Push x0 on the stack - The stack must always be quad-word aligned
str x0, [sp, #-16]!
diff --git a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S index 25ceb6a7d8..be4693796f 100644 --- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S +++ b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S @@ -1,6 +1,6 @@ //
// Copyright (c) 2012-2014, ARM Limited. All rights reserved.
-// Copyright (c) 2014, Linaro Limited. All rights reserved.
+// Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -12,13 +12,11 @@ //
//
-.text
-.align 3
-.arch_extension virt
+#include <AsmMacroIoLibV8.h>
-GCC_ASM_EXPORT(ArmCallHvc)
+.arch_extension virt
-ASM_PFX(ArmCallHvc):
+ASM_FUNC(ArmCallHvc)
push {r4-r8}
// r0 will be popped just after the HVC call
push {r0}
|