diff -r f90c822e73f8 -r 2d8a650513c2 src/share/vm/runtime/sharedRuntimeTrig.cpp --- a/src/share/vm/runtime/sharedRuntimeTrig.cpp Wed Apr 27 01:25:04 2016 +0800 +++ b/src/share/vm/runtime/sharedRuntimeTrig.cpp Fri Apr 29 00:06:10 2016 +0800 @@ -22,6 +22,12 @@ * */ +/* + * This file has been modified by Loongson Technology in 2015. These + * modifications are Copyright (c) 2015 Loongson Technology, and are made + * available on the same license terms set forth above. + */ + #include "precompiled.hpp" #include "prims/jni.h" #include "runtime/interfaceSupport.hpp" @@ -590,6 +596,14 @@ * then 3 2 * sin(x) = x + (S1*x + (x *(r-y/2)+y)) */ +#ifdef MIPS64 +#undef S1 +#undef S2 +#undef S3 +#undef S4 +#undef S5 +#undef S6 +#endif static const double S1 = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */