[edk2,2/2] ArmVirtPkg: use correct ASM decoration for non-function global symbols

Message ID 1436276165-17767-2-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel July 7, 2015, 1:36 p.m.
This fixes the declaration and definition of mSystemMemoryEnd so that it
is correctly annotated as a non-function symbol. Also adds the ASM_PFX
prefix, which is empty on AARCH64 but should be included for correctness.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
index 0adaf44c9ed9..f0cf865b3c93 100644
--- a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -25,10 +25,10 @@  GCC_ASM_IMPORT(ArmReadMpidr)
 GCC_ASM_IMPORT(ArmPlatformPeiBootAction)
 GCC_ASM_IMPORT(ArmPlatformStackSet)
 GCC_ASM_EXPORT(_ModuleEntryPoint)
-GCC_ASM_EXPORT(mSystemMemoryEnd)
+ASM_GLOBAL ASM_PFX(mSystemMemoryEnd)
 
-StartupAddr:        .8byte ASM_PFX(CEntryPoint)
-mSystemMemoryEnd:   .8byte 0
+StartupAddr:                  .8byte ASM_PFX(CEntryPoint)
+ASM_PFX(mSystemMemoryEnd):    .8byte 0
 
 ASM_PFX(_ModuleEntryPoint):
   //