From f8a9910c9bee387c143029c95524bc3d3286ae55 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Thu, 8 May 2014 14:59:50 +0000 Subject: [PATCH] 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 Reviewed-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15510 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S | 2 +- ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S | 2 +- ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S | 2 +- ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S b/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S index 42e3596280..72111d1892 100644 --- a/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S +++ b/ArmPkg/Drivers/CpuDxe/AArch64/ExceptionSupport.S @@ -286,7 +286,7 @@ ASM_PFX(SErrorEntry): // .align 3 ASM_PFX(CommonExceptionEntry): - .dword ASM_PFX(AsmCommonExceptionEntry) + .8byte ASM_PFX(AsmCommonExceptionEntry) ASM_PFX(ExceptionHandlersEnd): diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S index 05a823ba21..b84190cf3f 100644 --- a/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S +++ b/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S @@ -26,7 +26,7 @@ GCC_ASM_IMPORT(ArmReadMpidr) GCC_ASM_IMPORT(ArmPlatformPeiBootAction) GCC_ASM_EXPORT(_ModuleEntryPoint) -StartupAddr: .dword CEntryPoint +StartupAddr: .8byte CEntryPoint ASM_PFX(_ModuleEntryPoint): // Do early platform specific actions diff --git a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S index 86b2f24591..fcea9496cb 100644 --- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S @@ -25,7 +25,7 @@ GCC_ASM_IMPORT(ArmPlatformPeiBootAction) GCC_ASM_IMPORT(ArmPlatformStackSet) GCC_ASM_EXPORT(_ModuleEntryPoint) -StartupAddr: .dword ASM_PFX(CEntryPoint) +StartupAddr: .8byte ASM_PFX(CEntryPoint) ASM_PFX(_ModuleEntryPoint): // Do early platform specific actions diff --git a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S index c16ede0831..3512ccd84d 100644 --- a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S @@ -29,7 +29,7 @@ GCC_ASM_IMPORT(ArmReadMpidr) GCC_ASM_IMPORT(ArmCallWFE) GCC_ASM_EXPORT(_ModuleEntryPoint) -StartupAddr: .dword ASM_PFX(CEntryPoint) +StartupAddr: .8byte ASM_PFX(CEntryPoint) ASM_PFX(_ModuleEntryPoint):