1.1 --- a/src/os/bsd/vm/os_bsd.cpp Mon Dec 17 10:40:52 2012 -0800
1.2 +++ b/src/os/bsd/vm/os_bsd.cpp Wed Dec 19 10:35:08 2012 -0800
1.3 @@ -298,12 +298,12 @@
1.4
1.5 // The next steps are taken in the product version:
1.6 //
1.7 - // Obtain the JAVA_HOME value from the location of libjvm[_g].so.
1.8 + // Obtain the JAVA_HOME value from the location of libjvm.so.
1.9 // This library should be located at:
1.10 - // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm[_g].so.
1.11 + // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm.so.
1.12 //
1.13 // If "/jre/lib/" appears at the right place in the path, then we
1.14 - // assume libjvm[_g].so is installed in a JDK and we use this path.
1.15 + // assume libjvm.so is installed in a JDK and we use this path.
1.16 //
1.17 // Otherwise exit with message: "Could not create the Java virtual machine."
1.18 //
1.19 @@ -313,9 +313,9 @@
1.20 // instead of exit check for $JAVA_HOME environment variable.
1.21 //
1.22 // If it is defined and we are able to locate $JAVA_HOME/jre/lib/<arch>,
1.23 - // then we append a fake suffix "hotspot/libjvm[_g].so" to this path so
1.24 - // it looks like libjvm[_g].so is installed there
1.25 - // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm[_g].so.
1.26 + // then we append a fake suffix "hotspot/libjvm.so" to this path so
1.27 + // it looks like libjvm.so is installed there
1.28 + // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm.so.
1.29 //
1.30 // Otherwise exit.
1.31 //
1.32 @@ -1228,7 +1228,7 @@
1.33 return getcwd(buf, buflen);
1.34 }
1.35
1.36 -// check if addr is inside libjvm[_g].so
1.37 +// check if addr is inside libjvm.so
1.38 bool os::address_is_in_vm(address addr) {
1.39 static address libjvm_base_addr;
1.40 Dl_info dlinfo;
1.41 @@ -1689,7 +1689,7 @@
1.42
1.43 static char saved_jvm_path[MAXPATHLEN] = {0};
1.44
1.45 -// Find the full path to the current module, libjvm or libjvm_g
1.46 +// Find the full path to the current module, libjvm
1.47 void os::jvm_path(char *buf, jint buflen) {
1.48 // Error checking.
1.49 if (buflen < MAXPATHLEN) {
1.50 @@ -1732,10 +1732,9 @@
1.51 char* jrelib_p;
1.52 int len;
1.53
1.54 - // Check the current module name "libjvm" or "libjvm_g".
1.55 + // Check the current module name "libjvm"
1.56 p = strrchr(buf, '/');
1.57 assert(strstr(p, "/libjvm") == p, "invalid library name");
1.58 - p = strstr(p, "_g") ? "_g" : "";
1.59
1.60 rp = realpath(java_home_var, buf);
1.61 if (rp == NULL)
1.62 @@ -1764,11 +1763,9 @@
1.63 // to complete the path to JVM being overridden. Otherwise fallback
1.64 // to the path to the current library.
1.65 if (0 == access(buf, F_OK)) {
1.66 - // Use current module name "libjvm[_g]" instead of
1.67 - // "libjvm"debug_only("_g")"" since for fastdebug version
1.68 - // we should have "libjvm" but debug_only("_g") adds "_g"!
1.69 + // Use current module name "libjvm"
1.70 len = strlen(buf);
1.71 - snprintf(buf + len, buflen-len, "/libjvm%s%s", p, JNI_LIB_SUFFIX);
1.72 + snprintf(buf + len, buflen-len, "/libjvm%s", JNI_LIB_SUFFIX);
1.73 } else {
1.74 // Fall back to path of current library
1.75 rp = realpath(dli_fname, buf);
