--- old/src/cpu/x86/vm/macroAssembler_x86.hpp	2016-05-18 14:03:56.805118400 -0700
+++ new/src/cpu/x86/vm/macroAssembler_x86.hpp	2016-05-18 14:03:56.402118400 -0700
@@ -453,14 +453,7 @@
   void cmpss2int(XMMRegister opr1, XMMRegister opr2, Register dst, bool unordered_is_less);
   void cmpsd2int(XMMRegister opr1, XMMRegister opr2, Register dst, bool unordered_is_less);
 
-  // Inlined sin/cos generator for Java; must not use CPU instruction
-  // directly on Intel as it does not have high enough precision
-  // outside of the range [-pi/4, pi/4]. Extra argument indicate the
-  // number of FPU stack slots in use; all but the topmost will
-  // require saving if a slow case is necessary. Assumes argument is
-  // on FP TOS; result is on FP TOS.  No cpu registers are changed by
-  // this code.
-  void trigfunc(char trig, int num_fpu_regs_in_use = 1);
+  void mathfunc(address runtime_entry);
 
   // branch to L if FPU flag C2 is set/not set
   // tmp is a temporary register, if none is available use noreg
@@ -1036,9 +1029,6 @@
 
 private:
 
-  // call runtime as a fallback for trig functions and pow/exp.
-  void fp_runtime_fallback(address runtime_entry, int nb_args, int num_fpu_regs_in_use);
-
   // these are private because users should be doing movflt/movdbl
 
   void movss(Address dst, XMMRegister src)     { Assembler::movss(dst, src); }