src/cpu/sparc/vm/relocInfo_sparc.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2013, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2017, 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.
*** 91,101 ****
      }
      break;
  
    case Assembler::branch_op:
      {
- #ifdef _LP64
      jint inst2;
      guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi");
      if (format() != 0) {
        assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type, "only narrow oops or klasses case");
        jint np = type() == relocInfo::oop_type ? oopDesc::encode_heap_oop((oop)x) : Klass::encode_klass((Klass*)x);
--- 91,100 ----
*** 119,139 ****
      if (verify_only) {
        ip->verify_data64_sethi( ip->addr_at(0), (intptr_t)x );
      } else {
        ip->set_data64_sethi( ip->addr_at(0), (intptr_t)x );
      }
- #else
-     guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi");
-     inst &= ~Assembler::hi22(     -1);
-     inst |=  Assembler::hi22((intptr_t)x);
-     // (ignore offset; it doesn't play into the sethi)
-     if (verify_only) {
-       guarantee(ip->long_at(0) == inst, "instructions must match");
-     } else {
-       ip->set_long_at(0, inst);
-     }
- #endif
      }
      break;
  
    default:
      guarantee(false, "instruction must perform arithmetic or memory access");
--- 118,127 ----