src/hotspot/cpu/ppc/assembler_ppc.cpp

G1BarrierSet_merge

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
***************
*** 36,47 ****
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1CollectedHeap.inline.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #ifdef PRODUCT
  #define BLOCK_COMMENT(str) // nothing
--- 36,47 ----
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #ifdef PRODUCT
  #define BLOCK_COMMENT(str) // nothing