diff -r 5db7479be994 -r 8008ed6e4a37 jdk/make/common/Defs-solaris.gmk --- a/jdk/make/common/Defs-solaris.gmk Wed Jun 16 12:40:22 2010 -0700 +++ b/jdk/make/common/Defs-solaris.gmk Wed Jun 16 14:07:47 2010 -0700 @@ -639,21 +639,8 @@ # in general this is ok to continue to do. LIBCXX = /usr/lib$(ISA_DIR)/libCrun.so.1 -# Math Library (libm.so), do not use -lm. -# There might be two versions of libm.so on the build system: -# libm.so.1 and libm.so.2, and we want libm.so.1. -# Depending on the Solaris release being used to build with, -# /usr/lib/libm.so could point at a libm.so.2, so we are -# explicit here so that the libjvm.so you have built will work on an -# older Solaris release that might not have libm.so.2. -# This is a critical factor in allowing builds on Solaris 10 or newer -# to run on Solaris 8 or 9. -# -# Note: Historically there was also a problem picking up a static version -# of libm.a from the compiler area, but that problem has gone away -# with the newer compilers. Use of libm.a would cause .so bloat. -# -LIBM = /usr/lib$(ISA_DIR)/libm.so.1 +# JDK now requires Solaris 10, so pick up libm.so.2 +LIBM = /usr/lib$(ISA_DIR)/libm.so.2 # Socket library LIBSOCKET = -lsocket