*** old/src/cpu/sparc/vm/templateTable_sparc.cpp	Thu Feb  5 10:54:00 2015
--- new/src/cpu/sparc/vm/templateTable_sparc.cpp	Thu Feb  5 10:54:00 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. 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
   * published by the Free Software Foundation.

*** 54,64 ****
--- 54,63 ----
                           bool precise) {
    assert(tmp != val && tmp != base && tmp != index, "register collision");
    assert(index == noreg || offset == 0, "only one offset");
    switch (barrier) {
  #if INCLUDE_ALL_GCS
      case BarrierSet::G1SATBCT:
      case BarrierSet::G1SATBCTLogging:
        {
          // Load and record the previous value.
          __ g1_write_barrier_pre(base, index, offset,
                                  noreg /* pre_val */,