Revision: 16017
http://sourceforge.net/p/edk2/code/16017
Author: jljusten
Date: 2014-09-01 17:22:51 +0000 (Mon, 01 Sep 2014)
Log Message:
-----------
BaseTools build_rule: Add .nasm => .obj build rule
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Conf/build_rule.template
trunk/edk2/BaseTools/Conf/tools_def.template
Modified: trunk/edk2/BaseTools/Conf/build_rule.template
===================================================================
--- trunk/edk2/BaseTools/Conf/build_rule.template 2014-09-01 17:07:19 UTC
(rev 16016)
+++ trunk/edk2/BaseTools/Conf/build_rule.template 2014-09-01 17:22:51 UTC
(rev 16017)
@@ -170,6 +170,21 @@
# For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
+[Nasm-Assembly-Code-File.COMMON.COMMON]
+ <InputFile>
+ ?.nasm, ?.Nasm, ?.NASM
+
+ <ExtraDependency>
+ $(MAKE_FILE)
+
+ <OutputFile>
+ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
+
+ <Command>
+ "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
+ Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii
${d_path}(+)${s_base}.i
+ "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst
${d_path}(+)${s_base}.iii
+
[Assembly-Code-File.COMMON.IPF]
<InputFile>
?.s
Modified: trunk/edk2/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/edk2/BaseTools/Conf/tools_def.template 2014-09-01 17:07:19 UTC
(rev 16016)
+++ trunk/edk2/BaseTools/Conf/tools_def.template 2014-09-01 17:22:51 UTC
(rev 16017)
@@ -671,8 +671,6 @@
# Other Supported Tools
# =====================
# NASM 2.0.3 http://www.nasm.us/
-# Note: Converts NASM source to .bin. Object linking to
-# EDK II driver modules is not currently
supported.
#
####################################################################################
####################################################################################
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
