--- old/src/hotspot/cpu/arm/interp_masm_arm.cpp	2018-04-27 15:29:41.318203004 +0200
+++ new/src/hotspot/cpu/arm/interp_masm_arm.cpp	2018-04-27 15:29:41.074203012 +0200
@@ -445,7 +445,7 @@
 #endif
 
   if (UseCondCardMark) {
-#if INCLUDE_ALL_GCS
+#if INCLUDE_CMSGC
     if (UseConcMarkSweepGC) {
       membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), noreg);
     }
@@ -459,7 +459,7 @@
     bind(already_dirty);
 
   } else {
-#if INCLUDE_ALL_GCS
+#if INCLUDE_CMSGC
     if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
       membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore), noreg);
     }