Merge master HEAD into openj9-staging #5
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
Reviewed-by: jsjolen, gziemski
Reviewed-by: jsjolen, gziemski
Reviewed-by: dholmes, dcubed, sspitsyn
Reviewed-by: dholmes, dcubed, sspitsyn
Reviewed-by: dholmes, tschatzl, coleenp, lmesnik
Reviewed-by: dholmes, tschatzl, coleenp, lmesnik
Reviewed-by: jlahoda
Reviewed-by: jlahoda
Reviewed-by: ccheung, iklam
Reviewed-by: ccheung, iklam
Reviewed-by: weijun
Reviewed-by: weijun
Reviewed-by: rriggs
Reviewed-by: rriggs
Reviewed-by: naoto
Reviewed-by: naoto
…ver type Reviewed-by: mchung
…ver type Reviewed-by: mchung
…aarch64 8309231: ProblemList vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java Reviewed-by: darcy
…aarch64 8309231: ProblemList vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java Reviewed-by: darcy
…amesTest.java Reviewed-by: sspitsyn, lmesnik
…amesTest.java Reviewed-by: sspitsyn, lmesnik
Reviewed-by: asemenyuk
Reviewed-by: asemenyuk
…running with SM (macOS) Reviewed-by: lancea, alanb
…running with SM (macOS) Reviewed-by: lancea, alanb
…ith ZGC and Generational ZGC again Reviewed-by: bpb, azvegint
Signed-off-by: Jinhang Zhang <Jinhang.Zhang@ibm.com>
…nal/vm/options Reviewed-by: alanb Backport-of: 679a6d89358eb36c596e3ffa9a86869402c9beb9
Reviewed-by: bpb Backport-of: bfef3c3e80d4df98bdb0d853c2e2711cdd8252ce
Add back the provider argument while getting MAC instance
Reviewed-by: rriggs Backport-of: e138685648fb7a756a05f314af2883ce408abdd2
Reviewed-by: mchung Backport-of: 75dcc4ef94d90e4aa7f8ca5eccc97c91492d6eed
Reviewed-by: jlahoda Backport-of: 32243ef47df75241302e243b4fd9627d686437fe
Reviewed-by: naoto Backport-of: 81bfd78901ff540ad0355a466cfad097e701028a
Reviewed-by: azvegint Backport-of: d3d0dbc36369da0c17a66f8b633e73a150ab8c4f
Reviewed-by: tschatzl Backport-of: 92167505b217c0e6074f58f8479be97bc4c776b3
Reviewed-by: mgronlun Backport-of: 84d010a24bd59b80fa9e9158d41eab696a7292a9
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Merge latest openjdk master
|
The comments in ibmruntimes/openj9-openjdk-jdk#608 apply here as well. |
JasonFengJ9
force-pushed
the
mergestaging
branch
2 times, most recently
from
80b9fc0
to
430e7fb
Compare
Updated |
Conflicts:
src/java.base/share/classes/java/lang/Thread.java
src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java
src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
test/jdk/TEST.ROOT
test/jdk/java/foreign/LibraryLookupTest.java
test/jdk/java/foreign/NativeTestHelper.java
test/jdk/java/foreign/SafeFunctionAccessTest.java
test/jdk/java/foreign/StdLibTest.java
test/jdk/java/foreign/TestClassLoaderFindNative.java
test/jdk/java/foreign/TestDowncallScope.java
test/jdk/java/foreign/TestDowncallStack.java
test/jdk/java/foreign/TestFunctionDescriptor.java
test/jdk/java/foreign/TestHeapAlignment.java
test/jdk/java/foreign/TestMatrix.java
test/jdk/java/foreign/TestNULLAddress.java
test/jdk/java/foreign/TestNative.java
test/jdk/java/foreign/TestNulls.java
test/jdk/java/foreign/TestScopedOperations.java
test/jdk/java/foreign/TestSegments.java
test/jdk/java/foreign/TestStringEncoding.java
test/jdk/java/foreign/TestUpcallAsync.java
test/jdk/java/foreign/TestUpcallException.java
test/jdk/java/foreign/TestUpcallHighArity.java
test/jdk/java/foreign/TestUpcallScope.java
test/jdk/java/foreign/TestUpcallStack.java
test/jdk/java/foreign/TestUpcallStructScope.java
test/jdk/java/foreign/TestValueLayouts.java
test/jdk/java/foreign/TestVarArgs.java
test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccess.java
test/jdk/java/foreign/handles/Driver.java
test/jdk/java/foreign/loaderLookup/TestLoaderLookup.java
test/jdk/java/foreign/loaderLookup/TestLoaderLookupJNI.java
test/jdk/java/lang/Thread/virtual/HoldsLock.java
Added protected ByteOrder linkerByteOrder() for following classes:
src/java.base/share/classes/jdk/internal/foreign/abi/s390x/sysv/SysVS390xLinker.java
src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/SysVPPC64leLinker.java
src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java
src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/CallArranger.java
Modified src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java to lazily initialize loadLibraryOnlyIfPresent
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
JasonFengJ9
force-pushed
the
mergestaging
branch
from
430e7fb
to
6f80548
Compare
|
Jenkins compile aix,alinux64,amac,win jdk21 depends eclipse-openj9/openj9#17514 |
This was referenced Jun 20, 2023
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.
Merge master HEAD into openj9-staging
Resolved conflicts:
Added protected ByteOrder linkerByteOrder() for following classes:
Modified
src/java.base/share/classes/jdk/internal/loader/NativeLibraries.javato lazily initializeloadLibraryOnlyIfPresent.This is backporting of
Signed-off-by: Jason Feng fengj@ca.ibm.com