--- old/src/hotspot/cpu/arm/templateTable_arm.cpp	2018-04-27 15:30:36.014201098 +0200
+++ new/src/hotspot/cpu/arm/templateTable_arm.cpp	2018-04-27 15:30:35.762201107 +0200
@@ -193,7 +193,7 @@
 
   assert_different_registers(obj.base(), new_val, tmp1, tmp2, tmp3, noreg);
   switch (barrier) {
-#if INCLUDE_ALL_GCS
+#if INCLUDE_G1GC
     case BarrierSet::G1BarrierSet:
       {
         // flatten object address if needed
@@ -228,7 +228,7 @@
         }
       }
       break;
-#endif // INCLUDE_ALL_GCS
+#endif // INCLUDE_G1GC
     case BarrierSet::CardTableBarrierSet:
       {
         if (is_null) {