From 02ec228654b8e17d3966f29f99fde9cc22152d4d Mon Sep 17 00:00:00 2001 From: Vivian Nowka-Keane Date: Tue, 25 Mar 2025 15:14:03 -0700 Subject: [PATCH] BaseTools: Change arm align value from 32 to 64 Alignment needed to be updated to 64 because of a linker warning when building with MSVC. /ALIGN:64 is the minimum alignment for MSVC ARM64, which differs from MSVC x64. This was missed when checking into edk2 because CI isn't run for MSVC ARM64. Signed-off-by: Vivian Nowka-Keane --- BaseTools/Conf/tools_def.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 30db92fedf..cca699c4a8 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -868,7 +868,7 @@ RELEASE_VS2022_ARM_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4 NOOPT_VS2022_ARM_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /WX /IGNORE:4210 # BaseTools cannot handle XIP modules with different section and file alignment -*_VS2022_ARM_DLINK_XIPFLAGS = /ALIGN:32 +*_VS2022_ARM_DLINK_XIPFLAGS = /ALIGN:64 ##################### # AARCH64 definitions @@ -901,7 +901,7 @@ RELEASE_VS2022_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE: NOOPT_VS2022_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4226 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /DEBUG /WX /IGNORE:4210 # BaseTools cannot handle XIP modules with different section and file alignment -*_VS2022_AARCH64_DLINK_XIPFLAGS = /ALIGN:32 +*_VS2022_AARCH64_DLINK_XIPFLAGS = /ALIGN:64 #################################################################################### # GCC Common