--- a/hotspot/make/windows/makefiles/vm.make	Wed Aug 20 21:37:50 2014 +0000
+++ b/hotspot/make/windows/makefiles/vm.make	Thu Aug 21 01:43:27 2014 +0000
@@ -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"

--- a/hotspot/src/share/tools/ProjectCreator/BuildConfig.java	Wed Aug 20 21:37:50 2014 +0000
+++ b/hotspot/src/share/tools/ProjectCreator/BuildConfig.java	Thu Aug 21 01:43:27 2014 +0000
@@ -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();

--- a/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java	Wed Aug 20 21:37:50 2014 +0000
+++ b/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java	Thu Aug 21 01:43:27 2014 +0000
@@ -357,7 +357,7 @@
     }
 
     @Override
-    Vector getDebugCompilerFlags(String opt) {
+    Vector getDebugCompilerFlags(String opt, String platformName) {
         Vector rv = new Vector();
 
         // Set /On option
@@ -369,6 +369,10 @@
         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;
     }

--- a/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java	Wed Aug 20 21:37:50 2014 +0000
+++ b/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java	Thu Aug 21 01:43:27 2014 +0000
@@ -284,7 +284,7 @@
 
    }
 
-   Vector getDebugCompilerFlags(String opt) {
+   Vector getDebugCompilerFlags(String opt, String platformName) {
       Vector rv = new Vector();
 
       getDebugCompilerFlags_common(opt, rv);

--- a/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java	Wed Aug 20 21:37:50 2014 +0000
+++ b/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java	Thu Aug 21 01:43:27 2014 +0000
@@ -48,7 +48,7 @@
     }
 
 
-    Vector getDebugCompilerFlags(String opt) {
+    Vector getDebugCompilerFlags(String opt, String platformName) {
         Vector rv = new Vector();
 
         getDebugCompilerFlags_common(opt,rv);

--- a/hotspot/test/runtime/CompressedOops/CompressedClassPointers.java	Wed Aug 20 21:37:50 2014 +0000
+++ b/hotspot/test/runtime/CompressedOops/CompressedClassPointers.java	Thu Aug 21 01:43:27 2014 +0000
@@ -26,7 +26,6 @@
  * @bug 8024927
  * @summary Testing address of compressed class pointer space as best as possible.
  * @library /testlibrary
- * @ignore 8055164
  */
 
 import com.oracle.java.testlibrary.*;
@@ -89,7 +88,6 @@
             "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("HeapBaseMinAddress must be at least");
-        output.shouldContain("HotSpot");
         output.shouldHaveExitValue(0);
     }