Mercurial > hg > graal-compiler
diff src/share/vm/runtime/sharedRuntime.cpp @ 8001:db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
Summary: Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS.
Reviewed-by: coleenp, stefank
| author | jprovino |
|---|---|
| date | Wed, 23 Jan 2013 13:02:39 -0500 |
| parents | 0c8717a92b2d |
| children | df8462fbe585 |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp Fri Jan 18 05:33:32 2013 -0800 +++ b/src/share/vm/runtime/sharedRuntime.cpp Wed Jan 23 13:02:39 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))