--- a/GRAAL_AUTHORS	Wed Mar 13 14:55:08 2013 -0700
+++ b/GRAAL_AUTHORS	Wed Mar 13 23:54:01 2013 +0100
@@ -1,9 +1,12 @@
 Gilles Duboscq (gdub)
 Peter Hofer
+Christian Haeubl (chaeubl)
+Christian Humer (chumer)
+Roland Schatz
+Doug Simon (dnsimon)
+Lukas Stadler (lstadler)
 Alexander Stipsits
 Katrin Strassl
-Christian Humer (chumer)
 Christian Wimmer (cwimmer)
-Doug Simon (dnsimon)
-Lukas Stadler (lstadler)
+Andreas Woess (aw)
 Thomas Wuerthinger (thomaswue)

--- a/make/windows/makefiles/projectcreator.make	Wed Mar 13 14:55:08 2013 -0700
+++ b/make/windows/makefiles/projectcreator.make	Wed Mar 13 23:54:01 2013 +0100
@@ -145,8 +145,10 @@
  -ignorePath_TARGET c1_
 
 ProjectCreatorIDEOptionsIgnoreGraal=\
- -ignorePath_TARGET graal
- 
+ -ignorePath_TARGET src/share/vm/graal \
+ -ignorePath_TARGET graal/generated \
+ -ignorePath_TARGET vm/graal
+
 ProjectCreatorIDEOptionsIgnoreCompiler2=\
  -ignorePath_TARGET compiler2 \
  -ignorePath_TARGET tiered \
@@ -175,7 +177,6 @@
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler1 COMPILER1 \
  -ignorePath_compiler1 core \
- -ignorePath_compiler1 src/share/vm/graal \
  $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler1) \
  $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
 
@@ -185,7 +186,6 @@
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_graal GRAAL \
  -ignorePath_graal core \
- -ignorePath_graal src/share/vm/c1 \
  $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \
  $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal)
 
@@ -195,8 +195,9 @@
 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make.
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler2 COMPILER2 \
+ -define_compiler2 GRAAL \
  -ignorePath_compiler2 core \
- -ignorePath_compiler2 src/share/vm/graal \
+ -ignorePath_compiler2 graal/generated \
  -additionalFile_compiler2 $(Platform_arch_model).ad \
  -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \
  -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \
@@ -209,7 +210,6 @@
  -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \
  -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \
  -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \
- $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler2) \
  $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2)
 
 # Add in the jvmti (JSR-163) options

--- a/src/cpu/x86/vm/macroAssembler_x86.cpp	Wed Mar 13 14:55:08 2013 -0700
+++ b/src/cpu/x86/vm/macroAssembler_x86.cpp	Wed Mar 13 23:54:01 2013 +0100
@@ -2058,7 +2058,7 @@
 }
 
 // !defined(COMPILER2) is because of stupid core builds
-#if !defined(_LP64) || defined(COMPILER1) || !defined(COMPILER2)
+#if !defined(_LP64) || defined(COMPILER1) || !defined(COMPILER2) || defined(GRAAL)
 void MacroAssembler::empty_FPU_stack() {
   if (VM_Version::supports_mmx()) {
     emms();

--- a/src/share/tools/ProjectCreator/FileTreeCreatorVC10.java	Wed Mar 13 14:55:08 2013 -0700
+++ b/src/share/tools/ProjectCreator/FileTreeCreatorVC10.java	Wed Mar 13 23:54:01 2013 +0100
@@ -50,7 +50,8 @@
                if (addFile.equals(fileName)) {
                   // supress any ignore
                   // TODO - may need some adjustments
-                  if (file.toAbsolutePath().toString().contains(cfg.get("Flavour"))) {
+                  String relativePath = startDir.toUri().relativize(file.toUri()).getPath();
+                  if (relativePath.contains(cfg.get("Flavour"))) {
                      currentFileAttr.removeFromIgnored(cfg);
                   }
                }