# HG changeset patch
# User Bernhard Urban <bernhard.urban@jku.at>
# Date 1396049329 -3600
# Node ID 1415a62ac8b267f36952e745adfc3ccbef6d15a8
# Parent  73546bd550f03d4f8bbe70b72021ce813700352c
allow to force bootstrap in tiered

diff -r 73546bd550f0 -r 1415a62ac8b2 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Fri Mar 28 18:33:05 2014 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Sat Mar 29 00:28:49 2014 +0100
@@ -32,6 +32,7 @@
 #include "graal/graalRuntime.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/compilationPolicy.hpp"
+#include "runtime/globals_extension.hpp"
 
 GraalCompiler* GraalCompiler::_instance = NULL;
 
@@ -98,7 +99,11 @@
 
     if (UseCompiler) {
       _external_deopt_i2c_entry = create_external_deopt_i2c();
-      bool bootstrap = COMPILERGRAAL_PRESENT(TieredCompilation ? false : BootstrapGraal) NOT_COMPILERGRAAL(false);
+#ifdef COMPILERGRAAL
+      bool bootstrap = FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal;
+#else
+      bool bootstrap = false;
+#endif
       VMToCompiler::startCompiler(bootstrap);
       _initialized = true;
       CompilationPolicy::completed_vm_startup();
diff -r 73546bd550f0 -r 1415a62ac8b2 src/share/vm/runtime/globals_extension.hpp
--- a/src/share/vm/runtime/globals_extension.hpp	Fri Mar 28 18:33:05 2014 +0100
+++ b/src/share/vm/runtime/globals_extension.hpp	Sat Mar 29 00:28:49 2014 +0100
@@ -86,6 +86,9 @@
 #ifdef COMPILER1
  C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_DIAGNOSTIC_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER)
 #endif
+#ifdef GRAAL
+ GRAAL_FLAGS(GRAAL_DEVELOP_FLAG_MEMBER, GRAAL_PD_DEVELOP_FLAG_MEMBER, GRAAL_PRODUCT_FLAG_MEMBER, GRAAL_PD_PRODUCT_FLAG_MEMBER, GRAAL_NOTPRODUCT_FLAG_MEMBER)
+#endif
 #ifdef COMPILER2
  C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, C2_PD_DEVELOP_FLAG_MEMBER, C2_PRODUCT_FLAG_MEMBER, C2_PD_PRODUCT_FLAG_MEMBER, C2_DIAGNOSTIC_FLAG_MEMBER, C2_EXPERIMENTAL_FLAG_MEMBER, C2_NOTPRODUCT_FLAG_MEMBER)
 #endif