--- old/src/share/vm/runtime/sharedRuntimeTrans.cpp 2014-05-21 09:06:20.823375000 -0400 +++ new/src/share/vm/runtime/sharedRuntimeTrans.cpp 2014-05-21 09:06:19.788782000 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2014, 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 @@ -56,12 +56,10 @@ # define __LO(x) *(1+(int*)&x) #endif -#if !defined(AIX) -double copysign(double x, double y) { +static double copysignA(double x, double y) { __HI(x) = (__HI(x)&0x7fffffff)|(__HI(y)&0x80000000); return x; } -#endif /* * ==================================================== @@ -87,8 +85,7 @@ hugeX = 1.0e+300, tiny = 1.0e-300; -#if !defined(AIX) -double scalbn (double x, int n) { +static double scalbnA (double x, int n) { int k,hx,lx; hx = __HI(x); lx = __LO(x); @@ -102,19 +99,18 @@ } if (k==0x7ff) return x+x; /* NaN or Inf */ k = k+n; - if (k > 0x7fe) return hugeX*copysign(hugeX,x); /* overflow */ + if (k > 0x7fe) return hugeX*copysignA(hugeX,x); /* overflow */ if (k > 0) /* normal result */ {__HI(x) = (hx&0x800fffff)|(k<<20); return x;} if (k <= -54) { if (n > 50000) /* in case integer overflow in n+k */ - return hugeX*copysign(hugeX,x); /*overflow*/ - else return tiny*copysign(tiny,x); /*underflow*/ + return hugeX*copysignA(hugeX,x); /*overflow*/ + else return tiny*copysignA(tiny,x); /*underflow*/ } k += 54; /* subnormal result */ __HI(x) = (hx&0x800fffff)|(k<<20); return x*twom54; } -#endif /* __ieee754_log(x) * Return the logarithm of x @@ -719,7 +715,7 @@ z = one-(r-z); j = __HI(z); j += (n<<20); - if((j>>20)<=0) z = scalbn(z,n); /* subnormal output */ + if((j>>20)<=0) z = scalbnA(z,n); /* subnormal output */ else __HI(z) += (n<<20); return s*z; }