src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp

*** 35,44 ****
--- 35,45 ----
  #include "vmreg_x86.inline.hpp"
  
  
  #define __ ce->masm()->
  
+ #ifndef _LP64
  float ConversionStub::float_zero = 0.0;
  double ConversionStub::double_zero = 0.0;
  
  void ConversionStub::emit_code(LIR_Assembler* ce) {
    __ bind(_entry);
*** 50,60 ****
                ExternalAddress((address)&float_zero));
    } else if (input()->is_double_xmm()) {
      __ comisd(input()->as_xmm_double_reg(),
                ExternalAddress((address)&double_zero));
    } else {
-     LP64_ONLY(ShouldNotReachHere());
      __ push(rax);
      __ ftst();
      __ fnstsw_ax();
      __ sahf();
      __ pop(rax);
--- 51,60 ----
*** 74,83 ****
--- 74,84 ----
    __ xorptr(result()->as_register(), result()->as_register());
  
    __ bind(do_return);
    __ jmp(_continuation);
  }
+ #endif // !_LP64
  
  void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
    __ bind(_entry);
    Metadata *m = _method->as_constant_ptr()->as_metadata();
    ce->store_parameter(m, 1);