8359165: AIX build broken after 8358799
Reviewed-by: kbarrett, jkern
This commit is contained in:
parent
abc76c6b5b
commit
56ce70c5df
@ -59,6 +59,7 @@
|
|||||||
#ifdef AIX
|
#ifdef AIX
|
||||||
#include "loadlib_aix.hpp"
|
#include "loadlib_aix.hpp"
|
||||||
#include "os_aix.hpp"
|
#include "os_aix.hpp"
|
||||||
|
#include "porting_aix.hpp"
|
||||||
#endif
|
#endif
|
||||||
#ifdef LINUX
|
#ifdef LINUX
|
||||||
#include "os_linux.hpp"
|
#include "os_linux.hpp"
|
||||||
@ -1076,7 +1077,7 @@ void os::jvm_path(char *buf, jint buflen) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* fname;
|
const char* fname;
|
||||||
#ifdef AIX
|
#ifdef AIX
|
||||||
Dl_info dlinfo;
|
Dl_info dlinfo;
|
||||||
int ret = dladdr(CAST_FROM_FN_PTR(void *, os::jvm_path), &dlinfo);
|
int ret = dladdr(CAST_FROM_FN_PTR(void *, os::jvm_path), &dlinfo);
|
||||||
@ -1099,7 +1100,7 @@ void os::jvm_path(char *buf, jint buflen) {
|
|||||||
#endif // AIX
|
#endif // AIX
|
||||||
char* rp = nullptr;
|
char* rp = nullptr;
|
||||||
if (fname[0] != '\0') {
|
if (fname[0] != '\0') {
|
||||||
rp = os::realpath(dli_fname, buf, buflen);
|
rp = os::realpath(fname, buf, buflen);
|
||||||
}
|
}
|
||||||
if (rp == nullptr) {
|
if (rp == nullptr) {
|
||||||
return;
|
return;
|
||||||
@ -1137,7 +1138,7 @@ void os::jvm_path(char *buf, jint buflen) {
|
|||||||
"buf has been truncated");
|
"buf has been truncated");
|
||||||
} else {
|
} else {
|
||||||
// Go back to path of .so
|
// Go back to path of .so
|
||||||
rp = os::realpath(dli_fname, buf, buflen);
|
rp = os::realpath(fname, buf, buflen);
|
||||||
if (rp == nullptr) {
|
if (rp == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user