Mercurial > hg > openjdk > jdk9 > jdk
changeset 16277:36810be97098
8171245: Solaris builds fails after JDK-8170663
Reviewed-by: naoto
| author | erikj |
|---|---|
| date | Wed, 14 Dec 2016 19:46:21 +0100 |
| parents | a9fe693da587 |
| children | de18c7fc80ea |
| files | src/java.base/unix/native/libjli/java_md_solinux.c |
| diffstat | 1 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/unix/native/libjli/java_md_solinux.c Wed Dec 14 10:22:02 2016 -0500 +++ b/src/java.base/unix/native/libjli/java_md_solinux.c Wed Dec 14 19:46:21 2016 +0100 @@ -515,23 +515,23 @@ #endif /* __solaris__ */ /* runpath contains current effective LD_LIBRARY_PATH setting */ - - char *new_jvmpath = JLI_StringDup(jvmpath); - new_runpath_size = ((runpath != NULL) ? JLI_StrLen(runpath) : 0) + - 2 * JLI_StrLen(jrepath) + 2 * JLI_StrLen(arch) + + { /* New scope to declare local variable */ + char *new_jvmpath = JLI_StringDup(jvmpath); + new_runpath_size = ((runpath != NULL) ? JLI_StrLen(runpath) : 0) + + 2 * JLI_StrLen(jrepath) + 2 * JLI_StrLen(arch) + #ifdef AIX - /* On AIX we additionally need 'jli' in the path because ld doesn't support $ORIGIN. */ - JLI_StrLen(jrepath) + JLI_StrLen(arch) + JLI_StrLen("/lib//jli:") + + /* On AIX we additionally need 'jli' in the path because ld doesn't support $ORIGIN. */ + JLI_StrLen(jrepath) + JLI_StrLen(arch) + JLI_StrLen("/lib//jli:") + #endif - JLI_StrLen(new_jvmpath) + 52; - new_runpath = JLI_MemAlloc(new_runpath_size); - newpath = new_runpath + JLI_StrLen(LD_LIBRARY_PATH "="); + JLI_StrLen(new_jvmpath) + 52; + new_runpath = JLI_MemAlloc(new_runpath_size); + newpath = new_runpath + JLI_StrLen(LD_LIBRARY_PATH "="); - /* - * Create desired LD_LIBRARY_PATH value for target data model. - */ - { + /* + * Create desired LD_LIBRARY_PATH value for target data model. + */ + { /* remove the name of the .so from the JVM path */ lastslash = JLI_StrRChr(new_jvmpath, '/'); if (lastslash) @@ -572,6 +572,7 @@ JLI_MemFree(new_runpath); return; } + } } /*