BaseTools build_rule: Add .nasm => .obj build rule

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16017 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index de142de4bb9741b232990b27b865d183ec56b566..496fd666b19489ab824a50dabd66d9e2c5d0c019 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -170,6 +170,21 @@
         # 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, ?.Nasm, ?.NASM\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command>\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
+\r
 [Assembly-Code-File.COMMON.IPF]\r
     <InputFile>\r
         ?.s\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 824bc056b8cf323335970b6dd95a5e7f0be26240..15993ddf017e335a27a10e40f347df79e0d4c012 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -671,8 +671,6 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
 # Other Supported Tools\r
 # =====================\r
 #   NASM                 2.0.3   http://www.nasm.us/\r
-#                        Note: Converts NASM source to .bin. Object linking to\r
-#                              EDK II driver modules is not currently supported.\r
 #\r
 ####################################################################################\r
 ####################################################################################\r