On Tue, Aug 19, 2014 at 6:59 PM, Gao, Liming <liming....@intel.com> wrote: > Jordan: > Minor comments. NASM version could be 2.0.3 or later.
Ok. I notice for IASL, we specify a single version: v20101013. Should we consider moving IASL to the new 'Other Supported Tools' rather than duplicating it for each toolchain? We could then also add 'or later' for IASL. -Jordan > -----Original Message----- > From: Jordan Justen [mailto:jordan.l.jus...@intel.com] > Sent: Wednesday, August 20, 2014 7:58 AM > To: edk2-devel@lists.sourceforge.net > Subject: [edk2] [PATCH 2/8] BaseTools/build_rule: Add .nasm => .obj build rule > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> > --- > BaseTools/Conf/build_rule.template | 15 +++++++++++++++ > BaseTools/Conf/tools_def.template | 2 -- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/BaseTools/Conf/build_rule.template > b/BaseTools/Conf/build_rule.template > index 55f56c2..7a8275e 100644 > --- 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 > "$(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 > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index f2aae84..448d282 100644 > --- 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 # > ===================== > # 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. > # > > #################################################################################### > > #################################################################################### > -- > 2.1.0 > > > ------------------------------------------------------------------------------ > Slashdot TV. > Video for Nerds. Stuff that matters. > http://tv.slashdot.org/ > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel > > ------------------------------------------------------------------------------ > Slashdot TV. > Video for Nerds. Stuff that matters. > http://tv.slashdot.org/ > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
