Mercurial > hg > truffle
changeset 14966:53a0a0b8c234
Backed out e636d62005c3 since GraalVM no longer needs to run in jdk7
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 03 Apr 2014 21:05:13 +0200 |
| parents | c64cd1dd4bd1 |
| children | 661ba1474e0d |
| files | make/bsd/makefiles/mapfile-vers-debug make/bsd/makefiles/mapfile-vers-product make/linux/makefiles/mapfile-vers-debug make/linux/makefiles/mapfile-vers-product src/share/vm/prims/jvm.cpp src/share/vm/prims/jvm.h |
| diffstat | 6 files changed, 0 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/mapfile-vers-debug Thu Apr 03 20:54:30 2014 +0200 +++ b/make/bsd/makefiles/mapfile-vers-debug Thu Apr 03 21:05:13 2014 +0200 @@ -221,8 +221,6 @@ _JVM_SetLength _JVM_SetNativeThreadName _JVM_SetPrimitiveArrayElement - # Preserved so that Graal repo can link against a JDK7 libjava.so works - _JVM_SetProtectionDomain _JVM_SetSockOpt _JVM_SetThreadPriority _JVM_Sleep
--- a/make/bsd/makefiles/mapfile-vers-product Thu Apr 03 20:54:30 2014 +0200 +++ b/make/bsd/makefiles/mapfile-vers-product Thu Apr 03 21:05:13 2014 +0200 @@ -221,8 +221,6 @@ _JVM_SetLength _JVM_SetNativeThreadName _JVM_SetPrimitiveArrayElement - # Preserved so that Graal repo can link against a JDK7 libjava.so works - _JVM_SetProtectionDomain _JVM_SetSockOpt _JVM_SetThreadPriority _JVM_Sleep
--- a/make/linux/makefiles/mapfile-vers-debug Thu Apr 03 20:54:30 2014 +0200 +++ b/make/linux/makefiles/mapfile-vers-debug Thu Apr 03 21:05:13 2014 +0200 @@ -223,8 +223,6 @@ JVM_SetLength; JVM_SetNativeThreadName; JVM_SetPrimitiveArrayElement; - # Preserved so that Graal repo can link against a JDK7 libjava.so works - JVM_SetProtectionDomain; JVM_SetSockOpt; JVM_SetThreadPriority; JVM_Sleep;
--- a/make/linux/makefiles/mapfile-vers-product Thu Apr 03 20:54:30 2014 +0200 +++ b/make/linux/makefiles/mapfile-vers-product Thu Apr 03 21:05:13 2014 +0200 @@ -223,8 +223,6 @@ JVM_SetLength; JVM_SetNativeThreadName; JVM_SetPrimitiveArrayElement; - # Preserved so that Graal repo can link against a JDK7 libjava.so works - JVM_SetProtectionDomain; JVM_SetSockOpt; JVM_SetThreadPriority; JVM_Sleep;
--- a/src/share/vm/prims/jvm.cpp Thu Apr 03 20:54:30 2014 +0200 +++ b/src/share/vm/prims/jvm.cpp Thu Apr 03 21:05:13 2014 +0200 @@ -1121,18 +1121,6 @@ return (jobject) JNIHandles::make_local(env, pd); JVM_END -// Preserved in Graal repo so that linking against a JDK7 libjava.so works -JVM_ENTRY(void, JVM_SetProtectionDomain(JNIEnv *env, jclass cls, jobject protection_domain)) - JVMWrapper("JVM_SetProtectionDomain"); - - ResourceMark rm(THREAD); - const char* msg = "Obsolete JVM_SetProtectionDomain function called"; - size_t buflen = strlen(msg); - char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); - jio_snprintf(buf, buflen, msg); - THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); -JVM_END - static bool is_authorized(Handle context, instanceKlassHandle klass, TRAPS) { // If there is a security manager and protection domain, check the access // in the protection domain, otherwise it is authorized.
--- a/src/share/vm/prims/jvm.h Thu Apr 03 20:54:30 2014 +0200 +++ b/src/share/vm/prims/jvm.h Thu Apr 03 21:05:13 2014 +0200 @@ -477,11 +477,6 @@ JNIEXPORT jboolean JNICALL JVM_IsArrayClass(JNIEnv *env, jclass cls); -// Preserved in Graal repo so that linking against a JDK7 libjava.so works -JNIEXPORT void JNICALL -JVM_SetProtectionDomain(JNIEnv *env, jclass cls, jobject protection_domain); - - JNIEXPORT jboolean JNICALL JVM_IsPrimitiveClass(JNIEnv *env, jclass cls);