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>

diff --git a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S
index 99a1d21ce7f18f8e3fcf38cf4ac3e85f11d619d2..e9140a0a9bbae916c1f500a4f86f2e27acaacb22 100644 (file)
--- a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S
+++ b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S
@@ -1,6 +1,6 @@
 //\r
 //  Copyright (c) 2012-2014, ARM Limited. All rights reserved.\r
-//  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
+//  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.\r
 //\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
@@ -12,12 +12,9 @@
 //\r
 //\r
 \r
-.text\r
-.align 3\r
+#include <AsmMacroIoLibV8.h>\r
 \r
-GCC_ASM_EXPORT(ArmCallHvc)\r
-\r
-ASM_PFX(ArmCallHvc):\r
+ASM_FUNC(ArmCallHvc)\r
   // Push x0 on the stack - The stack must always be quad-word aligned\r
   str   x0, [sp, #-16]!\r
 \r

diff --git a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
index 25ceb6a7d8db60f1923346cb1b44ee222f4bf71a..be4693796f320d8f934cc4778895740928743a8b 100644 (file)
--- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
+++ b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
@@ -1,6 +1,6 @@
 //\r
 //  Copyright (c) 2012-2014, ARM Limited. All rights reserved.\r
-//  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
+//  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.\r
 //\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
@@ -12,13 +12,11 @@
 //\r
 //\r
 \r
-.text\r
-.align 3\r
-.arch_extension virt\r
+#include <AsmMacroIoLibV8.h>\r
 \r
-GCC_ASM_EXPORT(ArmCallHvc)\r
+.arch_extension virt\r
 \r
-ASM_PFX(ArmCallHvc):\r
+ASM_FUNC(ArmCallHvc)\r
     push    {r4-r8}\r
     // r0 will be popped just after the HVC call\r
     push    {r0}\r