# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1330356401 -3600
# Node ID 8f01f899bccdaba90f4ad028d67c337be74905a4
# Parent  dfa7c9a45d8e421f4665678ef75b7aba6582861a
More GRAAL #ifdef; ignore graal directory on windows for client/server configuration.

diff -r dfa7c9a45d8e -r 8f01f899bccd make/windows/makefiles/projectcreator.make
--- a/make/windows/makefiles/projectcreator.make	Mon Feb 27 15:25:39 2012 +0100
+++ b/make/windows/makefiles/projectcreator.make	Mon Feb 27 16:26:41 2012 +0100
@@ -208,6 +208,7 @@
 ##################################################
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler1 COMPILER1 \
+ -ignorePath_compiler1 src/share/vm/graal \
 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
 
 ##################################################
@@ -224,6 +225,7 @@
 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make.
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler2 COMPILER2 \
+ -ignorePath_compiler2 src/share/vm/graal \
  -additionalFile_compiler2 $(Platform_arch_model).ad \
  -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model).cpp \
  -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model).hpp \
diff -r dfa7c9a45d8e -r 8f01f899bccd src/cpu/x86/vm/c1_Runtime1_x86.cpp
--- a/src/cpu/x86/vm/c1_Runtime1_x86.cpp	Mon Feb 27 15:25:39 2012 +0100
+++ b/src/cpu/x86/vm/c1_Runtime1_x86.cpp	Mon Feb 27 16:26:41 2012 +0100
@@ -1850,7 +1850,7 @@
       }
       break;
 #endif // !SERIALGC
-
+#ifdef GRAAL
     case graal_unwind_exception_call_id: {
       // remove the frame from the stack
       __ movptr(rsp, rbp);
@@ -2053,9 +2053,7 @@
       __ ret(0);
       break;
     }
-
-
-
+#endif
 
     default:
       { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments);
diff -r dfa7c9a45d8e -r 8f01f899bccd src/share/vm/c1/c1_Runtime1.hpp
--- a/src/share/vm/c1/c1_Runtime1.hpp	Mon Feb 27 15:25:39 2012 +0100
+++ b/src/share/vm/c1/c1_Runtime1.hpp	Mon Feb 27 16:26:41 2012 +0100
@@ -160,12 +160,12 @@
   static void throw_class_cast_exception(JavaThread* thread, oopDesc* object);
   static void throw_incompatible_class_change_error(JavaThread* thread);
   static void throw_array_store_exception(JavaThread* thread, oopDesc* object);
-
+  static void monitorenter(JavaThread* thread, oopDesc* obj, BasicObjectLock* lock);
+  static void monitorexit (JavaThread* thread, BasicObjectLock* lock);
+#ifdef GRAAL
   static void graal_monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock);
   static void graal_monitorexit (JavaThread* thread, oopDesc* obj, BasicLock* lock);
-
-  static void monitorenter(JavaThread* thread, oopDesc* obj, BasicObjectLock* lock);
-  static void monitorexit (JavaThread* thread, BasicObjectLock* lock);
+#endif
 
   static void deoptimize(JavaThread* thread);