--- old/make/windows/makefiles/vm.make	2014-08-20 10:37:33.715330100 -0400
+++ new/make/windows/makefiles/vm.make	2014-08-20 10:37:33.507291600 -0400
@@ -34,6 +34,9 @@
 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT"
 !else
 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT"
+!if "$(BUILDARCH)" == "amd64"
+CXX_FLAGS=$(CXX_FLAGS) /homeparams
+!endif
 !endif
 
 !if "$(Variant)" == "compiler1"
--- old/src/share/tools/ProjectCreator/BuildConfig.java	2014-08-20 10:37:35.822604900 -0400
+++ new/src/share/tools/ProjectCreator/BuildConfig.java	2014-08-20 10:37:35.607593000 -0400
@@ -504,7 +504,7 @@
 
         super.init(includes, defines);
 
-        getV("CompilerFlags").addAll(getCI().getDebugCompilerFlags(getOptFlag()));
+        getV("CompilerFlags").addAll(getCI().getDebugCompilerFlags(getOptFlag(), get("PlatformName")));
         getV("LinkerFlags").addAll(getCI().getDebugLinkerFlags());
    }
 }
@@ -619,7 +619,7 @@
 abstract class CompilerInterface {
     abstract Vector getBaseCompilerFlags(Vector defines, Vector includes, String outDir);
     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 void   getAdditionalNonKernelLinkerFlags(Vector rv);
     abstract Vector getProductCompilerFlags();
--- old/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java	2014-08-20 10:37:37.890839900 -0400
+++ new/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java	2014-08-20 10:37:37.681826400 -0400
@@ -357,7 +357,7 @@
     }
 
     @Override
-    Vector getDebugCompilerFlags(String opt) {
+    Vector getDebugCompilerFlags(String opt, String platformName) {
         Vector rv = new Vector();
 
         // Set /On option
@@ -369,7 +369,11 @@
         addAttr(rv, "RuntimeLibrary", "MultiThreadedDLL");
         // Set /Oy- option
         addAttr(rv, "OmitFramePointers", "false");
-
+        // Set /homeparams for x64 debug builds
+        if(platformName.equals("x64")) {
+            addAttr(rv, "AdditionalOptions", "/homeparams");
+        }
+        
         return rv;
     }
 
--- old/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java	2014-08-20 10:37:39.941123600 -0400
+++ new/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java	2014-08-20 10:37:39.729361900 -0400
@@ -284,7 +284,7 @@
 
    }
 
-   Vector getDebugCompilerFlags(String opt) {
+   Vector getDebugCompilerFlags(String opt, String platformName) {
       Vector rv = new Vector();
 
       getDebugCompilerFlags_common(opt, rv);
--- old/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java	2014-08-20 10:37:42.135250900 -0400
+++ new/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java	2014-08-20 10:37:41.857237100 -0400
@@ -48,7 +48,7 @@
     }
 
 
-    Vector getDebugCompilerFlags(String opt) {
+    Vector getDebugCompilerFlags(String opt, String platformName) {
         Vector rv = new Vector();
 
         getDebugCompilerFlags_common(opt,rv);