archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8005044: remove crufty '_g' support from HS runtime code

Browse source 
Phase 2 is removing '_g' support from the Runtime code.

Reviewed-by: dcubed, coleenp, hseigel
This commit is contained in:
Ron Durbin 2012-12-19 10:35:08 -08:00 • committed by Daniel D. Daugherty
parent 934898a792
commit 9c761152db
6 changed files with 36 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

25
hotspot/src/os/solaris/vm/os_solaris.cpp
View file

@ -734,12 +734,12 @@ void os::init_system_properties_values() {
// The next steps are taken in the product version:
//
// Obtain the JAVA_HOME value from the location of libjvm[_g].so.
// Obtain the JAVA_HOME value from the location of libjvm.so.
// This library should be located at:
// <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm[_g].so.
// <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm.so.
//
// If "/jre/lib/" appears at the right place in the path, then we
// assume libjvm[_g].so is installed in a JDK and we use this path.
// assume libjvm.so is installed in a JDK and we use this path.
//
// Otherwise exit with message: "Could not create the Java virtual machine."
//
@ -749,9 +749,9 @@ void os::init_system_properties_values() {
// instead of exit check for $JAVA_HOME environment variable.
//
// If it is defined and we are able to locate $JAVA_HOME/jre/lib/<arch>,
// then we append a fake suffix "hotspot/libjvm[_g].so" to this path so
// it looks like libjvm[_g].so is installed there
// <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm[_g].so.
// then we append a fake suffix "hotspot/libjvm.so" to this path so
// it looks like libjvm.so is installed there
// <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm.so.
//
// Otherwise exit.
//
@ -1934,7 +1934,7 @@ const char* os::get_current_directory(char *buf, int buflen) {
return getcwd(buf, buflen);
}
// check if addr is inside libjvm[_g].so
// check if addr is inside libjvm.so
bool os::address_is_in_vm(address addr) {
static address libjvm_base_addr;
Dl_info dlinfo;
@ -2474,7 +2474,7 @@ void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
static char saved_jvm_path[MAXPATHLEN] = { 0 };
// Find the full path to the current module, libjvm.so or libjvm_g.so
// Find the full path to the current module, libjvm.so
void os::jvm_path(char *buf, jint buflen) {
// Error checking.
if (buflen < MAXPATHLEN) {
@ -2522,10 +2522,9 @@ void os::jvm_path(char *buf, jint buflen) {
strcpy(cpu_arch, "amd64");
}
#endif
// Check the current module name "libjvm.so" or "libjvm_g.so".
// Check the current module name "libjvm.so".
p = strrchr(buf, '/');
assert(strstr(p, "/libjvm") == p, "invalid library name");
p = strstr(p, "_g") ? "_g" : "";
realpath(java_home_var, buf);
// determine if this is a legacy image or modules image
@ -2538,11 +2537,9 @@ void os::jvm_path(char *buf, jint buflen) {
}
if (0 == access(buf, F_OK)) {
// Use current module name "libjvm[_g].so" instead of
// "libjvm"debug_only("_g")".so" since for fastdebug version
// we should have "libjvm.so" but debug_only("_g") adds "_g"!
// Use current module name "libjvm.so"
len = strlen(buf);
snprintf(buf + len, buflen-len, "/hotspot/libjvm%s.so", p);
snprintf(buf + len, buflen-len, "/hotspot/libjvm.so");
} else {
// Go back to path of .so
realpath((char *)dlinfo.dli_fname, buf);