tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove all references to ASMLINK16. Those are never used. 

Change ASMLINK to use link16.exe instead of link.exe to make it clear this is a 16-bit operation
Remove all references to ASMLINK from IPF and X64 builds



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6381 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2008-11-04 21:57:13 +00:00
parent acae1bc393
commit 0764e7ed0b
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BaseTools/Conf/tools_def.template
View File

@ -163,6 +163,7 @@ RELEASE_VS2003_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd
*_VS2003_IA32_SLINK_FLAGS = /nologo /LTCG *_VS2003_IA32_SLINK_FLAGS = /nologo /LTCG
DEBUG_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG DEBUG_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
*_VS2003_IA32_ASMLINK_FLAGS = /nologo /tiny
#################################################################################### ####################################################################################
# #
@ -221,7 +222,6 @@ RELEASE_VS2005PRO_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
*_VS2005PRO_X64_ASM_PATH = DEF(VS2005PRO_BINX64)\ml64.exe *_VS2005PRO_X64_ASM_PATH = DEF(VS2005PRO_BINX64)\ml64.exe
*_VS2005PRO_X64_SLINK_PATH = DEF(VS2005PRO_BINX64)\lib.exe *_VS2005PRO_X64_SLINK_PATH = DEF(VS2005PRO_BINX64)\lib.exe
*_VS2005PRO_X64_DLINK_PATH = DEF(VS2005PRO_BINX64)\link.exe *_VS2005PRO_X64_DLINK_PATH = DEF(VS2005PRO_BINX64)\link.exe
#*_VS2005PRO_X64_ASMLINK_PATH = DEF(VS2005PRO_BINX64)\link.exe
*_VS2005PRO_X64_ASLCC_PATH = DEF(VS2005PRO_BINX64)\cl.exe *_VS2005PRO_X64_ASLCC_PATH = DEF(VS2005PRO_BINX64)\cl.exe
*_VS2005PRO_X64_ASLPP_PATH = DEF(VS2005PRO_BINX64)\cl.exe *_VS2005PRO_X64_ASLPP_PATH = DEF(VS2005PRO_BINX64)\cl.exe
*_VS2005PRO_X64_ASLDLINK_PATH = DEF(VS2005PRO_BINX64)\link.exe *_VS2005PRO_X64_ASLDLINK_PATH = DEF(VS2005PRO_BINX64)\link.exe
@ -376,7 +376,6 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
*_WINDDK3790x1830_X64_CC_PATH = DEF(WINDDK_BINX64)\cl.exe *_WINDDK3790x1830_X64_CC_PATH = DEF(WINDDK_BINX64)\cl.exe
*_WINDDK3790x1830_X64_SLINK_PATH = DEF(WINDDK_BINX64)\lib.exe *_WINDDK3790x1830_X64_SLINK_PATH = DEF(WINDDK_BINX64)\lib.exe
*_WINDDK3790x1830_X64_DLINK_PATH = DEF(WINDDK_BINX64)\link.exe *_WINDDK3790x1830_X64_DLINK_PATH = DEF(WINDDK_BINX64)\link.exe
#*_WINDDK3790x1830_X64_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe
*_WINDDK3790x1830_X64_PP_PATH = DEF(WINDDK_BINX64)\cl.exe *_WINDDK3790x1830_X64_PP_PATH = DEF(WINDDK_BINX64)\cl.exe
*_WINDDK3790x1830_X64_VFRPP_PATH = DEF(WINDDK_BINX64)\cl.exe *_WINDDK3790x1830_X64_VFRPP_PATH = DEF(WINDDK_BINX64)\cl.exe
*_WINDDK3790x1830_X64_APP_PATH = DEF(WINDDK_BINX64)\cl.exe *_WINDDK3790x1830_X64_APP_PATH = DEF(WINDDK_BINX64)\cl.exe
@ -401,7 +400,6 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
*_WINDDK3790x1830_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe *_WINDDK3790x1830_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe
*_WINDDK3790x1830_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe *_WINDDK3790x1830_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe
*_WINDDK3790x1830_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe *_WINDDK3790x1830_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe
#*_WINDDK3790x1830_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe
*_WINDDK3790x1830_IPF_PP_PATH = DEF(WINDDK_BIN64)\cl.exe *_WINDDK3790x1830_IPF_PP_PATH = DEF(WINDDK_BIN64)\cl.exe
*_WINDDK3790x1830_IPF_VFRPP_PATH = DEF(WINDDK_BIN64)\cl.exe *_WINDDK3790x1830_IPF_VFRPP_PATH = DEF(WINDDK_BIN64)\cl.exe
*_WINDDK3790x1830_IPF_APP_PATH = DEF(WINDDK_BIN64)\cl.exe *_WINDDK3790x1830_IPF_APP_PATH = DEF(WINDDK_BIN64)\cl.exe
@ -613,7 +611,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
# xilib.exe needs lib.exe from Visual Studio # xilib.exe needs lib.exe from Visual Studio
*_ICC_IA32_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN) *_ICC_IA32_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN)
*_ICC_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe *_ICC_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe
*_ICC_IA32_ASMLINK_PATH = DEF(ICC_BIN32)\xilink.exe *_ICC_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe
*_ICC_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe *_ICC_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICC_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe *_ICC_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe
*_ICC_IA32_APP_PATH = DEF(ICC_BIN32)\icl.exe *_ICC_IA32_APP_PATH = DEF(ICC_BIN32)\icl.exe
@ -632,6 +630,7 @@ RELEASE_ICC_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd
*_ICC_IA32_SLINK_FLAGS = /nologo *_ICC_IA32_SLINK_FLAGS = /nologo
DEBUG_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG DEBUG_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text
*_ICC_IA32_ASMLINK_FLAGS = /nologo /tiny
################## ##################
# X64 definitions # X64 definitions
@ -642,7 +641,6 @@ RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
# xilib.exe needs lib.exe from Visual Studio # xilib.exe needs lib.exe from Visual Studio
*_ICC_X64_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN) *_ICC_X64_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN)
*_ICC_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe *_ICC_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe
#*_ICC_X64_ASMLINK_PATH = DEF(ICC_BINX64)\xilink.exe
*_ICC_X64_PP_PATH = DEF(ICC_BINX64)\icl.exe *_ICC_X64_PP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_VFRPP_PATH = DEF(ICC_BINX64)\icl.exe *_ICC_X64_VFRPP_PATH = DEF(ICC_BINX64)\icl.exe
*_ICC_X64_APP_PATH = DEF(ICC_BINX64)\icl.exe *_ICC_X64_APP_PATH = DEF(ICC_BINX64)\icl.exe
@ -673,7 +671,6 @@ RELEASE_ICC_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
# xilib.exe needs lib.exe from Visual Studio # xilib.exe needs lib.exe from Visual Studio
*_ICC_IPF_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN);DEF(VS2005TEAMSUITE_DLL) *_ICC_IPF_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN);DEF(VS2005TEAMSUITE_DLL)
*_ICC_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe *_ICC_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe
#*_ICC_IPF_ASMLINK_PATH = DEF(ICC_BIN64)\xilink.exe
*_ICC_IPF_PP_PATH = DEF(ICC_BIN64)\icl.exe *_ICC_IPF_PP_PATH = DEF(ICC_BIN64)\icl.exe
*_ICC_IPF_VFRPP_PATH = DEF(ICC_BIN64)\icl.exe *_ICC_IPF_VFRPP_PATH = DEF(ICC_BIN64)\icl.exe
*_ICC_IPF_PCH_PATH = DEF(ICC_BIN64)\icl.exe *_ICC_IPF_PCH_PATH = DEF(ICC_BIN64)\icl.exe
@ -717,8 +714,6 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
*_MYTOOLS_*_SLINK_FLAGS = /nologo /LTCG *_MYTOOLS_*_SLINK_FLAGS = /nologo /LTCG
*_MYTOOLS_*_ASM16_PATH = DEF(VS2005TEAMSUITE_BIN)\ml.exe *_MYTOOLS_*_ASM16_PATH = DEF(VS2005TEAMSUITE_BIN)\ml.exe
#*_MYTOOLS_*_ASMLINK16_PATH = DEF(WINDDK_BIN16)\link.exe
#*_MYTOOLS_*_ASMLINK16_FLAGS = /nologo /tiny
DEBUG_MYTOOLS_*_ASM16_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd /Zi DEBUG_MYTOOLS_*_ASM16_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd /Zi
RELEASE_MYTOOLS_*_ASM16_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd RELEASE_MYTOOLS_*_ASM16_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd
@ -744,9 +739,9 @@ RELEASE_MYTOOLS_*_ASM16_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd
RELEASE_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF RELEASE_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
DEBUG_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd /Zi DEBUG_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd /Zi
RELEASE_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd RELEASE_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd
*_MYTOOLS_IA32_ASMLINK_FLAGS = /nologo /tiny
DEBUG_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb DEBUG_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
RELEASE_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb RELEASE_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
*_MYTOOLS_IA32_ASMLINK_FLAGS = /nologo /tiny
################## ##################
# x64 definitions # x64 definitions
@ -779,7 +774,6 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
*_MYTOOLS_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe *_MYTOOLS_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe
*_MYTOOLS_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe *_MYTOOLS_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe
*_MYTOOLS_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe *_MYTOOLS_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe
#*_MYTOOLS_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe
*_MYTOOLS_IPF_PP_PATH = DEF(WINDDK_BIN64)\cl.exe *_MYTOOLS_IPF_PP_PATH = DEF(WINDDK_BIN64)\cl.exe
*_MYTOOLS_IPF_VFRPP_PATH = DEF(WINDDK_BIN64)\cl.exe *_MYTOOLS_IPF_VFRPP_PATH = DEF(WINDDK_BIN64)\cl.exe
*_MYTOOLS_IPF_APP_PATH = DEF(WINDDK_BIN64)\cl.exe *_MYTOOLS_IPF_APP_PATH = DEF(WINDDK_BIN64)\cl.exe