From: Brendan Jackman Date: Thu, 8 May 2014 14:50:44 +0000 (+0000) Subject: ArmPlatformPkg/ArmVExpressSecLibRTSM: Only use extended name of system registers... X-Git-Tag: edk2-stable201903~11489 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e691183822b324f30159d670b542746a83b55dde;hp=518c243d42731389502431a0fbf14b932f838888 ArmPlatformPkg/ArmVExpressSecLibRTSM: Only use extended name of system registers for GCC 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@15501 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S index 24ff2fc3d0..7d9c25c769 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S @@ -13,6 +13,7 @@ #include +#ifndef __clang__ // Register definitions used by GCC for GICv3 access. // These are defined by ARMCC, so keep them in the GCC specific code for now. #define ICC_SRE_EL2 S3_4_C12_C9_5 @@ -20,6 +21,7 @@ #define ICC_CTLR_EL1 S3_0_C12_C12_4 #define ICC_CTLR_EL3 S3_6_C12_C12_4 #define ICC_PMR_EL1 S3_0_C4_C6_0 +#endif .text .align 3