archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8027480: Build Windows x64 fastdebug builds using /homeparams

Browse source 
Windows x64 fastdebug builds now uses the /homeparams compiler flag

Reviewed-by: dcubed, zgu, lfoltan
This commit is contained in:
Christian Tornqvist 2014-08-20 14:59:33 -07:00
parent 655556a4bf
commit 6f75087c92
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/make/windows/makefiles/vm.make
View file

@ -34,6 +34,9 @@ ALTSRC=$(WorkSpace)\src\closed
CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT" CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT"
!else !else
CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT"
!if "$(BUILDARCH)" == "amd64"
CXX_FLAGS=$(CXX_FLAGS) /homeparams
!endif
!endif !endif
!if "$(Variant)" == "compiler1" !if "$(Variant)" == "compiler1"

4
hotspot/src/share/tools/ProjectCreator/BuildConfig.java
View file

@ -504,7 +504,7 @@ abstract class GenericDebugConfig extends BuildConfig {
super.init(includes, defines); super.init(includes, defines);
getV("CompilerFlags").addAll(getCI().getDebugCompilerFlags(getOptFlag())); getV("CompilerFlags").addAll(getCI().getDebugCompilerFlags(getOptFlag(), get("PlatformName")));
getV("LinkerFlags").addAll(getCI().getDebugLinkerFlags()); getV("LinkerFlags").addAll(getCI().getDebugLinkerFlags());
} }
} }
@ -619,7 +619,7 @@ class TieredProductConfig extends ProductConfig {
abstract class CompilerInterface { abstract class CompilerInterface {
abstract Vector getBaseCompilerFlags(Vector defines, Vector includes, String outDir); abstract Vector getBaseCompilerFlags(Vector defines, Vector includes, String outDir);
abstract Vector getBaseLinkerFlags(String outDir, String outDll, String platformName); abstract Vector getBaseLinkerFlags(String outDir, String outDll, String platformName);
abstract Vector getDebugCompilerFlags(String opt); abstract Vector getDebugCompilerFlags(String opt, String platformName);
abstract Vector getDebugLinkerFlags(); abstract Vector getDebugLinkerFlags();
abstract void getAdditionalNonKernelLinkerFlags(Vector rv); abstract void getAdditionalNonKernelLinkerFlags(Vector rv);
abstract Vector getProductCompilerFlags(); abstract Vector getProductCompilerFlags();

6
hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java
View file

@ -357,7 +357,7 @@ class CompilerInterfaceVC10 extends CompilerInterface {
} }
@Override @Override
Vector getDebugCompilerFlags(String opt) { Vector getDebugCompilerFlags(String opt, String platformName) {
Vector rv = new Vector(); Vector rv = new Vector();
// Set /On option // Set /On option
@ -369,6 +369,10 @@ class CompilerInterfaceVC10 extends CompilerInterface {
addAttr(rv, "RuntimeLibrary", "MultiThreadedDLL"); addAttr(rv, "RuntimeLibrary", "MultiThreadedDLL");
// Set /Oy- option // Set /Oy- option
addAttr(rv, "OmitFramePointers", "false"); addAttr(rv, "OmitFramePointers", "false");
// Set /homeparams for x64 debug builds
if(platformName.equals("x64")) {
addAttr(rv, "AdditionalOptions", "/homeparams");
}
return rv; return rv;
} }

2
hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
View file

@ -284,7 +284,7 @@ class CompilerInterfaceVC7 extends CompilerInterface {
} }
Vector getDebugCompilerFlags(String opt) { Vector getDebugCompilerFlags(String opt, String platformName) {
Vector rv = new Vector(); Vector rv = new Vector();
getDebugCompilerFlags_common(opt, rv); getDebugCompilerFlags_common(opt, rv);

2
hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java
View file

@ -48,7 +48,7 @@ class CompilerInterfaceVC8 extends CompilerInterfaceVC7 {
} }
Vector getDebugCompilerFlags(String opt) { Vector getDebugCompilerFlags(String opt, String platformName) {
Vector rv = new Vector(); Vector rv = new Vector();
getDebugCompilerFlags_common(opt,rv); getDebugCompilerFlags_common(opt,rv);