* [Patch 2/2] BaseTools: Update nasm file build rule to support $(INC)
2018-10-25 7:37 [Patch 0/2] Update .nasm to support $(INC)-like support Yonghong Zhu
@ 2018-10-25 7:37 ` Yonghong Zhu
0 siblings, 0 replies; 5+ messages in thread
From: Yonghong Zhu @ 2018-10-25 7:37 UTC (permalink / raw)
To: edk2-devel; +Cc: zhijufan, Liming Gao
From: zhijufan <zhijux.fan@intel.com>
Update the build rule to:
"$(NASM)" -I${s_path}(+) $(NASM_INC)(+) $(NASM_FLAGS)
-o $dst ${d_path}(+)${s_base}.iii
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
BaseTools/Conf/build_rule.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index ed54a55..7c4b9e6 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -223,11 +223,11 @@
$(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
+ "$(NASM)" -I${s_path}(+) $(NASM_INC)(+) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
[Device-Tree-Source-File]
<InputFile>
?.dts
--
2.6.1.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Patch 0/2] Update .nasm to support $(INC)-like support
@ 2018-12-14 1:47 Yonghong Zhu
2018-12-14 1:47 ` [PATCH] BaseTools: Add $(INC)-like support when compiling .nasm files Yonghong Zhu
2018-12-14 1:47 ` [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC) Yonghong Zhu
0 siblings, 2 replies; 5+ messages in thread
From: Yonghong Zhu @ 2018-12-14 1:47 UTC (permalink / raw)
To: edk2-devel; +Cc: zhijufan, Liming Gao, Bob Feng
From: zhijufan <zhijux.fan@intel.com>
Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1085
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
zhijufan (2):
BaseTools: Add $(INC)-like support when compiling .nasm files
BaseTools: Update nasm file build rule to support $(INC)
BaseTools/Conf/build_rule.template | 3 +-
BaseTools/Source/Python/AutoGen/GenMake.py | 20 +++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
--
2.6.1.windows.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] BaseTools: Add $(INC)-like support when compiling .nasm files
2018-12-14 1:47 [Patch 0/2] Update .nasm to support $(INC)-like support Yonghong Zhu
@ 2018-12-14 1:47 ` Yonghong Zhu
2018-12-14 1:47 ` [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC) Yonghong Zhu
1 sibling, 0 replies; 5+ messages in thread
From: Yonghong Zhu @ 2018-12-14 1:47 UTC (permalink / raw)
To: edk2-devel; +Cc: zhijufan, Liming Gao, Bob Feng
From: zhijufan <zhijux.fan@intel.com>
current edk2\BaseTools\Conf\build_rule.template, the compile of nasm
source files does not have the $(INC) support.
The '-I' option only includes the directory of the nasm source file
(${s_path}(+)). Hence, it will be impossible for nasm files to include
files outside of the nasm source file directory.
As a comparison, the compile of both .s and .asm have $(INC) support
in their compile commands.
Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1085
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
BaseTools/Source/Python/AutoGen/GenMake.py | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index d94d8f9368..ef7bc845d0 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -167,7 +167,7 @@ class BuildFile(object):
"gmake" : "include"
}
- _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I", "RVCT" : "-I"}
+ _INC_FLAG_ = {TAB_COMPILER_MSFT : "/I", "GCC" : "-I", "INTEL" : "-I", "RVCT" : "-I", "NASM" : "-I"}
## Constructor of BuildFile
#
@@ -596,6 +596,24 @@ cleanlib:
}
)
FileMacroList.append(FileMacro)
+ # Add support when compiling .nasm source files
+ for File in self.FileCache.keys():
+ if not str(File).endswith('.nasm'):
+ continue
+ IncludePathList = []
+ for P in MyAgo.IncludePathList:
+ IncludePath = self._INC_FLAG_['NASM'] + self.PlaceMacro(P, self.Macros)
+ if IncludePath.endswith(os.sep):
+ IncludePath = IncludePath.rstrip(os.sep)
+ # When compiling .nasm files, need to add a literal backslash at each path
+ # To specify a literal backslash at the end of the line, precede it with a caret (^)
+ if P == MyAgo.IncludePathList[-1] and os.sep == '\\':
+ IncludePath = ''.join([IncludePath, '^', os.sep])
+ else:
+ IncludePath = os.path.join(IncludePath, '')
+ IncludePathList.append(IncludePath)
+ FileMacroList.append(self._FILE_MACRO_TEMPLATE.Replace({"macro_name": "NASM_INC", "source_file": IncludePathList}))
+ break
# Generate macros used to represent files containing list of input files
for ListFileMacro in self.ListFileMacros:
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC)
2018-12-14 1:47 [Patch 0/2] Update .nasm to support $(INC)-like support Yonghong Zhu
2018-12-14 1:47 ` [PATCH] BaseTools: Add $(INC)-like support when compiling .nasm files Yonghong Zhu
@ 2018-12-14 1:47 ` Yonghong Zhu
2018-12-18 6:02 ` Feng, Bob C
1 sibling, 1 reply; 5+ messages in thread
From: Yonghong Zhu @ 2018-12-14 1:47 UTC (permalink / raw)
To: edk2-devel; +Cc: zhijufan, Liming Gao, Bob Feng
From: zhijufan <zhijux.fan@intel.com>
Update the build rule to:
"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS)
-o $dst ${d_path}(+)${s_base}.iii
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
BaseTools/Conf/build_rule.template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3ab560603f..2a53d7ed63 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -62,6 +62,7 @@
# $(BIN_DIR) Common directory for executable files
# $(FV_DIR) Directory to store flash image files
# $(INC) Search path of current module
+# $(NASM_INC) Search nasm file path of current module
# $(INC_LIST) A file containing search pathes of current module
# $(LIBS) Static library files of current module
# $(<tool>_FLAGS) Tools flags of current module
@@ -225,7 +226,7 @@
<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
+ "$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
[Device-Tree-Source-File]
<InputFile>
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC)
2018-12-14 1:47 ` [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC) Yonghong Zhu
@ 2018-12-18 6:02 ` Feng, Bob C
0 siblings, 0 replies; 5+ messages in thread
From: Feng, Bob C @ 2018-12-18 6:02 UTC (permalink / raw)
To: Zhu, Yonghong, edk2-devel@lists.01.org; +Cc: Fan, ZhijuX, Gao, Liming
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
-----Original Message-----
From: Zhu, Yonghong
Sent: Friday, December 14, 2018 9:47 AM
To: edk2-devel@lists.01.org
Cc: Fan, ZhijuX <zhijux.fan@intel.com>; Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC)
From: zhijufan <zhijux.fan@intel.com>
Update the build rule to:
"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
BaseTools/Conf/build_rule.template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3ab560603f..2a53d7ed63 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -62,6 +62,7 @@
# $(BIN_DIR) Common directory for executable files
# $(FV_DIR) Directory to store flash image files
# $(INC) Search path of current module
+# $(NASM_INC) Search nasm file path of current module
# $(INC_LIST) A file containing search pathes of current module
# $(LIBS) Static library files of current module
# $(<tool>_FLAGS) Tools flags of current module
@@ -225,7 +226,7 @@
<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
+ "$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst
+ ${d_path}(+)${s_base}.iii
[Device-Tree-Source-File]
<InputFile>
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-18 6:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-14 1:47 [Patch 0/2] Update .nasm to support $(INC)-like support Yonghong Zhu
2018-12-14 1:47 ` [PATCH] BaseTools: Add $(INC)-like support when compiling .nasm files Yonghong Zhu
2018-12-14 1:47 ` [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC) Yonghong Zhu
2018-12-18 6:02 ` Feng, Bob C
-- strict thread matches above, loose matches on Subject: below --
2018-10-25 7:37 [Patch 0/2] Update .nasm to support $(INC)-like support Yonghong Zhu
2018-10-25 7:37 ` [Patch 2/2] BaseTools: Update nasm file build rule to support $(INC) Yonghong Zhu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox