src/hotspot/cpu/arm/interp_masm_arm.cpp

rev 49909 : imported patch removeAllGCs.removeUnneededIncludeAllGCs
rev 49911 : imported patch removeAllGCs

*** 41,55 ****
  #include "runtime/basicLock.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/frame.inline.hpp"
  #include "runtime/sharedRuntime.hpp"
  
- #if INCLUDE_ALL_GCS
- #include "gc/g1/g1BarrierSet.hpp"
- #include "gc/g1/heapRegion.hpp"
- #endif // INCLUDE_ALL_GCS
- 
  //--------------------------------------------------------------------
  // Implementation of InterpreterMacroAssembler
  
  
  
--- 41,50 ----
*** 448,458 ****
  #else
    Address card_table_addr(card_table_base, obj, lsr, CardTable::card_shift);
  #endif
  
    if (UseCondCardMark) {
! #if INCLUDE_ALL_GCS
      if (UseConcMarkSweepGC) {
        membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), noreg);
      }
  #endif
      Label already_dirty;
--- 443,453 ----
  #else
    Address card_table_addr(card_table_base, obj, lsr, CardTable::card_shift);
  #endif
  
    if (UseCondCardMark) {
! #if INCLUDE_CMSGC
      if (UseConcMarkSweepGC) {
        membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), noreg);
      }
  #endif
      Label already_dirty;
*** 462,472 ****
  
      set_card(card_table_base, card_table_addr, tmp);
      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);
--- 457,467 ----
  
      set_card(card_table_base, card_table_addr, tmp);
      bind(already_dirty);
  
    } else {
! #if INCLUDE_CMSGC
      if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
        membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore), noreg);
      }
  #endif
      set_card(card_table_base, card_table_addr, tmp);