Revision: 16399
http://sourceforge.net/p/edk2/code/16399
Author: lgao4
Date: 2014-11-18 02:19:47 +0000 (Tue, 18 Nov 2014)
Log Message:
-----------
BaseTools: Correct NASM output file type for UNIXGCC and CYGGCC.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <[email protected]>
Reviewed-by: Yingke Liu <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Conf/tools_def.template
Modified: trunk/edk2/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/edk2/BaseTools/Conf/tools_def.template 2014-11-17 19:09:12 UTC
(rev 16398)
+++ trunk/edk2/BaseTools/Conf/tools_def.template 2014-11-18 02:19:47 UTC
(rev 16399)
@@ -3961,7 +3961,7 @@
*_UNIXGCC_IA32_CC_FLAGS = DEF(GCC_IA32_CC_FLAGS)
*_UNIXGCC_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_UNIXGCC_IA32_OBJCOPY_FLAGS =
-*_UNIXGCC_IA32_NASM_FLAGS = -f elf32
+*_UNIXGCC_IA32_NASM_FLAGS = -f win32
##################
# X64 definitions
@@ -3981,7 +3981,7 @@
*_UNIXGCC_X64_CC_FLAGS = DEF(GCC_X64_CC_FLAGS)
*_UNIXGCC_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_UNIXGCC_X64_OBJCOPY_FLAGS =
-*_UNIXGCC_X64_NASM_FLAGS = -f elf64
+*_UNIXGCC_X64_NASM_FLAGS = -f win64
##################
# IPF definitions
@@ -4649,7 +4649,7 @@
*_CYGGCC_IA32_CC_FLAGS = DEF(GCC_IA32_CC_FLAGS)
*_CYGGCC_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_CYGGCC_IA32_OBJCOPY_FLAGS =
-*_CYGGCC_IA32_NASM_FLAGS = -f elf32
+*_CYGGCC_IA32_NASM_FLAGS = -f win32
##################
# X64 definitions
@@ -4670,7 +4670,7 @@
*_CYGGCC_X64_CC_FLAGS = DEF(GCC_X64_CC_FLAGS)
*_CYGGCC_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_CYGGCC_X64_OBJCOPY_FLAGS =
-*_CYGGCC_X64_NASM_FLAGS = -f elf64
+*_CYGGCC_X64_NASM_FLAGS = -f win64
##################
# IPF definitions
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
