On 05/20/14 20:56, Jordan Justen wrote:
> On Tue, May 20, 2014 at 12:41 AM, Laszlo Ersek <ler...@redhat.com> wrote:
>> On 05/19/14 23:27, Jordan Justen wrote:
>>> Contributed-under: TianoCore Contribution Agreement 1.0
>>> Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com>
>>> ---
>>> BaseTools/Conf/build_rule.template | 19 ++++++++++++++++++-
>>> BaseTools/Conf/tools_def.template | 8 +++++++-
>>> 2 files changed, 25 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/BaseTools/Conf/build_rule.template
>>> b/BaseTools/Conf/build_rule.template
>>> index 6537108..fc9e501 100644
>>> --- a/BaseTools/Conf/build_rule.template
>>> +++ b/BaseTools/Conf/build_rule.template
>>> @@ -1,5 +1,5 @@
>>> #
>>> -# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
>>> +# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
>>> # Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
>>> # This program and the accompanying materials
>>> # are licensed and made available under the terms and conditions of the
>>> BSD License
>>> @@ -439,6 +439,23 @@
>>> otool -t $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib | hex2bin.py
>>> ${dst}
>>>
>>>
>>> +[Nasm-to-Binary-Code-File]
>>> + <InputFile>
>>> + ?.nasmbin, ?.NASMBIN
>>> +
>>> + <ExtraDependency>
>>> + $(MAKE_FILE)
>>> +
>>> + <OutputFile>
>>> + $(OUTPUT_DIR)(+)${s_base}.bin
>>> +
>>> + <Command>
>>> + "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
>>> + Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii
>>> ${d_path}(+)${s_base}.i
>>> + cd $(OUTPUT_DIR)(+)${s_dir}
>>> + "$(NASM)" -I${s_path}(+) $(NASMBIN_FLAGS) -o $dst
>>> ${d_path}(+)${s_base}.iii
>>> +
>>> +
>>> [Microcode-File.USER_DEFINED, Microcode-File.Microcode]
>>> <InputFile>
>>> ?.txt, ?.TXT, ?.Txt, ?.mut, ?.inc
>>> diff --git a/BaseTools/Conf/tools_def.template
>>> b/BaseTools/Conf/tools_def.template
>>> index a68218d..0915033 100644
>>> --- a/BaseTools/Conf/tools_def.template
>>> +++ b/BaseTools/Conf/tools_def.template
>>> @@ -1,5 +1,5 @@
>>> #
>>> -# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
>>> +# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
>>> # Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
>>> # Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
>>> #
>>> @@ -5912,3 +5912,9 @@ RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS =
>>> $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC
>>> ##################
>>> *_*_*_VPDTOOL_PATH = BPDG
>>> *_*_*_VPDTOOL_GUID = 8C3D856A-9BE6-468E-850A-24F7A8D38E08
>>> +
>>> +##################
>>> +# NASM tool definitions
>>> +##################
>>> +*_*_*_NASM_PATH = nasm
>>> +*_*_*_NASMBIN_FLAGS = -f bin
>>>
>>
>> nitpick (not important): can you just call the suffix .nasm?
>>
>> ".nasmbin" seems to imply it's a binary file.
>
> nasmbin uses nasm -f bin to produce a binary file.
>
> I would think .nasm might be more useful for running nasm to produce
> an object file for linking to driver code.
>
> I'm open to other suggestions. I had also considered .nasm2bin, .n2b and
> .a2b...
Aaah I see. You encode the nasm target ("output file format") in the
source file suffix, because the suffix selects the build rule, and we
might want to use nasm for different outputs. Makes sense. No need to
change it as far as I'm concerned.
The patch seems sane to me (although I'm not a BaseTools expert :)), so
take it FWIW:
Reviewed-by: Laszlo Ersek <ler...@redhat.com>
Thanks
Laszlo
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
