src/java.base/unix/native/libjli/java_md_solinux.c

rev 53300 : 8217044: [aix] Launcher still adds old path to jli library to LIBPATH

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -372,14 +372,10 @@
         /* runpath contains current effective LD_LIBRARY_PATH setting */
         { /* 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) +
-#ifdef AIX
-                    /* On AIX we additionally need 'jli' in the path because ld doesn't support $ORIGIN. */
-                    JLI_StrLen(jrepath) + 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 "=");
 
 

@@ -393,19 +389,13 @@
                     *lastslash = '\0';
 
                 sprintf(new_runpath, LD_LIBRARY_PATH "="
                         "%s:"
                         "%s/lib:"
-#ifdef AIX
-                        "%s/lib/jli:" /* Needed on AIX because ld doesn't support $ORIGIN. */
-#endif
                         "%s/../lib",
                         new_jvmpath,
                         jrepath,
-#ifdef AIX
-                        jrepath,
-#endif
                         jrepath
                         );
 
                 JLI_MemFree(new_jvmpath);