Mercurial > hg > graal-compiler

diff src/cpu/x86/vm/macroAssembler_x86.cpp @ 8002:8391fdd36e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents b30b3c2a0cf2 db9981fd3124
children 91a23b11d8dc
line wrap: on
line diff
--- a/src/cpu/x86/vm/macroAssembler_x86.cpp	Fri Jan 25 03:03:23 2013 -0800
+++ b/src/cpu/x86/vm/macroAssembler_x86.cpp	Sun Jan 27 01:07:09 2013 -0800
@@ -37,11 +37,12 @@
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 #include "gc_implementation/g1/heapRegion.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
 
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */
@@ -3207,7 +3208,7 @@
 
 
 //////////////////////////////////////////////////////////////////////////////////
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
 
 void MacroAssembler::g1_write_barrier_pre(Register obj,
                                           Register pre_val,
@@ -3417,7 +3418,7 @@
   bind(done);
 }
 
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
 //////////////////////////////////////////////////////////////////////////////////