Mercurial > hg > graal-jvmci-8

changeset 23696:54f09016769e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure the client VM can build properly
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Fri, 17 Jun 2016 18:41:13 +0200
parents 3426a4ab05c3
children f395f5d9a788
files src/cpu/x86/vm/jvmci_globals_x86.hpp src/share/vm/utilities/macros.hpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 );
--- 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