1.1 --- a/src/cpu/x86/vm/macroAssembler_x86.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/cpu/x86/vm/macroAssembler_x86.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -37,11 +37,12 @@
1.4 #include "runtime/os.hpp"
1.5 #include "runtime/sharedRuntime.hpp"
1.6 #include "runtime/stubRoutines.hpp"
1.7 -#ifndef SERIALGC
1.8 +#include "utilities/macros.hpp"
1.9 +#if INCLUDE_ALL_GCS
1.10 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
1.11 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
1.12 #include "gc_implementation/g1/heapRegion.hpp"
1.13 -#endif
1.14 +#endif // INCLUDE_ALL_GCS
1.15
1.16 #ifdef PRODUCT
1.17 #define BLOCK_COMMENT(str) /* nothing */
1.18 @@ -3207,7 +3208,7 @@
1.19
1.20
1.21 //////////////////////////////////////////////////////////////////////////////////
1.22 -#ifndef SERIALGC
1.23 +#if INCLUDE_ALL_GCS
1.24
1.25 void MacroAssembler::g1_write_barrier_pre(Register obj,
1.26 Register pre_val,
1.27 @@ -3417,7 +3418,7 @@
1.28 bind(done);
1.29 }
1.30
1.31 -#endif // SERIALGC
1.32 +#endif // INCLUDE_ALL_GCS
1.33 //////////////////////////////////////////////////////////////////////////////////
1.34
1.35
