# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1459483461 -3600
# Node ID 55e9ca853da2a457f7ac66c0366a753eaf8eba25
# Parent  0bd162aeebfc1dab01792ee7c276fbfe69d33388
PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs introduced by jdk8u40

2016-03-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs
	introduced by jdk8u40
	* Makefile.am:
	(ICEDTEA_PATCHES): Add CACAO patch for PR2776.
	* NEWS: Updated.
	* patches/cacao/pr2776-cache_api.patch:
	Provide a minimal implementation of the lookup
	cache API which basically says we don't implement it.

diff -r 0bd162aeebfc -r 55e9ca853da2 ChangeLog
--- a/ChangeLog	Fri Apr 01 04:24:47 2016 +0100
+++ b/ChangeLog	Fri Apr 01 05:04:21 2016 +0100
@@ -1,3 +1,14 @@
+2016-03-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs
+	introduced by jdk8u40
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add CACAO patch for PR2776.
+	* NEWS: Updated.
+	* patches/cacao/pr2776-cache_api.patch:
+	Provide a minimal implementation of the lookup
+	cache API which basically says we don't implement it.
+
 2015-07-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2035: --enable-cacao builds broken, missing
diff -r 0bd162aeebfc -r 55e9ca853da2 Makefile.am
--- a/Makefile.am	Fri Apr 01 04:24:47 2016 +0100
+++ b/Makefile.am	Fri Apr 01 05:04:21 2016 +0100
@@ -348,7 +348,8 @@
 	patches/cacao/launcher.patch \
 	patches/cacao/pr2032.patch \
 	patches/cacao/pr2035-tempdir.patch \
-	patches/cacao/pr2349.patch
+	patches/cacao/pr2349.patch \
+	patches/cacao/pr2776-cache_api.patch
 else
 if USING_CACAO
 ICEDTEA_PATCHES +=
diff -r 0bd162aeebfc -r 55e9ca853da2 NEWS
--- a/NEWS	Fri Apr 01 04:24:47 2016 +0100
+++ b/NEWS	Fri Apr 01 05:04:21 2016 +0100
@@ -205,6 +205,7 @@
   - PR2350: Update to latest CACAO
   - PR2354: stamps/cacao.stamp tries to touch a file in a directory which doesn't exist
   - PR2355: CACAO build fails to use JRE layout
+  - PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs introduced by jdk8u40
 
 New in release 2.6.3 (2015-11-13):
 
diff -r 0bd162aeebfc -r 55e9ca853da2 patches/cacao/pr2776-cache_api.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2776-cache_api.patch	Fri Apr 01 05:04:21 2016 +0100
@@ -0,0 +1,54 @@
+--- cacao/cacao/src/native/vm/openjdk/jvm.cpp.old	2016-04-01 04:20:21.912052101 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp	2016-04-01 04:50:05.054102464 +0100
+@@ -3882,6 +3882,32 @@
+ 
+ 	return NULL;
+ }
++/* JVM_GetResourceLookupCacheURLs */
++
++jobjectArray JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)
++{
++	TRACEJVMCALLS(("JVM_GetResourceLookupCacheURLs(env=%p, loader=%p)", env, loader));
++
++	return NULL; // tell OpenJDK 8 that the lookup cache API is unavailable
++}
++
++/* JVM_GetResourceLookupCache */
++
++jintArray JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)
++{
++	TRACEJVMCALLS(("JVM_GetResourceLookupCacheURLs(env=%p, loader=%p, resource_name=%s)", env, loader, resource_name));
++
++	return NULL; // tell OpenJDK 8 that the lookup cache API is unavailable
++}
++
++/* JVM_GetResourceLookupCache */
++
++jboolean JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)
++{
++	TRACEJVMCALLS(("JVM_GetResourceLookupCacheURLs(env=%p, loader=%p, classname=%s)", env, loader, classname));
++
++	return JNI_FALSE; // tell OpenJDK 8 we don't know whether it exists or not
++}
+ 	
+ } // extern "C"
+ 
+--- cacao/cacao/contrib/mapfile-vers-product.old	2016-04-01 04:20:21.884052574 +0100
++++ cacao/cacao/contrib/mapfile-vers-product	2016-04-01 04:38:09.502110743 +0100
+@@ -153,6 +153,8 @@
+                 JVM_GetMethodIxNameUTF;
+                 JVM_GetMethodIxSignatureUTF;
+                 JVM_GetMethodParameterAnnotations;
++		JVM_GetResourceLookupCacheURLs;
++		JVM_GetResourceLookupCache;
+                 JVM_GetPrimitiveArrayElement;
+                 JVM_GetProtectionDomain;
+                 JVM_GetSockName;
+@@ -186,6 +188,7 @@
+                 JVM_IsSilentCompiler;
+                 JVM_IsSupportedJNIVersion;
+                 JVM_IsThreadAlive;
++		JVM_KnownToNotExist;
+                 JVM_LatestUserDefinedLoader;
+                 JVM_Listen;
+                 JVM_LoadClass0;