From nobody Wed Feb 11 00:56:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89496+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89496+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1651603735; cv=none; d=zohomail.com; s=zohoarc; b=gw6/FTC0MxcxvfIOnD0+ceBoRpbc9KmemxT42EVlUZvHWrWaChebojrVjyLHanE7aoE1lm9xc8+P2SOt6cv/SZKu5cgz/4WCCm/5+pdAOicUHb9yomnCGC69fMIYJ9QPkDrlTBZoKE3CALF/QxdXBmqkJ9aFb07PI8C7+r22q0o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651603735; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=yQbalElndixcogJyDuBOItqmPAyzZ9RIxUQXORhxQr8=; b=ZSlsI0kCimerhKNO6/MxocshmIZDpvgCDmu11C5usANfpZdK6ele3zZv/aoISHm38OzLMkET8GvttE0xYTeBFfij2cJuM52B8B0hAdqs0gxDJS1xGKm/OxTfXIV0GPUNqjVI/rLC1Z/LQYKhc3CJkRNX3Zx5tlyyt1/RJs3nBMY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89496+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 165160373550619.974091919951547; Tue, 3 May 2022 11:48:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id e1fGYY1788612xlJqYvDcESi; Tue, 03 May 2022 11:48:54 -0700 X-Received: from alexa-out.qualcomm.com (alexa-out.qualcomm.com [129.46.98.28]) by mx.groups.io with SMTP id smtpd.web09.1058.1651603734239233712 for ; Tue, 03 May 2022 11:48:54 -0700 X-Received: from ironmsg08-lv.qualcomm.com ([10.47.202.152]) by alexa-out.qualcomm.com with ESMTP; 03 May 2022 11:48:54 -0700 X-QCInternal: smtphost X-Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg08-lv.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2022 11:48:53 -0700 X-Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 3 May 2022 11:48:52 -0700 X-Received: from linbox.ba.nuviainc.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 3 May 2022 11:48:51 -0700 From: "Rebecca Cran" To: , Leif Lindholm , "Ard Biesheuvel" , Sami Mujawar , Gerd Hoffmann , Bob Feng , "Liming Gao" , Yuwei Chen , "Jiewen Yao" , Jian J Wang , Xiaoyu Lu , Guomin Jiang , Abner Chang , Daniel Schaefer , Ray Ni , Michael D Kinney , "Zhiguang Liu" , Maciej Rabeda , Jiaxin Wu , Siyuan Fu , "Jordan Justen" , Anthony Perard , Julien Grall CC: Rebecca Cran Subject: [edk2-devel] [PATCH 10/10] BaseTools: Remove RVCT support Date: Tue, 3 May 2022 12:48:20 -0600 Message-ID: <20220503184820.19312-11-quic_rcran@quicinc.com> In-Reply-To: <20220503184820.19312-1-quic_rcran@quicinc.com> References: <20220503184820.19312-1-quic_rcran@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,quic_rcran@quicinc.com X-Gm-Message-State: qGvz9CfJFCy93zFroNlpYYQex1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651603734; bh=EsgUlmE5/uypVy9hPwFQ/3pC1yzVgPgr/dx+672qBQI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=VySkbm9ODsCHiVE0e++VLoTDQQyAKc0u6xXQH/6JeGYW1oHmmHk8dmVHqDmXW4MIVlM q3Zo2efofrgPbf6RyJTmwGZ+EJFOYm04hRCjXjtfCJZpy7gnOJO71m1uhgr1neUFEZvf1 B862ZZPVr9uZat0ML0I8g4yhs514IFsKrE4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651603737323100043 Content-Type: text/plain; charset="utf-8" RVCT is obsolete and no longer used. Remove support for it. Signed-off-by: Rebecca Cran Acked-by: Liming Gao Reviewed-by: Bob Feng --- BaseTools/Conf/build_rule.template | 42 ++---- BaseTools/Conf/tools_def.template | 157 -------------------- BaseTools/Scripts/Rvct-Align32.sct | 19 --- BaseTools/Scripts/Rvct-Align4K.sct | 19 --- BaseTools/Source/C/Include/Common/BaseTypes.h | 10 +- BaseTools/Source/Python/AutoGen/BuildEngine.py | 2 +- BaseTools/Source/Python/AutoGen/GenMake.py | 2 +- BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 17 +-- BaseTools/Source/Python/UPT/Library/DataType.py | 1 - 9 files changed, 16 insertions(+), 253 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index 435662351213..5895b48fd88d 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -128,8 +128,7 @@ "$(CC)" /Fo${dst} $(DEPS_FLAGS) $(CC_FLAGS) $(INC) ${src} =20 - - # For RVCTCYGWIN CC_FLAGS must be first to work around pathing iss= ues + "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -c -o ${dst} $(INC) ${src} =20 @@ -145,7 +144,7 @@ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj =20 - + "$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src} =20 [C-Header-File] @@ -157,7 +156,7 @@ =20 [Assembly-Code-File.COMMON.COMMON] - + ?.asm, ?.Asm, ?.ASM =20 @@ -175,16 +174,15 @@ Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_ba= se}.iiii ${d_path}(+)${s_base}.ii "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s= _base}.iiii =20 - + Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src} "$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_= base}.ii Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_p= ath}(+)${s_base}.ii - # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing is= sues "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii =20 [Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64] # Remove --convert-hex for ARM as it breaks MSFT assemblers - + ?.asm, ?.Asm, ?.ASM =20 @@ -208,11 +206,10 @@ Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iiii ${d_p= ath}(+)${s_base}.ii "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s= _base}.iiii =20 - + Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src} "$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_= base}.ii Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_p= ath}(+)${s_base}.ii - # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing is= sues "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii =20 [Nasm-Assembly-Code-File.COMMON.COMMON] @@ -276,13 +273,6 @@ $(RM) ${dst} "$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST) =20 - - "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST) - =20 - - # $(OBJECT_FILES_LIST) has wrong paths for cygwin - "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES) - "$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST) =20 @@ -307,13 +297,6 @@ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LI= BRARY_FILES_LIST),--end-group $(CC_FLAGS) $(DLINK2_FLAGS) "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} =20 - - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_= LIBRARY_FILES_LIST) $(DLINK2_FLAGS) - - - #$(STATIC_LIBRARY_FILES_LIST) has wrong paths for cygwin - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRAR= Y_FILES) $(DLINK2_FLAGS) - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STA= TIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) =20 @@ -349,13 +332,6 @@ "$(DLINK)" $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILE= S_LIST),--end-group $(DLINK2_FLAGS) =20 - - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_= LIBRARY_FILES_LIST) $(DLINK2_FLAGS) - - - #$(STATIC_LIBRARY_FILES_LIST) has the wrong paths for cygwin - "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRAR= Y_FILES) $(DLINK2_FLAGS) - "$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(ST= ATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) =20 @@ -369,7 +345,7 @@ $(DEBUG_DIR)(+)$(MODULE_NAME).efi $(OUTPUT_DIR)(+)$(MODULE_NAME).map =20 - + "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) $(CP) ${dst} $(DEBUG_DIR) $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @@ -661,7 +637,7 @@ $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib =20 - + $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc =20 @@ -671,5 +647,5 @@ "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} - + "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 9c310cf23d25..5ed19810b727 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -333,24 +333,6 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler (iasl.exe) from # https://acpica.org/downloads -# RVCT -win- Requires: -# ARM C/C++ Compiler, 5.00 -# Optional: -# Required to build EBC drivers: -# Intel(r) Compiler for Efi Byte Code (Intel= (r) EBC Compiler) -# Required to build platforms or ACPI tables: -# Microsoft ASL ACPI Compiler (asl.exe) v4.0= .0 from -# http://download.microsoft.com/download/2/c= /1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi -# Notes: Since this tool chain is obsolete, it does= n't enable the compiler option for included header file list generation, -# and lose the incremental build capability. -# RVCTLINUX -unix- Requires: -# ARM C/C++ Compiler, 5.00 -# Optional: -# Required to build platforms or ACPI tables: -# Intel(r) ACPI Compiler from -# https://acpica.org/downloads -# Notes: Since this tool chain is obsolete, it does= n't enable the compiler option for included header file list generation, -# and lose the incremental build capability. # * Commented out - All versions of VS2005 use the same standard install d= irectory # ##########################################################################= ########## @@ -361,7 +343,6 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # MSFT - Microsoft # GCC - GNU GCC # INTEL - INTEL -# RVCT - ARM RealView Toolchain ##########################################################################= ########## ##########################################################################= ########## # @@ -3012,144 +2993,6 @@ RELEASE_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 NOOPT_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -g -gdw= arf -O0 -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno= -ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implici= t-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missi= ng-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-vara= rgs -ftrap-function=3Dundefined_behavior_has_been_optimized_away_by_clang -= D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS) RELEASE_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -Os = -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-exte= nsions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float = -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field= -initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno= -unused-const-variable -ftrap-function=3Dundefined_behavior_has_been_optimi= zed_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS) =20 -##########################################################################= ########## -# -# RVCT Common -# -##########################################################################= ########## - -DEFINE RVCT_ALL_ASM_FLAGS =3D --diag_suppress=3D1786 --diag_error=3Dwarn= ing --apcs /interwork -DEFINE RVCT_ALL_CC_FLAGS =3D --c90 --no_autoinline --asm --gnu --apcs /= interwork --signed_chars --no_unaligned_access --split_sections --enum_is_i= nt --preinclude AutoGen.h --diag_suppress=3D186,188,1,111,68 --diag_warning= 167 --diag_error=3Dwarning --diag_style=3Dide --protect_stack -DEFINE RVCT_ALL_DLINK_FLAGS =3D --no_scanlib --no_exceptions --datacompres= sor off --strict --symbols --diag_style=3Dide --no_legacyalign --scatter $(= EDK_TOOLS_PATH)/Scripts/Rvct-Align32.sct - -##########################################################################= ########## -# -# ARM RealView Tools - Windows -# -##########################################################################= ########## -# RVCT - Tools from ARM - -*_RVCT_*_*_FAMILY =3D RVCT - -# -# Use default values, or override in DSC file -# -*_RVCT_ARM_ARCHCC_FLAGS =3D --thumb --fpu=3Dsoftvfp -*_RVCT_ARM_ARCHASM_FLAGS =3D -*_RVCT_ARM_ARCHDLINK_FLAGS =3D -*_RVCT_ARM_PLATFORM_FLAGS =3D --cpu 7-A - - DEBUG_RVCT_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK= _FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_= NAME).map -RELEASE_RVCT_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK= _FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_= NAME).map - - -*_RVCT_ARM_ASM_FLAGS =3D $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT= _ALL_ASM_FLAGS) -*_RVCT_ARM_PP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --prei= nclude AutoGen.h -*_RVCT_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFR= COMPILE --preinclude $(MODULE_NAME)StrDefs.h -*_RVCT_ARM_MAKE_PATH =3D nmake /NOLOGO -*_RVCT_ARM_SLINK_FLAGS =3D --partial -o - DEBUG_RVCT_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_= ALL_CC_FLAGS) -O1 -g -RELEASE_RVCT_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_su= ppress=3D550 DEF(RVCT_ALL_CC_FLAGS) -O2 - -################## -# ARM definitions -################## -*_RVCT_ARM_CC_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCT_ARM_SLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCT_ARM_DLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCT_ARM_ASM_PATH =3D ENV(RVCT_TOOLS_PATH)armasm -*_RVCT_ARM_PP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCT_ARM_VFRPP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCT_ARM_FROMELF_PATH =3D ENV(RVCT_TOOLS_PATH)fromelf - -##########################################################################= ########## -# -# ARM RealView Tools - Linux -# -##########################################################################= ########## -# RVCTLINUX - Tools from ARM in a Cygwin environment -*_RVCTLINUX_*_*_FAMILY =3D RVCT -*_RVCTLINUX_*_*_BUILDRULEFAMILY =3D RVCTLINUX - -*_RVCTLINUX_*_MAKE_PATH =3D make - -# -# Use default values, or override in DSC file -# -*_RVCTLINUX_ARM_ARCHCC_FLAGS =3D --thumb --fpu=3Dsoftvfp -*_RVCTLINUX_ARM_ARCHASM_FLAGS =3D -*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =3D -*_RVCTLINUX_ARM_PLATFORM_FLAGS =3D --cpu 7-A - -DEBUG_RVCTLINUX_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DL= INK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BA= SE_NAME).map -RELEASE_RVCTLINUX_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DL= INK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BA= SE_NAME).map - -*_RVCTLINUX_ARM_ASM_FLAGS =3D $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF= (RVCT_ALL_ASM_FLAGS) -*_RVCTLINUX_ARM_PP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -*_RVCTLINUX_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E = -DVFRCOMPILE --preinclude $(MODULE_NAME)StrDefs.h -*_RVCTLINUX_ARM_SLINK_FLAGS =3D --partial -o - DEBUG_RVCTLINUX_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(= RVCT_ALL_CC_FLAGS) -O1 -g -RELEASE_RVCTLINUX_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --di= ag_suppress=3D550 DEF(RVCT_ALL_CC_FLAGS) -O2 - -################## -# ARM definitions -################## -*_RVCTLINUX_ARM_CC_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTLINUX_ARM_SLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTLINUX_ARM_DLINK_PATH =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTLINUX_ARM_ASM_PATH =3D ENV(RVCT_TOOLS_PATH)armasm -*_RVCTLINUX_ARM_PP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTLINUX_ARM_VFRPP_PATH =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTLINUX_ARM_FROMELF_PATH =3D ENV(RVCT_TOOLS_PATH)fromelf - -##########################################################################= ########## -# -# ARM RealView Tools - Cygwin -# -##########################################################################= ########## -# ARMCYGWIN - Tools from ARM in a Cygwin environment - -*_RVCTCYGWIN_*_*_FAMILY =3D RVCT -*_RVCTCYGWIN_*_*_BUILDRULEFAMILY =3D RVCTCYGWIN - -*_RVCTCYGWIN_ARM_CCPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTCYGWIN_ARM_SLINKPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTCYGWIN_ARM_DLINKPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armlink -*_RVCTCYGWIN_ARM_ASMPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armasm -*_RVCTCYGWIN_ARM_PPPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)armcc -*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG =3D ENV(RVCT_TOOLS_PATH)fromelf - -# -# Use default values, or override in DSC file -# -*_RVCTCYGWIN_ARM_ARCHCC_FLAGS =3D --thumb --fpu=3Dsoftvfp -*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =3D -*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =3D -*_RVCTCYGWIN_ARM_PLATFORM_FLAGS =3D --cpu 7-A - - DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS =3D "$(DLINKPATH_FLAG)" $(ARCHDLINK= _FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list= `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` -RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS =3D "$(DLINKPATH_FLAG)" $(ARCHDLINK= _FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list= `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` - -*_RVCTCYGWIN_ARM_ASM_FLAGS =3D "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(= PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS) -*_RVCTCYGWIN_ARM_PP_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) -E -*_RVCTCYGWIN_ARM_VFRPP_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(MODULE_NAME)StrDe= fs.h` -*_RVCTCYGWIN_ARM_MAKE_PATH =3D make -*_RVCTCYGWIN_ARM_SLINK_FLAGS =3D "$(SLINKPATH_FLAG)" --partial -o - DEBUG_RVCTCYGWIN_ARM_CC_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g -RELEASE_RVCTCYGWIN_ARM_CC_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) --diag_suppress=3D550 DEF(RVCT_ALL_CC_FLAGS) -O2 - -################## -# ARM definitions -################## -*_RVCTCYGWIN_ARM_CC_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_SLINK_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_DLINK_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_ASM_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_PP_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_VFRPP_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py -*_RVCTCYGWIN_ARM_FROMELF_PATH =3D ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_N= T-5.1-i686/armcc_wrapper.py - ################# # ASM 16 linker definitions ################# diff --git a/BaseTools/Scripts/Rvct-Align32.sct b/BaseTools/Scripts/Rvct-Al= ign32.sct deleted file mode 100644 index d0969a1a9633..000000000000 --- a/BaseTools/Scripts/Rvct-Align32.sct +++ /dev/null @@ -1,19 +0,0 @@ -/** @file - - Copyright (c) 2015, Linaro Ltd. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -REGION 0x220 RELOC { - ER_RO +0 ALIGN 32 { - * (+RO) - } - ER_RW +0 ALIGN 32 { - * (+RW) - } - ER_ZI +0 { - * (+ZI) - } -} diff --git a/BaseTools/Scripts/Rvct-Align4K.sct b/BaseTools/Scripts/Rvct-Al= ign4K.sct deleted file mode 100644 index bf3738ac1cb4..000000000000 --- a/BaseTools/Scripts/Rvct-Align4K.sct +++ /dev/null @@ -1,19 +0,0 @@ -/** @file - - Copyright (c) 2015, Linaro Ltd. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -REGION 0x1000 RELOC { - ER_RO +0 ALIGN 4096 { - * (+RO) - } - ER_RW +0 ALIGN 4096 { - * (+RW) - } - ER_ZI +0 { - * (+ZI) - } -} diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Sour= ce/C/Include/Common/BaseTypes.h index 150980b4c0bf..e669da894c32 100644 --- a/BaseTools/Source/C/Include/Common/BaseTypes.h +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h @@ -57,15 +57,7 @@ #define NULL ((VOID *) 0) #endif =20 -#ifdef __CC_ARM - // - // Older RVCT ARM compilers don't fully support #pragma pack and require= __packed - // as a prefix for the structure. - // - #define PACKED __packed -#else - #define PACKED -#endif +#define PACKED =20 // // Support for variable length argument lists using the ANSI standard. diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Sou= rce/Python/AutoGen/BuildEngine.py index 722fead75af6..752a1a1f6a86 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -317,7 +317,7 @@ class BuildRule: # @param LineIndex The line number from which the parsing= will begin # @param SupportedFamily The list of supported tool chain famil= ies # - def __init__(self, File=3DNone, Content=3DNone, LineIndex=3D0, Support= edFamily=3D[TAB_COMPILER_MSFT, "INTEL", "GCC", "RVCT"]): + def __init__(self, File=3DNone, Content=3DNone, LineIndex=3D0, Support= edFamily=3D[TAB_COMPILER_MSFT, "INTEL", "GCC"]): self.RuleFile =3D File # Read build rules from file if it's not none if File is not None: diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index e55efff059f9..da406e6ff468 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -166,7 +166,7 @@ class BuildFile(object): GMAKE_FILETYPE : "include" } =20 - _INC_FLAG_ =3D {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I"= , "RVCT" : "-I", "NASM" : "-I"} + _INC_FLAG_ =3D {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I"= , "NASM" : "-I"} =20 ## Constructor of BuildFile # diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/S= ource/Python/AutoGen/ModuleAutoGen.py index 368a31047e82..d05410b32966 100755 --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py @@ -32,7 +32,7 @@ import tempfile ## Mapping Makefile type gMakeTypeMap =3D {TAB_COMPILER_MSFT:"nmake", "GCC":"gmake"} # -# Regular expression for finding Include Directories, the difference betwe= en MSFT and INTEL/GCC/RVCT +# Regular expression for finding Include Directories, the difference betwe= en MSFT and INTEL/GCC # is the former use /I , the Latter used -I to specify include directories # gBuildOptIncludePatternMsft =3D re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.M= ULTILINE | re.DOTALL) @@ -684,12 +684,12 @@ class ModuleAutoGen(AutoGen): @cached_property def BuildOptionIncPathList(self): # - # Regular expression for finding Include Directories, the differen= ce between MSFT and INTEL/GCC/RVCT + # Regular expression for finding Include Directories, the differen= ce between MSFT and INTEL/GCC # is the former use /I , the Latter used -I to specify include dir= ectories # if self.PlatformInfo.ToolChainFamily in (TAB_COMPILER_MSFT): BuildOptIncludeRegEx =3D gBuildOptIncludePatternMsft - elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT'): + elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC'): BuildOptIncludeRegEx =3D gBuildOptIncludePatternOther else: # @@ -704,16 +704,7 @@ class ModuleAutoGen(AutoGen): except KeyError: FlagOption =3D '' =20 - if self.ToolChainFamily !=3D 'RVCT': - IncPathList =3D [NormPath(Path, self.Macros) for Path in B= uildOptIncludeRegEx.findall(FlagOption)] - else: - # - # RVCT may specify a list of directory seperated by commas - # - IncPathList =3D [] - for Path in BuildOptIncludeRegEx.findall(FlagOption): - PathList =3D GetSplitList(Path, TAB_COMMA_SPLIT) - IncPathList.extend(NormPath(PathEntry, self.Macros) fo= r PathEntry in PathList) + IncPathList =3D [NormPath(Path, self.Macros) for Path in Build= OptIncludeRegEx.findall(FlagOption)] =20 # # EDK II modules must not reference header files outside of th= e packages they depend on or diff --git a/BaseTools/Source/Python/UPT/Library/DataType.py b/BaseTools/So= urce/Python/UPT/Library/DataType.py index bd216786a565..2033149aa6dc 100644 --- a/BaseTools/Source/Python/UPT/Library/DataType.py +++ b/BaseTools/Source/Python/UPT/Library/DataType.py @@ -939,7 +939,6 @@ MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF =3D 5014 TOOL_FAMILY_LIST =3D ["MSFT", "INTEL", "GCC", - "RVCT" ] =20 TYPE_HOB_SECTION =3D 'HOB' --=20 2.35.3 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89496): https://edk2.groups.io/g/devel/message/89496 Mute This Topic: https://groups.io/mt/90866296/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-