[edk2] [PATCH 1/2] ArmPlatformPkg: use correct ASM decoration for non-function global symbols

[Ard Biesheuvel]

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 <***@linaro.org>
---
ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
index 2c4a7e5324e9..0d0e3e17c170 100644
--- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -24,10 +24,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):
// Do early platform specific actions

[Ard Biesheuvel]

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 <***@linaro.org>
---
ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

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):
//

[Olivier Martin]

Reviewed-By: Olivier Martin <***@arm.com>

-----Original Message-----
From: Ard Biesheuvel [mailto:***@linaro.org]
Sent: 07 July 2015 14:36
To: edk2-***@lists.sourceforge.net; Olivier Martin; ***@redhat.com
Cc: ***@linaro.org; Ard Biesheuvel
Subject: [PATCH 2/2] ArmVirtPkg: use correct ASM decoration for non-function global symbols

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 <***@linaro.org>
---
ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

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):
//
--
1.9.1


-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590
ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782

[Laszlo Ersek]

Post by Ard Biesheuvel
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
---
ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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
//

Reviewed-by: Laszlo Ersek <***@redhat.com>

[Olivier Martin]

Reviewed-By: Olivier Martin <***@arm.com>

Thanks Ard for catching this error!

-----Original Message-----
From: Ard Biesheuvel [mailto:***@linaro.org]
Sent: 07 July 2015 14:36
To: edk2-***@lists.sourceforge.net; Olivier Martin; ***@redhat.com
Cc: ***@linaro.org; Ard Biesheuvel
Subject: [PATCH 1/2] ArmPlatformPkg: use correct ASM decoration for non-function global symbols

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 <***@linaro.org>
---
ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
index 2c4a7e5324e9..0d0e3e17c170 100644
--- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -24,10 +24,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):
// Do early platform specific actions
--
1.9.1


-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590
ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782