--- old/src/java.base/share/classes/java/lang/Runtime.java	2018-06-27 06:57:44.000000000 +0530
+++ new/src/java.base/share/classes/java/lang/Runtime.java	2018-06-27 06:57:44.000000000 +0530
@@ -761,7 +761,7 @@
         load0(Reflection.getCallerClass(), filename);
     }
 
-    synchronized void load0(Class<?> fromClass, String filename) {
+    synchronized NativeLibrary load0(Class<?> fromClass, String filename) {
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
             security.checkLink(filename);
@@ -770,7 +770,7 @@
             throw new UnsatisfiedLinkError(
                 "Expecting an absolute path of the library: " + filename);
         }
-        ClassLoader.loadLibrary(fromClass, filename, true);
+        return ClassLoader.loadLibrary(fromClass, filename, true);
     }
 
     /**
@@ -825,9 +825,9 @@
 
     /**
      * Panama specific: find library given name and lookup.
-     * See {@link jdk.internal.misc.JavaLangAccess#findLibrary(Lookup, String)}.
+     * See {@link jdk.internal.misc.JavaLangAccess#loadLibrary(Lookup, String)}.
      */
-    Library findLibrary(MethodHandles.Lookup lookup, String libname) {
+    Library loadLibrary(MethodHandles.Lookup lookup, String libname) {
         return loadLibrary0(lookup.lookupClass(), libname);
     }
 
--- old/src/java.base/share/classes/java/lang/System.java	2018-06-27 06:57:45.000000000 +0530
+++ new/src/java.base/share/classes/java/lang/System.java	2018-06-27 06:57:45.000000000 +0530
@@ -2174,8 +2174,12 @@
 
             //Panama
             @Override
-            public Library findLibrary(MethodHandles.Lookup lookup, String libname) {
-                return Runtime.getRuntime().findLibrary(lookup, libname);
+            public Library loadLibrary(MethodHandles.Lookup lookup, String libname) {
+                return Runtime.getRuntime().loadLibrary(lookup, libname);
+            }
+            @Override
+            public Library load(MethodHandles.Lookup lookup, String libname) {
+                return Runtime.getRuntime().load0(lookup.lookupClass(), libname);
             }
             @Override
             public Library defaultLibrary() {
--- old/src/java.base/share/classes/java/nicl/Libraries.java	2018-06-27 06:57:47.000000000 +0530
+++ new/src/java.base/share/classes/java/nicl/Libraries.java	2018-06-27 06:57:46.000000000 +0530
@@ -124,7 +124,7 @@
             throw new UnsatisfiedLinkError(
                 "Expecting an absolute path of the library: " + filename);
         }
-        return LibrariesHelper.loadLibrary(checkLookup(lookup), filename);
+        return LibrariesHelper.load(checkLookup(lookup), filename);
     }
 
     public static Library getDefaultLibrary() {
--- old/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java	2018-06-27 06:57:48.000000000 +0530
+++ new/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java	2018-06-27 06:57:48.000000000 +0530
@@ -310,7 +310,7 @@
     //Panama
 
     /**
-     * Panama: find a native library.
+     * Panama: load a native library.
      * @param lookup the lookup object.
      * @param libname the name of the library.
      * @return the found library
@@ -319,7 +319,19 @@
      *             linked with the VM,  or the library cannot be mapped to a
      *             native library image by the host system.
      */
-    Library findLibrary(MethodHandles.Lookup lookup, String libname);
+    Library loadLibrary(MethodHandles.Lookup lookup, String libname);
+
+    /**
+     * Panama: load a native library.
+     * @param lookup the lookup object.
+     * @param libname the absolute path of the library.
+     * @return the loaded library
+     * @throws     UnsatisfiedLinkError if either the libname argument is not an
+     *             absolute path name, the native library is not statically
+     *             linked with the VM, or the library cannot be mapped to
+     *             a native library image by the host system.
+     */
+    Library load(MethodHandles.Lookup lookup, String libname);
 
     /**
      * Panama: lookup default library
--- old/src/java.base/share/classes/jdk/internal/nicl/LibrariesHelper.java	2018-06-27 06:57:50.000000000 +0530
+++ new/src/java.base/share/classes/jdk/internal/nicl/LibrariesHelper.java	2018-06-27 06:57:49.000000000 +0530
@@ -134,7 +134,17 @@
      * @param name Name of the shared library to load.
      */
     public static Library loadLibrary(Lookup lookup, String name) {
-        return jlAccess.findLibrary(lookup, name);
+        return jlAccess.loadLibrary(lookup, name);
+    }
+
+    /**
+     * Load the specified shared library.
+     *
+     * @param lookup Lookup object of the caller.
+     * @param path Path of the shared library to load.
+     */
+    public static Library load(Lookup lookup, String path) {
+        return jlAccess.load(lookup, path);
     }
 
     // return the absolute path of the library of given name by searching
--- /dev/null	2018-06-27 06:57:51.000000000 +0530
+++ new/test/jdk/java/nicl/LibrariesLoadTest.java	2018-06-27 06:57:50.000000000 +0530
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @run testng LibrariesLoadTest
+ */
+
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+import java.nicl.Libraries;
+import org.testng.annotations.*;
+import static org.testng.Assert.*;
+
+// Tests for Libraries.load and Libraries.loadLibrary APIs
+@Test
+public class LibrariesLoadTest {
+    @Test
+    public void testLoadWithAbsolutePath() {
+        String libName = System.mapLibraryName("Hello");
+        String[] paths = System.getProperty("java.library.path").split(File.pathSeparator);
+        boolean foundLib = false;
+        for (String p : paths) {
+            File f = new File(p, libName);
+            if (f.isFile()) {
+                foundLib = true;
+                Libraries.load(MethodHandles.lookup(), f.toString());
+                break;
+            }
+        }
+        assertTrue(foundLib, "Could not locate " + libName);
+    }
+
+    @Test
+    public void testLoadWithSimpleName() {
+        try {
+            Libraries.load(MethodHandles.lookup(), System.mapLibraryName("Hello"));
+            assertTrue(false, "should have thrown exception");
+        } catch (UnsatisfiedLinkError ule) {
+            System.err.println("Got expected exception: " + ule);
+        }
+    }
+
+    @Test
+    public void testLoadLibraryWithPath() {
+        try {
+            Libraries.loadLibrary(MethodHandles.lookup(), File.separator + System.mapLibraryName("Hello"));
+            assertTrue(false, "should have thrown exception");
+        } catch (UnsatisfiedLinkError ule) {
+            System.err.println("Got expected exception: " + ule);
+        }
+    }
+
+    @Test
+    public void testLoadLibraryWithSimpleName() {
+        Libraries.loadLibrary(MethodHandles.lookup(), "Hello");
+    }
+}