comparison src/os/solaris/vm/os_solaris.cpp @ 18007:364b73402247

Merge
author asaha
date Thu, 22 May 2014 11:09:06 -0700
parents 6048424d3865 5656140324ed
children f73af4455d7d
comparison
equal deleted inserted replaced
17920:382a82b0a3e7 18007:364b73402247
1739 // Die immediately, no exit hook, no abort hook, no cleanup. 1739 // Die immediately, no exit hook, no abort hook, no cleanup.
1740 void os::die() { 1740 void os::die() {
1741 ::abort(); // dump core (for debugging) 1741 ::abort(); // dump core (for debugging)
1742 } 1742 }
1743 1743
1744 // unused
1745 void os::set_error_file(const char *logfile) {}
1746
1747 // DLL functions 1744 // DLL functions
1748 1745
1749 const char* os::dll_file_extension() { return ".so"; } 1746 const char* os::dll_file_extension() { return ".so"; }
1750 1747
1751 // This must be hard coded because it's the system's temporary 1748 // This must be hard coded because it's the system's temporary
2385 2382
2386 realpath(java_home_var, buf); 2383 realpath(java_home_var, buf);
2387 // determine if this is a legacy image or modules image 2384 // determine if this is a legacy image or modules image
2388 // modules image doesn't have "jre" subdirectory 2385 // modules image doesn't have "jre" subdirectory
2389 len = strlen(buf); 2386 len = strlen(buf);
2387 assert(len < buflen, "Ran out of buffer space");
2390 jrelib_p = buf + len; 2388 jrelib_p = buf + len;
2391 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch); 2389 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
2392 if (0 != access(buf, F_OK)) { 2390 if (0 != access(buf, F_OK)) {
2393 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch); 2391 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
2394 } 2392 }
2403 } 2401 }
2404 } 2402 }
2405 } 2403 }
2406 } 2404 }
2407 2405
2408 strcpy(saved_jvm_path, buf); 2406 strncpy(saved_jvm_path, buf, MAXPATHLEN);
2409 } 2407 }
2410 2408
2411 2409
2412 void os::print_jni_name_prefix_on(outputStream* st, int args_size) { 2410 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
2413 // no prefix required, not even "_" 2411 // no prefix required, not even "_"