From adccced058d9637f117dc19dc7306afeccbdfa40 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 22 Dec 2025 21:15:30 +0100 Subject: [PATCH] BaseTools: Drop AArch64 definitions, Linker aligning and EBC info * Drop AArch64 definitions * Drop /ALIGN:32 from X64 linker flags * Drop ancient EBC compiler information Signed-off-by: Daniel Grobert --- BaseTools/Conf/tools_def.template | 42 +++---------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 57837fc11f..fc5a4da0ca 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -179,9 +179,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc # Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) # VS2026 -win32,win64- Requires: # Microsoft Visual Studio 2026 version 18.0 or later -# Optional: -# Required to build EBC drivers: -# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) # GCCNOLTO -Linux,Windows- Requires: # GCC 4.9 targeting x86_64-linux-gnu or aarch64-linux-gnu # Optional: @@ -929,46 +926,13 @@ NOOPT_VS2026_X64_NASM_FLAGS = -O0 -f win64 -g # Linker warning 4210 is disabled globally, because it checks if static initializers are present and the VCRuntime is # linked. We do not link the VCRuntime (except for HOST_APPLICATIONs) so this warning can be generated erroneously # whenever there are static initializers, because we will always fail the VCRuntime linking check - DEBUG_VS2026_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /ALIGN:4096 /DLL /WX /IGNORE:4210 -RELEASE_VS2026_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data /ALIGN:4096 /DLL /WX /IGNORE:4210 -NOOPT_VS2026_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /ALIGN:4096 /DLL /WX /IGNORE:4210 + DEBUG_VS2026_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /ALIGN:4096 /DLL /WX /IGNORE:4210 +RELEASE_VS2026_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data /ALIGN:4096 /DLL /WX /IGNORE:4210 +NOOPT_VS2026_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /ALIGN:4096 /DLL /WX /IGNORE:4210 # BaseTools cannot handle XIP modules with different section and file alignment *_VS2026_X64_DLINK_XIPFLAGS = /ALIGN:32 -##################### -# AARCH64 definitions -##################### -*_VS2026_AARCH64_CC_PATH = DEF(VS2026_BIN_AARCH64)\cl.exe -*_VS2026_AARCH64_VFRPP_PATH = DEF(VS2026_BIN_AARCH64)\cl.exe -*_VS2026_AARCH64_SLINK_PATH = DEF(VS2026_BIN_AARCH64)\lib.exe -*_VS2026_AARCH64_DLINK_PATH = DEF(VS2026_BIN_AARCH64)\link.exe -*_VS2026_AARCH64_APP_PATH = DEF(VS2026_BIN_AARCH64)\cl.exe -*_VS2026_AARCH64_PP_PATH = DEF(VS2026_BIN_AARCH64)\cl.exe -*_VS2026_AARCH64_ASM_PATH = DEF(VS2026_BIN_AARCH64)\armasm64.exe -*_VS2026_AARCH64_ASLCC_PATH = DEF(VS2026_BIN_AARCH64)\cl.exe -*_VS2026_AARCH64_ASLPP_PATH = DEF(VS2026_BIN_AARCH64)\cl.exe -*_VS2026_AARCH64_ASLDLINK_PATH = DEF(VS2026_BIN_AARCH64)\link.exe - - *_VS2026_AARCH64_MAKE_FLAGS = /nologo - DEBUG_VS2026_AARCH64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gw /Oi- -RELEASE_VS2026_AARCH64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /Oi- -NOOPT_VS2026_AARCH64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Od /Oi- - - DEBUG_VS2026_AARCH64_ASM_FLAGS = /nologo /g -RELEASE_VS2026_AARCH64_ASM_FLAGS = /nologo -NOOPT_VS2026_AARCH64_ASM_FLAGS = /nologo - -# Linker warning 4210 is disabled globally, because it checks if static initializers are present and the VCRuntime is -# linked. We do not link the VCRuntime (except for HOST_APPLICATIONs) so this warning can be generated erroneously -# whenever there are static initializers, because we will always fail the VCRuntime linking check - DEBUG_VS2026_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 -RELEASE_VS2026_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4226 /IGNORE:4254 /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 /MERGE:.rdata=.data /WX /IGNORE:4210 -NOOPT_VS2026_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 -*_VS2026_AARCH64_DLINK_XIPFLAGS = /ALIGN:64 - #################################################################################### # GCC Common ####################################################################################