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

8066474: Remove the lib/ directory from Linux and Solaris images

Browse source 
Reviewed-by: tbell, ihse, kvn
This commit is contained in:
Erik Joelsson 2016-12-05 17:57:43 +01:00
parent 78e6980e1a
commit 6d271f4386
7 changed files with 20 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

21
hotspot/src/os/linux/vm/os_linux.cpp
View file

@ -218,9 +218,6 @@ bool os::have_special_privileges() {
#endif
#endif
// Cpu architecture string
static char cpu_arch[] = HOTSPOT_LIB_ARCH;
// pid_t gettid()
//
@ -263,7 +260,7 @@ void os::init_system_properties_values() {
//
// 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.so.
// <JAVA_HOME>/lib/{client|server}/libjvm.so.
//
// If "/jre/lib/" appears at the right place in the path, then we
// assume libjvm.so is installed in a JDK and we use this path.
@ -329,11 +326,7 @@ void os::init_system_properties_values() {
if (pslash != NULL) {
pslash = strrchr(buf, '/');
if (pslash != NULL) {
*pslash = '\0'; // Get rid of /<arch>.
pslash = strrchr(buf, '/');
if (pslash != NULL) {
*pslash = '\0'; // Get rid of /lib.
}
*pslash = '\0'; // Get rid of /lib.
}
}
Arguments::set_java_home(buf);
@ -360,9 +353,9 @@ void os::init_system_properties_values() {
// That's +1 for the colon and +1 for the trailing '\0'.
char *ld_library_path = (char *)NEW_C_HEAP_ARRAY(char,
strlen(v) + 1 +
sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,
sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
mtInternal);
sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch);
sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon);
Arguments::set_library_path(ld_library_path);
FREE_C_HEAP_ARRAY(char, ld_library_path);
}
@ -2310,7 +2303,7 @@ void os::jvm_path(char *buf, jint buflen) {
if (Arguments::sun_java_launcher_is_altjvm()) {
// Support for the java launcher's '-XXaltjvm=<path>' option. Typical
// value for buf is "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm.so".
// value for buf is "<JAVA_HOME>/jre/lib/<vmtype>/libjvm.so".
// If "/jre/lib/" appears at the right place in the string, then
// assume we are installed in a JDK and we're done. Otherwise, check
// for a JAVA_HOME environment variable and fix up the path so it
@ -2346,9 +2339,9 @@ void os::jvm_path(char *buf, jint buflen) {
len = strlen(buf);
assert(len < buflen, "Ran out of buffer room");
jrelib_p = buf + len;
snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
snprintf(jrelib_p, buflen-len, "/jre/lib");
if (0 != access(buf, F_OK)) {
snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
snprintf(jrelib_p, buflen-len, "/lib");
}
if (0 == access(buf, F_OK)) {