From acae1bc3939c1b1a48897824fe8087bbc36b6b89 Mon Sep 17 00:00:00 2001 From: mdkinney Date: Tue, 4 Nov 2008 21:50:46 +0000 Subject: [PATCH] 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@6380 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Conf/tools_def.template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 5ba0648e6f..7d5ac7bff5 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -140,7 +140,7 @@ DEFINE ASL_BIN = C:\ASL *_VS2003_IA32_VFRPP_PATH = DEF(VSNET2003_BIN)\cl.exe *_VS2003_IA32_SLINK_PATH = DEF(VSNET2003_BIN)\lib.exe *_VS2003_IA32_DLINK_PATH = DEF(VSNET2003_BIN)\link.exe -*_VS2003_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +*_VS2003_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2003_IA32_APP_PATH = DEF(VSNET2003_BIN)\cl.exe *_VS2003_IA32_PP_PATH = DEF(VSNET2003_BIN)\cl.exe *_VS2003_IA32_ASM_PATH = DEF(VSNET2003_BIN)\ml.exe @@ -192,7 +192,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O *_VS2005PRO_IA32_VFRPP_PATH = DEF(VS2005PRO_BIN)\cl.exe *_VS2005PRO_IA32_SLINK_PATH = DEF(VS2005PRO_BIN)\lib.exe *_VS2005PRO_IA32_DLINK_PATH = DEF(VS2005PRO_BIN)\link.exe -*_VS2005PRO_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +*_VS2005PRO_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2005PRO_IA32_APP_PATH = DEF(VS2005PRO_BIN)\cl.exe *_VS2005PRO_IA32_PP_PATH = DEF(VS2005PRO_BIN)\cl.exe *_VS2005PRO_IA32_ASM_PATH = DEF(VS2005PRO_BIN)\ml.exe @@ -221,7 +221,7 @@ RELEASE_VS2005PRO_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O *_VS2005PRO_X64_ASM_PATH = DEF(VS2005PRO_BINX64)\ml64.exe *_VS2005PRO_X64_SLINK_PATH = DEF(VS2005PRO_BINX64)\lib.exe *_VS2005PRO_X64_DLINK_PATH = DEF(VS2005PRO_BINX64)\link.exe -*_VS2005PRO_X64_ASMLINK_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_ASLPP_PATH = DEF(VS2005PRO_BINX64)\cl.exe *_VS2005PRO_X64_ASLDLINK_PATH = DEF(VS2005PRO_BINX64)\link.exe @@ -259,7 +259,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O *_VS2005TEAMSUITE_IA32_VFRPP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe *_VS2005TEAMSUITE_IA32_SLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\lib.exe *_VS2005TEAMSUITE_IA32_DLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\link.exe -*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +*_VS2005TEAMSUITE_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2005TEAMSUITE_IA32_APP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe *_VS2005TEAMSUITE_IA32_PP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe *_VS2005TEAMSUITE_IA32_ASM_PATH = DEF(VS2005TEAMSUITE_BIN)\ml.exe @@ -350,7 +350,7 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT *_WINDDK3790x1830_IA32_CC_PATH = DEF(WINDDK_BIN32)\cl.exe *_WINDDK3790x1830_IA32_SLINK_PATH = DEF(WINDDK_BIN32)\lib.exe *_WINDDK3790x1830_IA32_DLINK_PATH = DEF(WINDDK_BIN32)\link.exe -*_WINDDK3790x1830_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +*_WINDDK3790x1830_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_WINDDK3790x1830_IA32_PP_PATH = DEF(WINDDK_BIN32)\cl.exe *_WINDDK3790x1830_IA32_VFRPP_PATH = DEF(WINDDK_BIN32)\cl.exe *_WINDDK3790x1830_IA32_APP_PATH = DEF(WINDDK_BIN32)\cl.exe @@ -376,7 +376,7 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O *_WINDDK3790x1830_X64_CC_PATH = DEF(WINDDK_BINX64)\cl.exe *_WINDDK3790x1830_X64_SLINK_PATH = DEF(WINDDK_BINX64)\lib.exe *_WINDDK3790x1830_X64_DLINK_PATH = DEF(WINDDK_BINX64)\link.exe -*_WINDDK3790x1830_X64_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +#*_WINDDK3790x1830_X64_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe *_WINDDK3790x1830_X64_PP_PATH = DEF(WINDDK_BINX64)\cl.exe *_WINDDK3790x1830_X64_VFRPP_PATH = DEF(WINDDK_BINX64)\cl.exe *_WINDDK3790x1830_X64_APP_PATH = DEF(WINDDK_BINX64)\cl.exe @@ -401,7 +401,7 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O *_WINDDK3790x1830_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe *_WINDDK3790x1830_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe *_WINDDK3790x1830_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe -*_WINDDK3790x1830_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +#*_WINDDK3790x1830_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe *_WINDDK3790x1830_IPF_PP_PATH = DEF(WINDDK_BIN64)\cl.exe *_WINDDK3790x1830_IPF_VFRPP_PATH = DEF(WINDDK_BIN64)\cl.exe *_WINDDK3790x1830_IPF_APP_PATH = DEF(WINDDK_BIN64)\cl.exe @@ -642,7 +642,7 @@ RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O # xilib.exe needs lib.exe from Visual Studio *_ICC_X64_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN) *_ICC_X64_DLINK_PATH = DEF(ICC_BINX64)\xilink.exe -*_ICC_X64_ASMLINK_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_VFRPP_PATH = DEF(ICC_BINX64)\icl.exe *_ICC_X64_APP_PATH = DEF(ICC_BINX64)\icl.exe @@ -673,7 +673,7 @@ RELEASE_ICC_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O # xilib.exe needs lib.exe from Visual Studio *_ICC_IPF_SLINK_DLL = DEF(VS2005TEAMSUITE_BIN);DEF(VS2005TEAMSUITE_DLL) *_ICC_IPF_DLINK_PATH = DEF(ICC_BIN64)\xilink.exe -*_ICC_IPF_ASMLINK_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_VFRPP_PATH = DEF(ICC_BIN64)\icl.exe *_ICC_IPF_PCH_PATH = DEF(ICC_BIN64)\icl.exe @@ -717,8 +717,8 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT *_MYTOOLS_*_SLINK_FLAGS = /nologo /LTCG *_MYTOOLS_*_ASM16_PATH = DEF(VS2005TEAMSUITE_BIN)\ml.exe -*_MYTOOLS_*_ASMLINK16_PATH = DEF(WINDDK_BIN16)\link.exe -*_MYTOOLS_*_ASMLINK16_FLAGS = /nologo /tiny +#*_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 RELEASE_MYTOOLS_*_ASM16_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd @@ -731,7 +731,7 @@ RELEASE_MYTOOLS_*_ASM16_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd *_MYTOOLS_IA32_CC_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe *_MYTOOLS_IA32_SLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\lib.exe *_MYTOOLS_IA32_DLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\link.exe -*_MYTOOLS_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +*_MYTOOLS_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_MYTOOLS_IA32_PP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe *_MYTOOLS_IA32_VFRPP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe *_MYTOOLS_IA32_APP_PATH = DEF(VS2005TEAMSUITE_BIN)\cl.exe @@ -779,7 +779,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O *_MYTOOLS_IPF_CC_PATH = DEF(WINDDK_BIN64)\cl.exe *_MYTOOLS_IPF_SLINK_PATH = DEF(WINDDK_BIN64)\lib.exe *_MYTOOLS_IPF_DLINK_PATH = DEF(WINDDK_BIN64)\link.exe -*_MYTOOLS_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe +#*_MYTOOLS_IPF_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe *_MYTOOLS_IPF_PP_PATH = DEF(WINDDK_BIN64)\cl.exe *_MYTOOLS_IPF_VFRPP_PATH = DEF(WINDDK_BIN64)\cl.exe *_MYTOOLS_IPF_APP_PATH = DEF(WINDDK_BIN64)\cl.exe -- 2.39.2