public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: <devel@edk2.groups.io>, <quic_rcran@quicinc.com>,
	"'Leif Lindholm'" <quic_llindhol@quicinc.com>,
	"'Ard Biesheuvel'" <ardb+tianocore@kernel.org>,
	"'Sami Mujawar'" <sami.mujawar@arm.com>,
	"'Gerd Hoffmann'" <kraxel@redhat.com>,
	"'Bob Feng'" <bob.c.feng@intel.com>,
	"'Yuwei Chen'" <yuwei.chen@intel.com>,
	"'Jiewen Yao'" <jiewen.yao@intel.com>,
	"'Jian J Wang'" <jian.j.wang@intel.com>,
	"'Xiaoyu Lu'" <xiaoyu1.lu@intel.com>,
	"'Guomin Jiang'" <guomin.jiang@intel.com>,
	"'Abner Chang'" <abner.chang@hpe.com>,
	"'Daniel Schaefer'" <daniel.schaefer@hpe.com>,
	"'Ray Ni'" <ray.ni@intel.com>,
	"'Michael D Kinney'" <michael.d.kinney@intel.com>,
	"'Zhiguang Liu'" <zhiguang.liu@intel.com>,
	"'Maciej Rabeda'" <maciej.rabeda@linux.intel.com>,
	"'Jiaxin Wu'" <jiaxin.wu@intel.com>,
	"'Siyuan Fu'" <siyuan.fu@intel.com>,
	"'Jordan Justen'" <jordan.l.justen@intel.com>,
	"'Anthony Perard'" <anthony.perard@citrix.com>,
	"'Julien Grall'" <julien@xen.org>
Subject: 回复: [edk2-devel] [PATCH 10/10] BaseTools: Remove RVCT support
Date: Thu, 5 May 2022 09:27:49 +0800	[thread overview]
Message-ID: <00d501d8601f$558c9980$00a5cc80$@byosoft.com.cn> (raw)
In-Reply-To: <20220503184820.19312-11-quic_rcran@quicinc.com>

