*** old/src/cpu/x86/vm/macroAssembler_x86.cpp	Mon Jan  5 17:33:08 2015
--- new/src/cpu/x86/vm/macroAssembler_x86.cpp	Mon Jan  5 17:33:08 2015

*** 3182,3192 ****
--- 3182,3207 ----
        ffree(1);
      }
      jmp(done);
    } else {
      // Stack: X Y
!     Label x_negative, y_odd;
!     Label x_negative, y_not_2;
+ 
+     static double two = 2.0;
+     ExternalAddress two_addr((address)&two);
+ 
+     fld_d(two_addr);            // Stack: 2 X Y
+     fcmp(tmp, 2, true, false);  // Stack: X Y
+     jcc(Assembler::parity, y_not_2);
+     jcc(Assembler::notEqual, y_not_2);
+ 
+     fxch(); fpop();             // Stack: X
+     fmul(0);                    // Stack: X*X
+     
+     jmp(done);
+ 
+     bind(y_not_2);
  
      fldz();                     // Stack: 0 X Y
      fcmp(tmp, 1, true, false);  // Stack: X Y
      jcc(Assembler::above, x_negative);