1.1 --- a/src/cpu/sparc/vm/macroAssembler_sparc.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/cpu/sparc/vm/macroAssembler_sparc.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -36,11 +36,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 @@ -3867,7 +3868,7 @@
1.19 }
1.20
1.21 ///////////////////////////////////////////////////////////////////////////////////
1.22 -#ifndef SERIALGC
1.23 +#if INCLUDE_ALL_GCS
1.24
1.25 static address satb_log_enqueue_with_frame = NULL;
1.26 static u_char* satb_log_enqueue_with_frame_end = NULL;
1.27 @@ -4231,7 +4232,7 @@
1.28 bind(filtered);
1.29 }
1.30
1.31 -#endif // SERIALGC
1.32 +#endif // INCLUDE_ALL_GCS
1.33 ///////////////////////////////////////////////////////////////////////////////////
1.34
1.35 void MacroAssembler::card_write_barrier_post(Register store_addr, Register new_val, Register tmp) {
