--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp Wed Apr 11 16:07:42 2018 +0200
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp Wed Apr 11 20:56:56 2018 +0300
@@ -450,9 +450,11 @@
#endif
if (UseCondCardMark) {
+#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC) {
membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), noreg);
}
+#endif
Label already_dirty;
ldrb(tmp, card_table_addr);
@@ -462,9 +464,11 @@
bind(already_dirty);
} else {
+#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore), noreg);
}
+#endif
set_card(card_table_base, card_table_addr, tmp);
}
}