Skip to content

Commit 02ec228

Browse files
VivianNKmergify[bot]
authored andcommitted
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 <vnowkakeane@linux.microsoft.com>
1 parent 77b199b commit 02ec228

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

BaseTools/Conf/tools_def.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ RELEASE_VS2022_ARM_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4
868868
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
869869

870870
# BaseTools cannot handle XIP modules with different section and file alignment
871-
*_VS2022_ARM_DLINK_XIPFLAGS = /ALIGN:32
871+
*_VS2022_ARM_DLINK_XIPFLAGS = /ALIGN:64
872872

873873
#####################
874874
# AARCH64 definitions
@@ -901,7 +901,7 @@ RELEASE_VS2022_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:
901901
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
902902

903903
# BaseTools cannot handle XIP modules with different section and file alignment
904-
*_VS2022_AARCH64_DLINK_XIPFLAGS = /ALIGN:32
904+
*_VS2022_AARCH64_DLINK_XIPFLAGS = /ALIGN:64
905905

906906
####################################################################################
907907
# GCC Common

0 commit comments

Comments
 (0)