CMake enablement for libjvm31 shim library #13365
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@pshipton / @dnakamura : Do you mind reviewing? This is related to enabling CMake to build the shim library for 31/64-bit interop on z/OS. Thanks! |
pshipton
approved these changes
Aug 24, 2021
joransiu
force-pushed
the
CMAKE_jvm31
branch
2 times, most recently
from
e71c75e
to
f2c13e1
Compare
|
@pshipton : Would appreciate another review of this PR. I fixed an additional issue w..r.t JAVA_SPEC_VERSION not being picked up properly, which affected GetModule API for Java 11+. The extensions repo PR to stage the various libjvm31.* and headers artifacts is : ibmruntimes/openj9-openjdk-jdk#378 Internal zOS Personal Builds IDs: HYC-Jenkins: 11228 and Axxon: 16965. |
keithc-ca
requested changes
Nov 24, 2021
joransiu
force-pushed
the
CMAKE_jvm31
branch
from
f2c13e1
to
4a3c09d
Compare
keithc-ca
reviewed
Nov 24, 2021
joransiu
force-pushed
the
CMAKE_jvm31
branch
from
099ba12
to
247e0ad
Compare
keithc-ca
reviewed
Nov 25, 2021
- Add CMake files to enable building of shim libjvm31.so library on z/OS - CMakeLists.txt in j9vm31 directory builds the 31-bit library in what is otherwise a 64-bit build. - Removes XPLINK and 64-bit compile and link options. - Exports the standard JNI and Invoke interface methods, which translates to EXPORTALL on z/OS. - Add staging of include31 generated header files, as jni.h needs to be customized for the reference types and various parameter struct definitions for 31-bit code to invoke 64-bit JDK. - Invokes generation of jni.h from jni.h.m4, and copying of jni_convert.h and jniport.h Signed-off-by: Joran Siu <joransiu@ca.ibm.com>
GetModule API is guarded by JAVA_SPEC_VERSION check that requires j9cfg.h from the 'include' directory. Add that directory for j9vm31 compiles. This directory needs to be placed after include31, to ensure the correct jni headers are used. Signed-off-by: Joran Siu <joransiu@ca.ibm.com>
joransiu
force-pushed
the
CMAKE_jvm31
branch
from
247e0ad
to
5ac801c
Compare
keithc-ca
approved these changes
Nov 25, 2021
|
Jenkins compile alinux64 jdk8,jdk17 |
|
We have no external PR testing for z/OS, but the builds for alinux succeeded. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
types and various parameter struct definitions for 31-bit code to invoke 64-bit JDK.
Signed-off-by: Joran Siu joransiu@ca.ibm.com