]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Support /WHOLEARCHIVE option in VS2015 tool chain
authorLiming Gao <liming.gao@intel.com>
Thu, 24 Aug 2017 04:38:01 +0000 (12:38 +0800)
committerLiming Gao <liming.gao@intel.com>
Tue, 29 Aug 2017 01:30:31 +0000 (09:30 +0800)
https://bugzilla.tianocore.org/show_bug.cgi?id=582

Don't enable this option in the default setting, because it may cause VS2015
linker crash. Platform can enable this option in PlatformPkg.dsc like below:
[BuildOptions]
*_*_*_DLINK2_FLAGS = /WHOLEARCHIVE

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
BaseTools/Conf/build_rule.template
BaseTools/Conf/tools_def.template

index 1db94b696f898c65c995c7da08cdcd8e6c592bd0..d8c8253983f0969a96404b20d7d5eac0a12a70ea 100755 (executable)
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
 \r
     <Command.MSFT, Command.INTEL>\r
+        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)\r
         "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)\r
 \r
     <Command.GCC>\r
index cfb8d641def7146321090ab6fe42a0298e6b00f2..7d4fd167c2ebb92709a6037dee4cd468c99bf746 100755 (executable)
@@ -575,7 +575,7 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
 #                               Intel(r) ACPI Compiler (iasl.exe) from\r
 #                               https://acpica.org/downloads\r
 #   VS2015x86   -win64-  Requires:\r
-#                             Microsoft Visual Studio 2015 (x86) Professional Edition\r
+#                             Microsoft Visual Studio 2015 (x86) Update 2 or above\r
 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
 #                        Optional:\r
 #                             Required to build platforms or ACPI tables:\r
@@ -3605,6 +3605,7 @@ NOOPT_VS2013x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT
 *_VS2015_*_APP_FLAGS              = /nologo /E /TC\r
 *_VS2015_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
+*_VS2015_*_DLINK2_FLAGS           =\r
 \r
 *_VS2015_*_ASM16_PATH             = DEF(VS2015_BIN)\ml.exe\r
 \r
@@ -3723,6 +3724,7 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2015xASL_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2015xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
+*_VS2015xASL_*_DLINK2_FLAGS    =\r
 \r
 *_VS2015xASL_*_ASM16_PATH      = DEF(VS2015_BIN)\ml.exe\r
 \r
@@ -3839,6 +3841,7 @@ NOOPT_VS2015xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 *_VS2015x86_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2015x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
+*_VS2015x86_*_DLINK2_FLAGS    =\r
 \r
 *_VS2015x86_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe\r
 \r
@@ -3954,6 +3957,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2015x86xASL_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2015x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
+*_VS2015x86xASL_*_DLINK2_FLAGS    =\r
 \r
 *_VS2015x86xASL_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe\r
 \r