Mercurial > hg > truffle
comparison src/os/solaris/vm/os_solaris.cpp @ 2304:23ae54207126
Merge
author | rottenha |
---|---|
date | Mon, 28 Feb 2011 15:35:45 -0800 |
parents | 850b2295a494 da091bb67459 |
children | c303b3532d4a |
comparison
equal
deleted
inserted
replaced
2271:658d198b2e04 | 2304:23ae54207126 |
---|---|
2509 Dl_info dlinfo; | 2509 Dl_info dlinfo; |
2510 int ret = dladdr(CAST_FROM_FN_PTR(void *, os::jvm_path), &dlinfo); | 2510 int ret = dladdr(CAST_FROM_FN_PTR(void *, os::jvm_path), &dlinfo); |
2511 assert(ret != 0, "cannot locate libjvm"); | 2511 assert(ret != 0, "cannot locate libjvm"); |
2512 realpath((char *)dlinfo.dli_fname, buf); | 2512 realpath((char *)dlinfo.dli_fname, buf); |
2513 | 2513 |
2514 if (strcmp(Arguments::sun_java_launcher(), "gamma") == 0) { | 2514 if (Arguments::created_by_gamma_launcher()) { |
2515 // Support for the gamma launcher. Typical value for buf is | 2515 // Support for the gamma launcher. Typical value for buf is |
2516 // "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm.so". If "/jre/lib/" appears at | 2516 // "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm.so". If "/jre/lib/" appears at |
2517 // the right place in the string, then assume we are installed in a JDK and | 2517 // the right place in the string, then assume we are installed in a JDK and |
2518 // we're done. Otherwise, check for a JAVA_HOME environment variable and fix | 2518 // we're done. Otherwise, check for a JAVA_HOME environment variable and fix |
2519 // up the path so it looks like libjvm.so is installed there (append a | 2519 // up the path so it looks like libjvm.so is installed there (append a |