Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix JDK24 Windows unresolved external symbols #20829

Merged
merged 1 commit into from
Dec 12, 2024
+18 −8
Merged

Fix JDK24 Windows unresolved external symbols #20829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtime/j9vm/exports.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ jvm_add_exports(jvm
post_block
pre_block
# Additions for Java 7
_JVM_GetStackAccessControlContext@8
_JVM_GetInheritedAccessControlContext@8
_JVM_GetArrayLength@8
_JVM_GetArrayElement@12
_JVM_GetStackTraceElement@12
Expand Down Expand Up @@ -466,6 +464,8 @@ endif()
if(JAVA_SPEC_VERSION LESS 24)
jvm_add_exports(jvm
_JVM_GetClassContext@4
_JVM_GetInheritedAccessControlContext@8
_JVM_GetStackAccessControlContext@8
)
else()
jvm_add_exports(jvm
Expand Down
8 changes: 6 additions & 2 deletions runtime/j9vm/j9vmnatives.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,12 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
<export name="pre_block" />

<!-- Additions for Java 7 -->
<export name="_JVM_GetStackAccessControlContext@8"/>
<export name="_JVM_GetInheritedAccessControlContext@8"/>
<export name="_JVM_GetStackAccessControlContext@8">
<exclude-if condition="spec.java24"/>
</export>
<export name="_JVM_GetInheritedAccessControlContext@8">
<exclude-if condition="spec.java24"/>
</export>
<export name="_JVM_GetArrayLength@8"/>
<export name="_JVM_GetArrayElement@12"/>
<export name="_JVM_GetStackTraceElement@12"/>
Expand Down
4 changes: 2 additions & 2 deletions runtime/jcl/exports.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,6 @@ omr_add_exports(jclse
Java_java_lang_reflect_Proxy_defineClass0__Ljava_lang_ClassLoader_2Ljava_lang_String_2_3BII
Java_java_lang_reflect_Proxy_defineClass0__Ljava_lang_ClassLoader_2Ljava_lang_String_2_3BIILjava_lang_Object_2_3Ljava_lang_Object_2Ljava_lang_Object_2
Java_java_lang_reflect_Proxy_defineClassImpl
Java_java_security_AccessController_getAccSnapshot
Java_java_security_AccessController_getCallerPD
Java_java_util_stream_IntPipeline_promoteGPUCompile
Java_jdk_internal_misc_Unsafe_allocateDBBMemory
Java_jdk_internal_misc_Unsafe_copySwapMemory0
Expand Down Expand Up @@ -456,6 +454,8 @@ endif()

if(JAVA_SPEC_VERSION LESS 24)
omr_add_exports(jclse
Java_java_security_AccessController_getAccSnapshot
Java_java_security_AccessController_getCallerPD
Java_java_security_AccessController_initializeInternal
)
endif()
Expand Down
8 changes: 6 additions & 2 deletions runtime/jcl/uma/se6_vm-side_natives_exports.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,12 @@
<export name="Java_java_lang_Thread_suspendImpl">
<exclude-if condition="spec.java20" />
</export>
<export name="Java_java_security_AccessController_getAccSnapshot" />
<export name="Java_java_security_AccessController_getCallerPD" />
<export name="Java_java_security_AccessController_getAccSnapshot">
<exclude-if condition="spec.java24"/>
</export>
<export name="Java_java_security_AccessController_getCallerPD">
<exclude-if condition="spec.java24"/>
</export>
<export name="JCL_OnLoad" />
<export name="JNI_OnUnload" />
<export name="JVM_OnLoad" />
Expand Down
2 changes: 2 additions & 0 deletions runtime/oti/jclprots.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,8 +921,10 @@ jobject JNICALL Java_java_lang_reflect_Array_multiNewArrayImpl(JNIEnv *env, jcla
/* java_lang_Class.c */
jobject JNICALL Java_java_lang_Class_getDeclaredAnnotationsData(JNIEnv *env, jobject jlClass);
jobject JNICALL Java_java_lang_Class_getStackClasses(JNIEnv *env, jclass jlHeapClass, jint maxDepth, jboolean stopAtPrivileged);
#if JAVA_SPEC_VERSION < 24
jobject JNICALL Java_java_security_AccessController_getAccSnapshot(JNIEnv* env, jclass jsAccessController, jint startingFrame, jboolean forDoPrivilegedWithCombiner);
jobject JNICALL Java_java_security_AccessController_getCallerPD(JNIEnv* env, jclass jsAccessController, jint startingFrame);
#endif /* JAVA_SPEC_VERSION < 24 */
jobject JNICALL Java_com_ibm_oti_vm_VM_getClassNameImpl(JNIEnv *env, jclass recv, jclass jlClass, jboolean internAndAssign);
jobject JNICALL Java_java_lang_Class_getDeclaredFieldImpl(JNIEnv *env, jobject recv, jstring jname);
jarray JNICALL Java_java_lang_Class_getDeclaredFieldsImpl(JNIEnv *env, jobject recv);
Expand Down