BaseTools: Remove RVCT support

[mirror_edk2.git] / BaseTools / Conf / build_rule.template

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 435662351213f5de9fad85ea85134e0c57d6f991..5895b48fd88d8e1e4402405e3e8c9da111c84091 100755 (executable)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -128,8 +128,7 @@
     <Command.MSFT, Command.INTEL>\r
         "$(CC)" /Fo${dst} $(DEPS_FLAGS) $(CC_FLAGS) $(INC) ${src}\r
 \r
-    <Command.GCC, Command.RVCT>\r
-        # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues\r
+    <Command.GCC>\r
         "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -c -o ${dst} $(INC) ${src}\r
 \r
     <Command.XCODE>\r
@@ -145,7 +144,7 @@
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
 \r
-    <Command.GCC, Command.RVCT>\r
+    <Command.GCC>\r
         "$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src}\r
 \r
 [C-Header-File]\r
@@ -157,7 +156,7 @@
     <Command>\r
 \r
 [Assembly-Code-File.COMMON.COMMON]\r
-    <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>\r
+    <InputFile.MSFT, InputFile.INTEL>\r
         ?.asm, ?.Asm, ?.ASM\r
 \r
     <InputFile.GCC>\r
@@ -175,16 +174,15 @@
         Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
         "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iiii\r
 \r
-    <Command.GCC, Command.RVCT>\r
+    <Command.GCC>\r
         Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src}\r
         "$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.ii\r
         Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
-        # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
         "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii\r
 \r
 [Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64]\r
     # Remove --convert-hex for ARM as it breaks MSFT assemblers\r
-    <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>\r
+    <InputFile.MSFT, InputFile.INTEL>\r
         ?.asm, ?.Asm, ?.ASM\r
 \r
     <InputFile.GCC>\r
@@ -208,11 +206,10 @@
         Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
         "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iiii\r
 \r
-    <Command.GCC, Command.RVCT>\r
+    <Command.GCC>\r
         Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src}\r
         "$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.ii\r
         Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
-        # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
         "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii\r
 \r
 [Nasm-Assembly-Code-File.COMMON.COMMON]\r
@@ -276,13 +273,6 @@
         $(RM) ${dst}\r
         "$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)\r
     \r
-    <Command.RVCT>\r
-        "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)\r
-    \r
-    <Command.RVCTCYGWIN>\r
-        # $(OBJECT_FILES_LIST) has wrong paths for cygwin\r
-        "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)\r
-\r
     <Command.XCODE>\r
         "$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)\r
 \r
@@ -307,13 +297,6 @@
         "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) $(DLINK2_FLAGS)\r
         "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
 \r
-    <Command.RVCT>\r
-        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
-\r
-    <Command.RVCTCYGWIN>\r
-        #$(STATIC_LIBRARY_FILES_LIST) has wrong paths for cygwin\r
-        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)\r
-\r
     <Command.XCODE>\r
         "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)\r
     \r
@@ -349,13 +332,6 @@
     <Command.GCC>\r
         "$(DLINK)" $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(DLINK2_FLAGS)\r
 \r
-    <Command.RVCT>\r
-        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
-\r
-    <Command.RVCTCYGWIN>\r
-        #$(STATIC_LIBRARY_FILES_LIST) has the wrong paths for cygwin\r
-        "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)\r
-\r
     <Command.XCODE>\r
         "$(DLINK)" -o ${dst} $(DLINK_FLAGS)  $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)\r
       \r
@@ -369,7 +345,7 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
         $(OUTPUT_DIR)(+)$(MODULE_NAME).map\r
 \r
-    <Command.MSFT, Command.INTEL, Command.RVCT, Command.CLANGPDB>\r
+    <Command.MSFT, Command.INTEL, Command.CLANGPDB>\r
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
         $(CP) ${dst} $(DEBUG_DIR)\r
         $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
@@ -661,7 +637,7 @@
     <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC, OutputFile.CLANGPDB>\r
         $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib\r
 \r
-    <OutputFile.XCODE, OutputFile.RVCT>\r
+    <OutputFile.XCODE>\r
         $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc\r
 \r
     <Command.MSFT, Command.INTEL, Command.CLANGPDB>\r
@@ -671,5 +647,5 @@
     <Command.GCC>\r
         "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r
         "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}\r
-    <Command.XCODE, Command.RVCT, Command.CLANGGCC>\r
+    <Command.XCODE, Command.CLANGGCC>\r
         "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r