From c404a07dec263c25d25602a9f09379b62914de3b Mon Sep 17 00:00:00 2001
From: Peter Shipton <Peter_Shipton@ca.ibm.com>
Date: Wed, 6 Jan 2021 16:18:41 -0500
Subject: [PATCH] JVM_LoadLibrary() must use lazy library loading by default

Re-include cmdLineTester_defaultLazySymbolResolution for jdk15+

Issue https://github.com/eclipse/openj9/issues/11076

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
---
 runtime/j9vm/jvm.c                                           | 2 +-
 .../cmdLineTests/defaultLazySymbolResolution/playlist.xml    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/runtime/j9vm/jvm.c b/runtime/j9vm/jvm.c
index 06515f3d881..d7dd51ac096 100644
--- a/runtime/j9vm/jvm.c
+++ b/runtime/j9vm/jvm.c
@@ -3692,7 +3692,7 @@ JVM_LoadLibrary(const char *libName)
 		} else {
 			PORT_ACCESS_FROM_JAVAVM(javaVM);
 			UDATA handle = 0;
-			UDATA flags = 0;
+			UDATA flags = J9_ARE_ANY_BITS_SET(javaVM->extendedRuntimeFlags, J9_EXTENDED_RUNTIME_LAZY_SYMBOL_RESOLUTION) ? J9PORT_SLOPEN_LAZY : 0;
 			UDATA slOpenResult = j9sl_open_shared_library((char *)libName, &handle, flags);
 
 			Trc_SC_LoadLibrary_OpenShared(libName);
diff --git a/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml b/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml
index 7d035aeed23..9854223c0fc 100644
--- a/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml
+++ b/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml
@@ -44,11 +44,6 @@
 		<types>
 			<type>native</type>
 		</types>
-		<subsets>
-			<!-- disable for 15+ https://github.com/eclipse/openj9/issues/11076 -->
-			<subset>8</subset>
-			<subset>11</subset>
-		</subsets>
 		<impls>
 			<impl>openj9</impl>
 			<impl>ibm</impl>