--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Fri Jan 18 05:33:32 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Wed Jan 23 13:02:39 2013 -0500
@@ -35,6 +35,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/synchronizer.hpp"
+#include "utilities/macros.hpp"
#ifndef CC_INTERP
#define __ _masm->
@@ -125,7 +126,7 @@
bool precise) {
assert(val == noreg || val == rax, "parameter is just for looks");
switch (barrier) {
-#ifndef SERIALGC
+#if INCLUDE_ALL_GCS
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
{
@@ -164,7 +165,7 @@
}
break;
-#endif // SERIALGC
+#endif // INCLUDE_ALL_GCS
case BarrierSet::CardTableModRef:
case BarrierSet::CardTableExtension:
{