BaseTools: Various typo

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3e6aa8ff0f34c8f8d4b26acb5cb3a4e012134e4f..760bfae812969dcef801bfed6f4f6a0896245b0f 100755 (executable)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -62,7 +62,8 @@
 #   $(BIN_DIR)          Common directory for executable files\r
 #   $(FV_DIR)           Directory to store flash image files\r
 #   $(INC)              Search path of current module\r
-#   $(INC_LIST)         A file containing search pathes of current module\r
+#   $(NASM_INC)         Search nasm file path of current module\r
+#   $(INC_LIST)         A file containing search paths of current module\r
 #   $(LIBS)             Static library files of current module\r
 #   $(<tool>_FLAGS)     Tools flags of current module\r
 #   $(MODULE_NAME)      Current module name\r
@@ -137,30 +138,6 @@
     <Command.XCODE>\r
         "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
 \r
-[C-Code-File.COMMON.IPF]\r
-    <InputFile>\r
-        ?.c\r
-        ?.C\r
-        ?.cc\r
-        ?.CC\r
-        ?.cpp\r
-        ?.Cpp\r
-        ?.CPP\r
-\r
-    <ExtraDependency>\r
-        $(MAKE_FILE)\r
-\r
-    <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
-\r
-    <Command.MSFT, Command.INTEL>\r
-        "$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}\r
-\r
-    <Command.GCC, Command.GCCLD, Command.RVCT>\r
-        # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues\r
-        "$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src}\r
-        "$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
-\r
 [C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]\r
     <InputFile>\r
         ?.c\r
@@ -182,7 +159,6 @@
 \r
     <Command>\r
 \r
-\r
 [Assembly-Code-File.COMMON.COMMON]\r
     <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>\r
         ?.asm, ?.Asm, ?.ASM\r
@@ -207,9 +183,13 @@
         # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
         "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii\r
 \r
-[Nasm-Assembly-Code-File.COMMON.COMMON]\r
-    <InputFile>\r
-        ?.nasm\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
+        ?.asm, ?.Asm, ?.ASM\r
+\r
+    <InputFile.GCC, InputFile.GCCLD>\r
+        ?.S, ?.s\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -217,14 +197,25 @@
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
 \r
-    <Command>\r
+    <Command.INTEL>\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
+\r
+    <Command.MSFT>\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
+\r
+    <Command.GCC, Command.GCCLD, Command.RVCT>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
         Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii\r
+        # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
+        "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii\r
 \r
-[Assembly-Code-File.COMMON.IPF]\r
+[Nasm-Assembly-Code-File.COMMON.COMMON]\r
     <InputFile>\r
-        ?.s\r
+        ?.nasm\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -232,11 +223,10 @@
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
 \r
-    <Command.MSFT, Command.INTEL>\r
+    <Command>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
-        "$(ASM)" $(ASM_FLAGS) -o ${dst} ${d_path}(+)${s_base}.iii\r
+        Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii\r
 \r
 [Device-Tree-Source-File]\r
     <InputFile>\r
@@ -249,8 +239,8 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb\r
 \r
     <Command.GCC>\r
-        "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i\r
+        "$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i\r
 \r
 [Visual-Form-Representation-File]\r
     <InputFile>\r
@@ -280,6 +270,7 @@
         "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)\r
 \r
     <Command.GCC, Command.GCCLD>\r
+        $(RM) ${dst}\r
         "$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)\r
     \r
     <Command.RVCT>\r
@@ -388,7 +379,7 @@
         $(OBJCOPY) --strip-unneeded -R .eh_frame ${src}\r
 \r
         #\r
-        #The below 2 lines are only needed for UNIXGCC tool chain, which genereates PE image directly\r
+        #The below 2 lines are only needed for UNIXGCC tool chain, which generates PE image directly\r
         #\r
         -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}\r
         -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug\r
@@ -488,8 +479,8 @@
     <Command.XCODE>        \r
         "$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj  $(ASLCC_FLAGS) $(INC) ${src}\r
         "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
-        "$(MTOC)" -subsystem $(MODULE_TYPE)  $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.efi\r
-        "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.efi $(GENFW_FLAGS)\r
+        "$(MTOC)" -subsystem $(MODULE_TYPE)  $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff\r
+        "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS)\r
       \r
       \r
 [Masm16-Code-File]\r