Acked-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Rebecca Cran
> 发送时间: 2022年5月4日 2:48
> 收件人: devel@edk2.groups.io; Leif Lindholm <quic_llindhol@quicinc.com>;
> Ard Biesheuvel <ardb+tianocore@kernel.org>; Sami Mujawar
> <sami.mujawar@arm.com>; Gerd Hoffmann <kraxel@redhat.com>; Bob Feng
> <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Yuwei
> Chen <yuwei.chen@intel.com>; Jiewen Yao <jiewen.yao@intel.com>; Jian J
> Wang <jian.j.wang@intel.com>; Xiaoyu Lu <xiaoyu1.lu@intel.com>; Guomin
> Jiang <guomin.jiang@intel.com>; Abner Chang <abner.chang@hpe.com>;
> Daniel Schaefer <daniel.schaefer@hpe.com>; Ray Ni <ray.ni@intel.com>;
> Michael D Kinney <michael.d.kinney@intel.com>; Zhiguang Liu
> <zhiguang.liu@intel.com>; Maciej Rabeda <maciej.rabeda@linux.intel.com>;
> Jiaxin Wu <jiaxin.wu@intel.com>; Siyuan Fu <siyuan.fu@intel.com>; Jordan
> Justen <jordan.l.justen@intel.com>; Anthony Perard
> <anthony.perard@citrix.com>; Julien Grall <julien@xen.org>
> 抄送: Rebecca Cran <quic_rcran@quicinc.com>
> 主题: [edk2-devel] [PATCH 10/10] BaseTools: Remove RVCT support
> 
> RVCT is obsolete and no longer used.
> Remove support for it.
> 
> Signed-off-by: Rebecca Cran <quic_rcran@quicinc.com>
> ---
>  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 @@
>      <Command.MSFT, Command.INTEL>
>          "$(CC)" /Fo${dst} $(DEPS_FLAGS) $(CC_FLAGS) $(INC) ${src}
> 
> -    <Command.GCC, Command.RVCT>
> -        # For RVCTCYGWIN CC_FLAGS must be first to work around pathing
> issues
> +    <Command.GCC>
>          "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -c -o ${dst} $(INC) ${src}
> 
>      <Command.XCODE>
> @@ -145,7 +144,7 @@
>      <OutputFile>
>          $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
> 
> -    <Command.GCC, Command.RVCT>
> +    <Command.GCC>
>          "$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src}
> 
>  [C-Header-File]
> @@ -157,7 +156,7 @@
>      <Command>
> 
>  [Assembly-Code-File.COMMON.COMMON]
> -    <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>
> +    <InputFile.MSFT, InputFile.INTEL>
>          ?.asm, ?.Asm, ?.ASM
> 
>      <InputFile.GCC>
> @@ -175,16 +174,15 @@
>          Trim --source-code --convert-hex --trim-long -o
> ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii
>          "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC)
> ${d_path}(+)${s_base}.iiii
> 
> -    <Command.GCC, Command.RVCT>
> +    <Command.GCC>
>          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_path}(+)${s_base}.ii
> -        # For RVCTCYGWIN ASM_FLAGS must be first to work around
> pathing issues
>          "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii
> 
> 
> [Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH6
> 4]
>      # Remove --convert-hex for ARM as it breaks MSFT assemblers
> -    <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>
> +    <InputFile.MSFT, InputFile.INTEL>
>          ?.asm, ?.Asm, ?.ASM
> 
>      <InputFile.GCC>
> @@ -208,11 +206,10 @@
>          Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iiii
> ${d_path}(+)${s_base}.ii
>          "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC)
> ${d_path}(+)${s_base}.iiii
> 
> -    <Command.GCC, Command.RVCT>
> +    <Command.GCC>
>          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_path}(+)${s_base}.ii
> -        # For RVCTCYGWIN ASM_FLAGS must be first to work around
> pathing issues
>          "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii
> 
>  [Nasm-Assembly-Code-File.COMMON.COMMON]
> @@ -276,13 +273,6 @@
>          $(RM) ${dst}
>          "$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)
> 
> -    <Command.RVCT>
> -        "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)
> -
> -    <Command.RVCTCYGWIN>
> -        # $(OBJECT_FILES_LIST) has wrong paths for cygwin
> -        "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)
> -
>      <Command.XCODE>
>          "$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)
> 
> @@ -307,13 +297,6 @@
>          "$(DLINK)" -o ${dst} $(DLINK_FLAGS)
> -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS)
> $(DLINK2_FLAGS)
>          "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
> 
> -    <Command.RVCT>
> -        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via
> $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
> -
> -    <Command.RVCTCYGWIN>
> -        #$(STATIC_LIBRARY_FILES_LIST) has wrong paths for cygwin
> -        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH)
> $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
> -
>      <Command.XCODE>
>          "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist
> $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)
> 
> @@ -349,13 +332,6 @@
>      <Command.GCC>
>          "$(DLINK)" $(DLINK_FLAGS)
> -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group
> $(DLINK2_FLAGS)
> 
> -    <Command.RVCT>
> -        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via
> $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
> -
> -    <Command.RVCTCYGWIN>
> -        #$(STATIC_LIBRARY_FILES_LIST) has the wrong paths for cygwin
> -        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH)
> $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
> -
>      <Command.XCODE>
>          "$(DLINK)" -o ${dst} $(DLINK_FLAGS)  $(DLINK_SPATH) -filelist
> $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)
> 
> @@ -369,7 +345,7 @@
>          $(DEBUG_DIR)(+)$(MODULE_NAME).efi
>          $(OUTPUT_DIR)(+)$(MODULE_NAME).map
> 
> -    <Command.MSFT, Command.INTEL, Command.RVCT,
> Command.CLANGPDB>
> +    <Command.MSFT, Command.INTEL, Command.CLANGPDB>
>          "$(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 @@
>      <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC,
> OutputFile.CLANGPDB>
>          $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib
> 
> -    <OutputFile.XCODE, OutputFile.RVCT>
> +    <OutputFile.XCODE>
>          $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
> 
>      <Command.MSFT, Command.INTEL, Command.CLANGPDB>
> @@ -671,5 +647,5 @@
>      <Command.GCC>
>          "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g
> $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)
> $(GENFW_FLAGS)
>          "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
> ${dst}
> -    <Command.XCODE, Command.RVCT, Command.CLANGGCC>
> +    <Command.XCODE, Command.CLANGGCC>
>          "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g
> $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)
> $(GENFW_FLAGS)
> diff --git a/BaseTools/Conf/tools_def.template
> b/BaseTools/Conf/tools_def.template
> index 9c310cf23d25..5ed19810b727 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -333,24 +333,6 @@ DEFINE DTC_BIN                 =
> 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-3
> e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi
> -#                        Notes: Since this tool chain is obsolete, it
> doesn'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
> doesn'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
> directory
>  #
> 
> ##############################################################
> ######################
> @@ -361,7 +343,6 @@ DEFINE DTC_BIN                 =
> ENV(DTC_PREFIX)dtc
>  #   MSFT           - Microsoft
>  #   GCC            - GNU GCC
>  #   INTEL          - INTEL
> -#   RVCT           - ARM RealView Toolchain
> 
> ##############################################################
> ######################
> 
> ##############################################################
> ######################
>  #
> @@ -3012,144 +2993,6 @@ RELEASE_XCODE5_X64_ASM_FLAGS  = -arch
> x86_64
>    NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c
> -g -gdwarf -O0       -Wall -Werror -Wextra -include AutoGen.h
> -funsigned-char -fno-ms-extensions -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
> -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D
> NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
>  RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c
> -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char
> -fno-ms-extensions -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=undefined_behavior_has_been_optimized_away_by_clang -D
> NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)
> 
> -#############################################################
> #######################
> -#
> -# RVCT Common
> -#
> -#############################################################
> #######################
> -
> -DEFINE RVCT_ALL_ASM_FLAGS   = --diag_suppress=1786
> --diag_error=warning --apcs /interwork
> -DEFINE RVCT_ALL_CC_FLAGS    = --c90 --no_autoinline --asm --gnu --apcs
> /interwork --signed_chars --no_unaligned_access --split_sections
> --enum_is_int --preinclude AutoGen.h --diag_suppress=186,188,1,111,68
> --diag_warning 167 --diag_error=warning --diag_style=ide --protect_stack
> -DEFINE RVCT_ALL_DLINK_FLAGS = --no_scanlib --no_exceptions
> --datacompressor off --strict --symbols --diag_style=ide --no_legacyalign
> --scatter $(EDK_TOOLS_PATH)/Scripts/Rvct-Align32.sct
> -
> -#############################################################
> #######################
> -#
> -# ARM RealView Tools - Windows
> -#
> -#############################################################
> #######################
> -#   RVCT         - Tools from ARM
> -
> -*_RVCT_*_*_FAMILY          = RVCT
> -
> -#
> -# Use default values, or override in DSC file
> -#
> -*_RVCT_ARM_ARCHCC_FLAGS    = --thumb --fpu=softvfp
> -*_RVCT_ARM_ARCHASM_FLAGS   =
> -*_RVCT_ARM_ARCHDLINK_FLAGS =
> -*_RVCT_ARM_PLATFORM_FLAGS  = --cpu 7-A
> -
> -  DEBUG_RVCT_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS)
> DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list
> $(DEST_DIR_DEBUG)/$(BASE_NAME).map
> -RELEASE_RVCT_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS)
> DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list
> $(DEST_DIR_DEBUG)/$(BASE_NAME).map
> -
> -
> -*_RVCT_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS)
> $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
> -*_RVCT_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)
> -E --preinclude AutoGen.h
> -*_RVCT_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)
> -E  -DVFRCOMPILE --preinclude $(MODULE_NAME)StrDefs.h
> -*_RVCT_ARM_MAKE_PATH       = nmake /NOLOGO
> -*_RVCT_ARM_SLINK_FLAGS     = --partial -o
> -  DEBUG_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS)
> $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
> -RELEASE_RVCT_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)
> --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
> -
> -##################
> -# ARM definitions
> -##################
> -*_RVCT_ARM_CC_PATH         = ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCT_ARM_SLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
> -*_RVCT_ARM_DLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
> -*_RVCT_ARM_ASM_PATH        = ENV(RVCT_TOOLS_PATH)armasm
> -*_RVCT_ARM_PP_PATH         = ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCT_ARM_VFRPP_PATH      = ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCT_ARM_FROMELF_PATH    = ENV(RVCT_TOOLS_PATH)fromelf
> -
> -#############################################################
> #######################
> -#
> -# ARM RealView Tools - Linux
> -#
> -#############################################################
> #######################
> -#   RVCTLINUX         - Tools from ARM in a Cygwin environment
> -*_RVCTLINUX_*_*_FAMILY               = RVCT
> -*_RVCTLINUX_*_*_BUILDRULEFAMILY      = RVCTLINUX
> -
> -*_RVCTLINUX_*_MAKE_PATH       = make
> -
> -#
> -# Use default values, or override in DSC file
> -#
> -*_RVCTLINUX_ARM_ARCHCC_FLAGS    = --thumb --fpu=softvfp
> -*_RVCTLINUX_ARM_ARCHASM_FLAGS   =
> -*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =
> -*_RVCTLINUX_ARM_PLATFORM_FLAGS  = --cpu 7-A
> -
> -DEBUG_RVCTLINUX_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS)
> DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list
> $(DEST_DIR_DEBUG)/$(BASE_NAME).map
> -RELEASE_RVCTLINUX_ARM_DLINK_FLAGS   = $(ARCHDLINK_FLAGS)
> DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list
> $(DEST_DIR_DEBUG)/$(BASE_NAME).map
> -
> -*_RVCTLINUX_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS)
> $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
> -*_RVCTLINUX_ARM_PP_FLAGS        = $(ARCHCC_FLAGS)
> $(PLATFORM_FLAGS) -E
> -*_RVCTLINUX_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS)
> $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude
> $(MODULE_NAME)StrDefs.h
> -*_RVCTLINUX_ARM_SLINK_FLAGS     = --partial -o
> -  DEBUG_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS)
> $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
> -RELEASE_RVCTLINUX_ARM_CC_FLAGS  = $(ARCHCC_FLAGS)
> $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2
> -
> -##################
> -# ARM definitions
> -##################
> -*_RVCTLINUX_ARM_CC_PATH         = ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCTLINUX_ARM_SLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
> -*_RVCTLINUX_ARM_DLINK_PATH      = ENV(RVCT_TOOLS_PATH)armlink
> -*_RVCTLINUX_ARM_ASM_PATH        =
> ENV(RVCT_TOOLS_PATH)armasm
> -*_RVCTLINUX_ARM_PP_PATH         = ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCTLINUX_ARM_VFRPP_PATH      = ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCTLINUX_ARM_FROMELF_PATH    =
> ENV(RVCT_TOOLS_PATH)fromelf
> -
> -#############################################################
> #######################
> -#
> -# ARM RealView Tools - Cygwin
> -#
> -#############################################################
> #######################
> -#   ARMCYGWIN         - Tools from ARM in a Cygwin environment
> -
> -*_RVCTCYGWIN_*_*_FAMILY               = RVCT
> -*_RVCTCYGWIN_*_*_BUILDRULEFAMILY      = RVCTCYGWIN
> -
> -*_RVCTCYGWIN_ARM_CCPATH_FLAG         =
> ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCTCYGWIN_ARM_SLINKPATH_FLAG      =
> ENV(RVCT_TOOLS_PATH)armlink
> -*_RVCTCYGWIN_ARM_DLINKPATH_FLAG      =
> ENV(RVCT_TOOLS_PATH)armlink
> -*_RVCTCYGWIN_ARM_ASMPATH_FLAG        =
> ENV(RVCT_TOOLS_PATH)armasm
> -*_RVCTCYGWIN_ARM_PPPATH_FLAG         =
> ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG      =
> ENV(RVCT_TOOLS_PATH)armcc
> -*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG    =
> ENV(RVCT_TOOLS_PATH)fromelf
> -
> -#
> -# Use default values, or override in DSC file
> -#
> -*_RVCTCYGWIN_ARM_ARCHCC_FLAGS    = --thumb --fpu=softvfp
> -*_RVCTCYGWIN_ARM_ARCHASM_FLAGS   =
> -*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =
> -*_RVCTCYGWIN_ARM_PLATFORM_FLAGS  = --cpu 7-A
> -
> -  DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS     = "$(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     = "$(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       = "$(ASMPATH_FLAG)"
> $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)
> -*_RVCTCYGWIN_ARM_PP_FLAGS        = "$(CCPATH_FLAG)"
> $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
> -*_RVCTCYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)"
> $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude
> `cygpath -m $(MODULE_NAME)StrDefs.h`
> -*_RVCTCYGWIN_ARM_MAKE_PATH       = make
> -*_RVCTCYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial
> -o
> -  DEBUG_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)"
> $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
> -RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)"
> $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550
> DEF(RVCT_ALL_CC_FLAGS) -O2
> -
> -##################
> -# ARM definitions
> -##################
> -*_RVCTCYGWIN_ARM_CC_PATH         =
> ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
> -*_RVCTCYGWIN_ARM_SLINK_PATH      =
> ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
> -*_RVCTCYGWIN_ARM_DLINK_PATH      =
> ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
> -*_RVCTCYGWIN_ARM_ASM_PATH        =
> ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
> -*_RVCTCYGWIN_ARM_PP_PATH         =
> ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
> -*_RVCTCYGWIN_ARM_VFRPP_PATH      =
> ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
> -*_RVCTCYGWIN_ARM_FROMELF_PATH    =
> ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
> -
>  #################
>  # ASM 16 linker definitions
>  #################
> diff --git a/BaseTools/Scripts/Rvct-Align32.sct
> b/BaseTools/Scripts/Rvct-Align32.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.<BR>
> -
> -  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-Align4K.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.<BR>
> -
> -  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/Source/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
> 
> -#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
> 
>  //
>  //  Support for variable length argument lists using the ANSI standard.
> diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py
> b/BaseTools/Source/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
> families
>      #
> -    def __init__(self, File=None, Content=None, LineIndex=0,
> SupportedFamily=[TAB_COMPILER_MSFT, "INTEL", "GCC", "RVCT"]):
> +    def __init__(self, File=None, Content=None, LineIndex=0,
> SupportedFamily=[TAB_COMPILER_MSFT, "INTEL", "GCC"]):
>          self.RuleFile = 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"
>      }
> 
> -    _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I",
> "RVCT" : "-I", "NASM" : "-I"}
> +    _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I",
> "NASM" : "-I"}
> 
>      ## Constructor of BuildFile
>      #
> diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
> b/BaseTools/Source/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 = {TAB_COMPILER_MSFT:"nmake", "GCC":"gmake"}
>  #
> -# Regular expression for finding Include Directories, the difference
between
> MSFT and INTEL/GCC/RVCT
> +# Regular expression for finding Include Directories, the difference
between
> MSFT and INTEL/GCC
>  # is the former use /I , the Latter used -I to specify include
directories
>  #
>  gBuildOptIncludePatternMsft = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)",
> re.MULTILINE | re.DOTALL)
> @@ -684,12 +684,12 @@ class ModuleAutoGen(AutoGen):
>      @cached_property
>      def BuildOptionIncPathList(self):
>          #
> -        # Regular expression for finding Include Directories, the
difference
> between MSFT and INTEL/GCC/RVCT
> +        # Regular expression for finding Include Directories, the
difference
> between MSFT and INTEL/GCC
>          # is the former use /I , the Latter used -I to specify include
> directories
>          #
>          if self.PlatformInfo.ToolChainFamily in (TAB_COMPILER_MSFT):
>              BuildOptIncludeRegEx = gBuildOptIncludePatternMsft
> -        elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC',
'RVCT'):
> +        elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC'):
>              BuildOptIncludeRegEx = gBuildOptIncludePatternOther
>          else:
>              #
> @@ -704,16 +704,7 @@ class ModuleAutoGen(AutoGen):
>              except KeyError:
>                  FlagOption = ''
> 
> -            if self.ToolChainFamily != 'RVCT':
> -                IncPathList = [NormPath(Path, self.Macros) for Path in
> BuildOptIncludeRegEx.findall(FlagOption)]
> -            else:
> -                #
> -                # RVCT may specify a list of directory seperated by
> commas
> -                #
> -                IncPathList = []
> -                for Path in BuildOptIncludeRegEx.findall(FlagOption):
> -                    PathList = GetSplitList(Path, TAB_COMMA_SPLIT)
> -                    IncPathList.extend(NormPath(PathEntry,
> self.Macros) for PathEntry in PathList)
> +            IncPathList = [NormPath(Path, self.Macros) for Path in
> BuildOptIncludeRegEx.findall(FlagOption)]
> 
>              #
>              # EDK II modules must not reference header files outside of
> the packages they depend on or
> diff --git a/BaseTools/Source/Python/UPT/Library/DataType.py
> b/BaseTools/Source/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 = 5014
>  TOOL_FAMILY_LIST = ["MSFT",
>                      "INTEL",
>                      "GCC",
> -                    "RVCT"
>                      ]
> 
>  TYPE_HOB_SECTION = 'HOB'
> --
> 2.35.3
> 
> 
> 
> 
> 




  reply	other threads:[~2022-05-05  1:27 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-03 18:48 [PATCH 00/10] Multiple packages: Remove RVCT support Rebecca Cran
2022-05-03 18:48 ` [PATCH 01/10] ArmPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 02/10] ArmPlatformPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 03/10] CryptoPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 04/10] MdePkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 05/10] FatPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 06/10] NetworkPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 07/10] ArmVirtPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 08/10] EmbeddedPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 09/10] OvmfPkg: " Rebecca Cran
2022-05-03 18:48 ` [PATCH 10/10] BaseTools: " Rebecca Cran
2022-05-05  1:27   ` gaoliming [this message]
2022-05-09  0:20   ` Bob Feng
2022-05-03 19:13 ` [PATCH 00/10] Multiple packages: " Ard Biesheuvel
2022-05-04  9:00   ` [edk2-devel] " Leif Lindholm
2022-05-11 17:36   ` Rebecca Cran
2022-05-12  6:56     ` 回复: " gaoliming
     [not found]     ` <16EE493155EF5A09.4117@groups.io>
2022-05-14  1:10       ` 回复: [edk2-devel] " gaoliming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='00d501d8601f$558c9980$00a5cc80$@byosoft.com.cn' \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox