From c417dbcf5e3bbd5fc2dba3463c3ace4a6e05069f Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 19 Jul 2007 09:42:37 +0000
Subject: [PATCH] Fixed EBC build error

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3367 6f19259b-4bc3-4df7-8a09-765794883524
---
 BaseTools/Bin/Win32/build.exe     | Bin 1304829 -> 1305215 bytes
 BaseTools/Conf/tools_def.template |  28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index cfd1272e83e39d70bc545bc35356b6553d28f1e8..da200b70cf3cace9331a360b92a5e27e45c72419 100644
GIT binary patch
delta 2266
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
CigeEa

delta 2028
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
IDX5$O0+ZQEt^fc4

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index afb8cccf94..d0a1cecbcc 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -179,13 +179,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_WINDDK3790x1830_EBC_PP_NAME       = iec.exe
 *_WINDDK3790x1830_EBC_CC_NAME       = iec.exe
 *_WINDDK3790x1830_EBC_DLINK_NAME    = link.exe
-*_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe /lib
+*_WINDDK3790x1830_EBC_SLINK_NAME    = link.exe
 *_WINDDK3790x1830_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin
 *_WINDDK3790x1830_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"
 
 *_WINDDK3790x1830_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
 *_WINDDK3790x1830_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
-*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC
+*_WINDDK3790x1830_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC
 *_WINDDK3790x1830_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
 
 ##################
@@ -247,13 +247,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_VS2005EXP_EBC_PP_NAME       = iec.exe
 *_VS2005EXP_EBC_CC_NAME       = iec.exe
 *_VS2005EXP_EBC_DLINK_NAME    = link.exe
-*_VS2005EXP_EBC_SLINK_NAME    = link.exe /lib
+*_VS2005EXP_EBC_SLINK_NAME    = link.exe
 *_VS2005EXP_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin
 *_VS2005EXP_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"
 
 *_VS2005EXP_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
 *_VS2005EXP_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
-*_VS2005EXP_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC
+*_VS2005EXP_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC
 *_VS2005EXP_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
 
 ##################
@@ -315,13 +315,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 *_VS2005STD_EBC_PP_NAME       = iec.exe
 *_VS2005STD_EBC_CC_NAME       = iec.exe
 *_VS2005STD_EBC_DLINK_NAME    = link.exe
-*_VS2005STD_EBC_SLINK_NAME    = link.exe /lib
+*_VS2005STD_EBC_SLINK_NAME    = link.exe
 *_VS2005STD_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin
 *_VS2005STD_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"
 
 *_VS2005STD_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
 *_VS2005STD_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
-*_VS2005STD_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC
+*_VS2005STD_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC
 *_VS2005STD_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
 
 ##################
@@ -397,13 +397,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_VS2005PRO_EBC_PP_NAME     = iec.exe
 *_VS2005PRO_EBC_CC_NAME     = iec.exe
 *_VS2005PRO_EBC_DLINK_NAME  = link.exe
-*_VS2005PRO_EBC_SLINK_NAME  = link.exe /lib
+*_VS2005PRO_EBC_SLINK_NAME  = link.exe
 *_VS2005PRO_EBC_*_PATH      = C:\Program Files\Intel\EBC\Bin
 *_VS2005PRO_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"
 
 *_VS2005PRO_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
 *_VS2005PRO_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
-*_VS2005PRO_EBC_SLINK_FLAGS = /NOLOGO /MACHINE:EBC
+*_VS2005PRO_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
 *_VS2005PRO_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
 
 ##################
@@ -499,13 +499,13 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_VS2005TEAMSUITE_EBC_PP_NAME     = iec.exe
 *_VS2005TEAMSUITE_EBC_CC_NAME     = iec.exe
 *_VS2005TEAMSUITE_EBC_DLINK_NAME  = link.exe
-*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe /lib
+*_VS2005TEAMSUITE_EBC_SLINK_NAME  = link.exe
 *_VS2005TEAMSUITE_EBC_*_PATH      = "C:\Program Files\Intel\EBC\Bin"
 *_VS2005TEAMSUITE_EBC_*_SPATH     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"
 
 *_VS2005TEAMSUITE_EBC_PP_FLAGS    = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
 *_VS2005TEAMSUITE_EBC_CC_FLAGS    = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
-*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /NOLOGO /MACHINE:EBC
+*_VS2005TEAMSUITE_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
 *_VS2005TEAMSUITE_EBC_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
 
 ##################
@@ -622,11 +622,11 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # *_*_EBC_*_FAMILY     = INTEL
 # *_*_EBC_PP_NAME      = iec.exe
 # *_*_EBC_CC_NAME      = iec.exe
-# *_*_EBC_SLINK_NAME   = link.exe /lib
+# *_*_EBC_SLINK_NAME   = link.exe
 # *_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin
 # *_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib
 #
-# *_*_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC
+# *_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC
 # *_*_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
 # *_*_EBC_CC_FLAGS      = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
 # *_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
@@ -834,14 +834,14 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF
 *_MYTOOLS_EBC_PP_NAME       = iec.exe
 *_MYTOOLS_EBC_CC_NAME       = iec.exe
 *_MYTOOLS_EBC_DLINK_NAME    = link.exe
-*_MYTOOLS_EBC_SLINK_NAME    = link.exe /lib
+*_MYTOOLS_EBC_SLINK_NAME    = link.exe
 
 *_MYTOOLS_EBC_*_PATH        = C:\Program Files\Intel\EBC\Bin
 *_MYTOOLS_EBC_*_SPATH       = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib"
 
 *_MYTOOLS_EBC_PP_FLAGS      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
 *_MYTOOLS_EBC_CC_FLAGS      = /nologo /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h
-*_MYTOOLS_EBC_SLINK_FLAGS   = /NOLOGO /MACHINE:EBC
+*_MYTOOLS_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC
 *_MYTOOLS_EBC_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
 
 ##################
-- 
2.39.2