Merge master jdk-11.0.15+2 into openj9-staging #478
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
Backport-of: 0623444ae5a0bbf143c288c7ae2eb2fd5a4ca7ae
Reviewed-by: serb Backport-of: 30f0c6475359516ce454722f06ac0c997e09868b
Reviewed-by: phh Backport-of: 81f39ed3e0176b75dee1c8db24041545bcc68a86
…rianFormatTest fail intermittently Backport-of: f1c20e91d822c6df4c5da895f2abd6305e00bf8b
…8268801 Reviewed-by: phh, clanger
Reviewed-by: roland, kvn Backport-of: 9d5ae2e38074c3df354aeab19ebbab7d4872165a
Backport-of: fe77250fa450ec803d2818dc90c5bf156521d537
8253816: Support macOS W^X 8253817: Support macOS Aarch64 ABI in Interpreter 8253818: Support macOS Aarch64 ABI for compiled wrappers 8253819: Implement os/cpu for macOS/AArch64 8253839: Update tests and JDK code for macOS/Aarch64 8254941: Implement Serviceability Agent for macOS/AArch64 8255776: Change build system for macOS/AArch64 8262903: [macos_aarch64] Thread::current() called on detached thread 8262896: [macos_aarch64] Crash in jni_fast_GetLongField Reviewed-by: adinn, burban, aph Backport-of: dbc9e4b50cdda35f5712deaf440c49f50b9edc96
Conflicts: make/autoconf/build-aux/config.guess Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
keithc-ca
approved these changes
Feb 17, 2022
| @@ -1,6 +1,6 @@ | |||
| #!/bin/sh | |||
| # | |||
| # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. | |||
| # Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. | |||
There was a problem hiding this comment.
There's an extra, unnecessary blank line in this file relative to upstream, that I would have liked to see removed, but I won't hold this up for that.
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.
Resolved conflicts:
Signed-off-by: Jason Feng fengj@ca.ibm.com