Fri, 04 Oct 2013 12:45:39 +0200
8007446: Add /MP to cl.exe speeds up windows builds of OpenJDK.
Reviewed-by: sla, ctornqvi
make/windows/makefiles/compile.make | file | annotate | diff | comparison | revisions | |
make/windows/makefiles/sa.make | file | annotate | diff | comparison | revisions |
1.1 --- a/make/windows/makefiles/compile.make Fri Oct 04 21:00:43 2013 -0700 1.2 +++ b/make/windows/makefiles/compile.make Fri Oct 04 12:45:39 2013 +0200 1.3 @@ -44,6 +44,7 @@ 1.4 # /GS Inserts security stack checks in some functions (VS2005 default) 1.5 # /Oi Use intrinsics (in /O2) 1.6 # /Od Disable all optimizations 1.7 +# /MP Use multiple cores for compilation 1.8 # 1.9 # NOTE: Normally following any of the above with a '-' will turn off that flag 1.10 # 1.11 @@ -206,6 +207,7 @@ 1.12 DEBUG_OPT_OPTION = /Od 1.13 GX_OPTION = /EHsc 1.14 LD_FLAGS = /manifest $(LD_FLAGS) 1.15 +MP_FLAG = /MP 1.16 # Manifest Tool - used in VS2005 and later to adjust manifests stored 1.17 # as resources inside build artifacts. 1.18 !if "x$(MT)" == "x" 1.19 @@ -219,6 +221,7 @@ 1.20 DEBUG_OPT_OPTION = /Od 1.21 GX_OPTION = /EHsc 1.22 LD_FLAGS = /manifest $(LD_FLAGS) 1.23 +MP_FLAG = /MP 1.24 # Manifest Tool - used in VS2005 and later to adjust manifests stored 1.25 # as resources inside build artifacts. 1.26 !if "x$(MT)" == "x" 1.27 @@ -235,6 +238,7 @@ 1.28 DEBUG_OPT_OPTION = /Od 1.29 GX_OPTION = /EHsc 1.30 LD_FLAGS = /manifest $(LD_FLAGS) 1.31 +MP_FLAG = /MP 1.32 # Manifest Tool - used in VS2005 and later to adjust manifests stored 1.33 # as resources inside build artifacts. 1.34 !if "x$(MT)" == "x" 1.35 @@ -245,6 +249,8 @@ 1.36 !endif 1.37 !endif 1.38 1.39 +CXX_FLAGS = $(CXX_FLAGS) $(MP_FLAG) 1.40 + 1.41 # If NO_OPTIMIZATIONS is defined in the environment, turn everything off 1.42 !ifdef NO_OPTIMIZATIONS 1.43 PRODUCT_OPT_OPTION = $(DEBUG_OPT_OPTION)
2.1 --- a/make/windows/makefiles/sa.make Fri Oct 04 21:00:43 2013 -0700 2.2 +++ b/make/windows/makefiles/sa.make Fri Oct 04 12:45:39 2013 +0200 2.3 @@ -108,6 +108,8 @@ 2.4 SA_LFLAGS = $(SA_LFLAGS) -map -debug 2.5 !endif 2.6 2.7 +SA_CFLAGS = $(SA_CFLAGS) $(MP_FLAG) 2.8 + 2.9 # Note that we do not keep sawindbj.obj around as it would then 2.10 # get included in the dumpbin command in build_vm_def.sh 2.11