1.1 --- a/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp Fri Jan 18 05:33:32 2013 -0800 1.2 +++ b/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp Wed Jan 23 13:02:39 2013 -0500 1.3 @@ -30,10 +30,11 @@ 1.4 #include "c1/c1_Runtime1.hpp" 1.5 #include "nativeInst_sparc.hpp" 1.6 #include "runtime/sharedRuntime.hpp" 1.7 +#include "utilities/macros.hpp" 1.8 #include "vmreg_sparc.inline.hpp" 1.9 -#ifndef SERIALGC 1.10 +#if INCLUDE_ALL_GCS 1.11 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" 1.12 -#endif 1.13 +#endif // INCLUDE_ALL_GCS 1.14 1.15 #define __ ce->masm()-> 1.16 1.17 @@ -420,7 +421,7 @@ 1.18 1.19 1.20 /////////////////////////////////////////////////////////////////////////////////// 1.21 -#ifndef SERIALGC 1.22 +#if INCLUDE_ALL_GCS 1.23 1.24 void G1PreBarrierStub::emit_code(LIR_Assembler* ce) { 1.25 // At this point we know that marking is in progress. 1.26 @@ -483,7 +484,7 @@ 1.27 __ delayed()->nop(); 1.28 } 1.29 1.30 -#endif // SERIALGC 1.31 +#endif // INCLUDE_ALL_GCS 1.32 /////////////////////////////////////////////////////////////////////////////////// 1.33 1.34 #undef __