*** old/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Thu Apr 10 17:35:57 2014
--- new/src/cpu/sparc/vm/macroAssembler_sparc.inline.hpp	Thu Apr 10 17:35:57 2014

*** 231,240 ****
--- 231,241 ----
  inline void MacroAssembler::br( Condition c, bool a, Predict p, address d, relocInfo::relocType rt ) {
    Assembler::bp(c, a, icc, p, d, rt);
  }
  
  inline void MacroAssembler::br( Condition c, bool a, Predict p, Label& L ) {
+   insert_nop_after_cbcond();
    br(c, a, p, target(L));
  }
  
  
  // Branch that tests either xcc or icc depending on the

*** 246,255 ****
--- 247,257 ----
      MacroAssembler::br(c, a, p, d, rt);
  #endif
  }
  
  inline void MacroAssembler::brx( Condition c, bool a, Predict p, Label& L ) {
+   insert_nop_after_cbcond();
    brx(c, a, p, target(L));
  }
  
  inline void MacroAssembler::ba( Label& L ) {
    br(always, false, pt, L);

*** 267,276 ****
--- 269,279 ----
  inline void MacroAssembler::fb( Condition c, bool a, Predict p, address d, relocInfo::relocType rt ) {
    fbp(c, a, fcc0, p, d, rt);
  }
  
  inline void MacroAssembler::fb( Condition c, bool a, Predict p, Label& L ) {
+   insert_nop_after_cbcond();
    fb(c, a, p, target(L));
  }
  
  inline void MacroAssembler::fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt ) {
    Assembler::fbp(c, a, cc, p, d, rt);

*** 316,325 ****
--- 319,329 ----
    Assembler::call( d, rt );
  #endif
  }
  
  inline void MacroAssembler::call( Label& L,   relocInfo::relocType rt ) {
+   insert_nop_after_cbcond();
    MacroAssembler::call( target(L), rt);
  }