--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Tue Mar 06 22:08:30 2018 -0800
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp	Wed Mar 07 10:58:59 2018 +0100
@@ -678,6 +678,7 @@
     assert_different_registers(start, count);
     BarrierSet* bs = Universe::heap()->barrier_set();
     switch (bs->kind()) {
+#if INCLUDE_ALL_GCS
       case BarrierSet::G1BarrierSet:
         // With G1, don't generate the call if we statically know that the target in uninitialized
         if (!uninitialized_target) {
@@ -727,6 +728,7 @@
     BarrierSet* bs = Universe::heap()->barrier_set();
     assert_different_registers(start, count);
     switch (bs->kind()) {
+#if INCLUDE_ALL_GCS
       case BarrierSet::G1BarrierSet:
         {
           __ pusha();                      // push registers