# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1466181673 -7200
# Node ID 54f09016769e23491e4ae268136097873d2c1950
# Parent  3426a4ab05c39d306bb8287b8414a1958410ea95
Make sure the client VM can build properly

diff -r 3426a4ab05c3 -r 54f09016769e src/cpu/x86/vm/jvmci_globals_x86.hpp
--- a/src/cpu/x86/vm/jvmci_globals_x86.hpp	Fri Jun 10 14:04:40 2016 +0200
+++ b/src/cpu/x86/vm/jvmci_globals_x86.hpp	Fri Jun 17 18:41:13 2016 +0200
@@ -31,7 +31,7 @@
 // Sets the default values for platform dependent flags used by the JVMCI compiler.
 // (see jvmci_globals.hpp)
 
-#ifndef COMPILER2
+#if !defined(COMPILER2) && !defined(COMPILER1)
 define_pd_global(bool, BackgroundCompilation,        true );
 define_pd_global(bool, UseTLAB,                      true );
 define_pd_global(bool, ResizeTLAB,                   true );
diff -r 3426a4ab05c3 -r 54f09016769e src/share/vm/utilities/macros.hpp
--- a/src/share/vm/utilities/macros.hpp	Fri Jun 10 14:04:40 2016 +0200
+++ b/src/share/vm/utilities/macros.hpp	Fri Jun 17 18:41:13 2016 +0200
@@ -180,7 +180,7 @@
 
 // COMPILER1 variant
 #ifdef COMPILER1
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if defined(COMPILER2)
   #define TIERED
 #endif
 #define COMPILER1_PRESENT(code) code