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.

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

jilconst: don't redefine OMR_GC_CONCURRENT_SCAVENGER #15455

Merged
merged 1 commit into from
Jun 29, 2022

Conversation

keithc-ca
Copy link
Contributor

This is a corrected version of #15406: When defined, continue to write OMR_GC_CONCURRENT_SCAVENGER to jilvalues.

For platforms that include j9cfg.h, avoid generating a duplicate, conflicting definition in jilconsts.

Add missing include in aarch64/runtime/Recompilation.spp.

For platforms that include j9cfg.h, avoid generating a duplicate,
conflicting definition in jilconsts.

When defined, continue to write OMR_GC_CONCURRENT_SCAVENGER
to jilvalues.

Add missing include in aarch64/runtime/Recompilation.spp.

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
@keithc-ca keithc-ca requested a review from pshipton June 29, 2022 13:12
@pshipton
Copy link
Member

jenkins compile amac jdk11

@pshipton
Copy link
Member

pshipton commented Jun 29, 2022

Testing via https://openj9-jenkins.osuosl.org/job/Grinder_testList_1/67/ which passed.

@pshipton pshipton merged commit 6c957c8 into eclipse-openj9:master Jun 29, 2022
@keithc-ca keithc-ca deleted the jilconsts_v2 branch June 29, 2022 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants