Skip to content

Commit

Permalink
add JVM_GetResourceLookupCacheURLs
Browse files Browse the repository at this point in the history
This improves support for building with openjdk=$jdk8.  Note, however,
that the Processes test does not pass, since JDK 8's
java.lang.UNIXProcess uses invokedynamic, which Avian does not yet
support.
  • Loading branch information
dicej committed Mar 12, 2015
1 parent 6c7ff98 commit dc7e687
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
4 changes: 2 additions & 2 deletions openjdk.ld
Expand Up @@ -23,7 +23,7 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
#
#
#

# Define public interface.
Expand Down Expand Up @@ -159,6 +159,7 @@ SUNWprivate_1.1 {
JVM_GetMethodParameterAnnotations;
JVM_GetPrimitiveArrayElement;
JVM_GetProtectionDomain;
JVM_GetResourceLookupCacheURLs;
JVM_GetSockName;
JVM_GetSockOpt;
JVM_GetStackAccessControlContext;
Expand Down Expand Up @@ -291,4 +292,3 @@ SUNWprivate_1.1 {
# This is for Forte Analyzer profiling support.
AsyncGetCallTrace;
};

11 changes: 11 additions & 0 deletions src/classpath-openjdk.cpp
Expand Up @@ -441,6 +441,11 @@ class MyClasspath : public Classpath {
setObjectClass(t, c, type(t, GcJclass::Type));
c->setName(t, name);
c->setVmClass(t, class_);
#ifdef HAVE_JclassClassLoader
if (class_->loader() != roots(t)->bootLoader()) {
c->setClassLoader(t, class_->loader());
}
#endif

return c;
}
Expand Down Expand Up @@ -4564,6 +4569,12 @@ extern "C" AVIAN_EXPORT jobject JNICALL
return reinterpret_cast<jobject>(run(t, jvmGetProtectionDomain, arguments));
}

extern "C" AVIAN_EXPORT jobject JNICALL
EXPORT(JVM_GetResourceLookupCacheURLs)(Thread*, jobject)
{
return 0;
}

extern "C" AVIAN_EXPORT void JNICALL
EXPORT(JVM_SetProtectionDomain)(Thread*, jclass, jobject)
{
Expand Down

0 comments on commit dc7e687

Please sign in to comment.