# HG changeset patch
# User dpochepk
# Date 1523469416 -10800
# Node ID bebec5011846747c1ee5b44f6af5f5e6f8e22da2
# Parent  6a880e57685653c68836eb59ef2ba19ed313e6d3
8189101: AARCH32 - 'minimal' build fails because CMS bits are referred unconditionally
Reviewed-by: shade, dholmes
Contributed-by: boris.ulasevich@bell-sw.com

diff -r 6a880e576856 -r bebec5011846 src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp	Wed Apr 11 16:07:42 2018 +0200
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp	Wed Apr 11 20:56:56 2018 +0300
@@ -533,9 +533,11 @@
     set_card(tmp, card_addr);
     __ branch_destination(L_already_dirty->label());
   } else {
+#if INCLUDE_ALL_GCS
     if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
       __ membar_storestore();
     }
+#endif
     set_card(tmp, card_addr);
   }
 }
diff -r 6a880e576856 -r bebec5011846 src/hotspot/cpu/arm/interp_masm_arm.cpp
--- 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);
   }
 }