1) Re-fine and fully test the mechanism of getting over the long command line limitation

2) Change the -s option from "SpawnMode" to be "SilentMode"
3) Change the prototype of PeiCoreEntryPoint in AutoGen-ed code
4) Remove CalcDeps module since it's no longer needed.
5) Remove "-k", "-g" and "-l" switches from build
6) Remove MULTIPLE_THREAD in target.template. Use MAX_CONCURRENT_THREAD_NUMBER to get the functionality.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7158 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index 93ab585c4ea878ca0c2bf4edb92379e33079e999..01d175fd885f8814bbf379c90e9e5c6446cf6c51 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 6ccb2425494b94cdbc6748cc059c60cec78f134d..73148ee60283304fa6fcca39fa5bb9ff07850c6f 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 4f68ddc6c173e2ca35241100d7736ad9dd09cfb4..d3b8e7ccc32fd5a2edc722d0817079a82fe2dd66 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -200,20 +200,19 @@
 \r
 [Static-Library-File]\r
     <InputFile>\r
-        ?.lib\r
+        *.lib\r
 \r
     <ExtraDependency>\r
-        $(LIBS)\r
         $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}\r
+        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) ${src} \r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\) $(DLINK2_FLAGS)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) ${src} -\) $(DLINK2_FLAGS)\r
 \r
 [Dynamic-Library-File]\r
     <InputFile>\r

diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index 5623e7b3032795c6bc71445fa2d54cc500c7c03e..5ce56d3fe82f3741f58f2d36e949ed6bfccc056e 100644 (file)
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -58,17 +58,9 @@ TOOL_CHAIN_CONF       = Conf/tools_def.txt
 #                                             used for the build.  The list uses space character separation.\r
 TOOL_CHAIN_TAG        = MYTOOLS\r
 \r
-#  MULTIPLE_THREAD       FLAG      Optional   Flag to enable multi-thread build. If not specified, default\r
-#                                             is "Disable". If your computer is multi-core or multiple CPUs,\r
-#                                             enabling this feature will bring much benefit. \r
-#                                             This feature is only available for "spawn" build mode, and \r
-#                                             only for PLATFORM build. The clean, cleanall or\r
-#                                             stand-alone module build is still using the normal way.\r
-MULTIPLE_THREAD       = Enable\r
-\r
-# MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. Default is 1. Recommend to\r
-#                                                 set this value to one more than the number of your compurter\r
-#                                                 cores or CPUs.\r
+# MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. Recommend to set this\r
+#                                                 value to one more than the number of your compurter\r
+#                                                 cores or CPUs. Less than 2 means disable multithread build.\r
 MAX_CONCURRENT_THREAD_NUMBER = 1\r
 \r
 # Build rules definition\r