ARM Packages: Use .8byte instead of .dword for pointers

Clang doesn't recognise .dword

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Brendan Jackman <brendan.jackman@arm.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15510 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S b/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S
index 42e359628099bdf4ff20063ef3fb7a116d9e3f3b..72111d1892e1f834fb1c9346df90954e9e3be509 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S
+++ b/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S
@@ -286,7 +286,7 @@ ASM_PFX(SErrorEntry):
 //\r
 .align 3\r
 ASM_PFX(CommonExceptionEntry):\r
-  .dword       ASM_PFX(AsmCommonExceptionEntry)\r
+  .8byte ASM_PFX(AsmCommonExceptionEntry)\r
 \r
 ASM_PFX(ExceptionHandlersEnd):\r
 \r

diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
index 05a823ba21a559c701e2d5fc96225ad6c055e787..b84190cf3fd48fd9d028b9c4950fc406ea07d33c 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
@@ -26,7 +26,7 @@ GCC_ASM_IMPORT(ArmReadMpidr)
 GCC_ASM_IMPORT(ArmPlatformPeiBootAction)\r
 GCC_ASM_EXPORT(_ModuleEntryPoint)\r
 \r
-StartupAddr: .dword    CEntryPoint\r
+StartupAddr: .8byte CEntryPoint\r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
   // Do early platform specific actions\r

diff --git a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
index 86b2f245919673b41b3fd3b06442d5ba3874d4e7..fcea9496cbd53ffad6159cc5275c7beaebbc392b 100644 (file)
--- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -25,7 +25,7 @@ GCC_ASM_IMPORT(ArmPlatformPeiBootAction)
 GCC_ASM_IMPORT(ArmPlatformStackSet)\r
 GCC_ASM_EXPORT(_ModuleEntryPoint)\r
 \r
-StartupAddr:        .dword       ASM_PFX(CEntryPoint)\r
+StartupAddr:        .8byte ASM_PFX(CEntryPoint)\r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
   // Do early platform specific actions\r

diff --git a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
index c16ede0831ee425d531b4031def584e69f413123..3512ccd84dd2636fb58f7d48ab954d7143ac26ce 100644 (file)
--- a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
@@ -29,7 +29,7 @@ GCC_ASM_IMPORT(ArmReadMpidr)
 GCC_ASM_IMPORT(ArmCallWFE)\r
 GCC_ASM_EXPORT(_ModuleEntryPoint)\r
 \r
-StartupAddr:        .dword       ASM_PFX(CEntryPoint)\r
+StartupAddr:        .8byte       ASM_PFX(CEntryPoint)\r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
 \r