Mercurial > hg > truffle

diff src/share/vm/runtime/sharedRuntime.cpp @ 8004:df8462fbe585

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author vladidan
date Thu, 07 Feb 2013 20:40:14 -0500
parents 9fae07c31641 db9981fd3124
children 5fc51c1ecdeb a5c95fcf7cb7
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp	Thu Feb 07 12:23:51 2013 -0800
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Thu Feb 07 20:40:14 2013 -0500
@@ -56,6 +56,7 @@
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/hashtable.inline.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/xmlstream.hpp"
 #ifdef TARGET_ARCH_x86
 # include "nativeInst_x86.hpp"
@@ -212,7 +213,7 @@
 }
 #endif // PRODUCT
 
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
 
 // G1 write-barrier pre: executed before a pointer store.
 JRT_LEAF(void, SharedRuntime::g1_wb_pre(oopDesc* orig, JavaThread *thread))
@@ -230,7 +231,7 @@
   thread->dirty_card_queue().enqueue(card_addr);
 JRT_END
 
-#endif // !SERIALGC
+#endif // INCLUDE_ALL_GCS
 
 
 JRT_LEAF(jlong, SharedRuntime::lmul(jlong y, jlong x))