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

Jump to bottom

Turn on nestmates spec #2270

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Turn on nestmates spec #2270

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
52 changes: 0 additions & 52 deletions ...jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions buildspecs/j9.flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,10 +2072,6 @@ Only available on zOS</description>
<description>Enables support for Project Valhalla L-World Value Types</description>
<ifRemoved>No support for Project Valhalla L-World Value Types</ifRemoved>
</flag>
<flag id="opt_valhallaNestmates">
<description>Enables support for Project Valhalla Nest Mates</description>
<ifRemoved>No support for Project Valhalla Nest Mates</ifRemoved>
</flag>
<flag id="opt_phpSupport">
<description>Support for PHP interpreter.</description>
<ifRemoved>No support for PHP.</ifRemoved>
Expand Down
281 changes: 0 additions & 281 deletions buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions runtime/include/j9cfg.h.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ extern "C" {
</#if>
</#list>

#if JAVA_SPEC_VERSION >= 11
#define J9VM_OPT_VALHALLA_NESTMATES
#endif

#ifdef __cplusplus
}
#endif
Expand Down
5 changes: 4 additions & 1 deletion runtime/include/j9cfg.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ extern "C" {
#cmakedefine J9VM_OPT_USE_FFI
#cmakedefine J9VM_OPT_USE_FFI_ONLY
#cmakedefine J9VM_OPT_VALHALLA_MVT
#cmakedefine J9VM_OPT_VALHALLA_NESTMATES
#cmakedefine J9VM_OPT_VEE_SUPPORT
#cmakedefine J9VM_OPT_VM_LOCAL_STORAGE
#cmakedefine J9VM_OPT_ZERO
Expand Down Expand Up @@ -283,6 +282,10 @@ extern "C" {
#cmakedefine J9VM_THR_PREEMPTIVE
#cmakedefine J9VM_THR_SMART_DEFLATION

#if JAVA_SPEC_VERSION >= 11
#define J9VM_OPT_VALHALLA_NESTMATES
#endif

#ifdef __cplusplus
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions runtime/include/jvmti.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ typedef enum jvmtiError {
JVMTI_ERROR_NAMES_DONT_MATCH = 69,
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED = 70,
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED = 71,
#if defined(J9VM_OPT_VALHALLA_NESTMATES)
/* #if defined(J9VM_OPT_VALHALLA_NESTMATES) */
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_ATTRIBUTE_CHANGED = 72,
#endif /* defined(J9VM_OPT_VALHALLA_NESTMATES) */
/* #endif defined(J9VM_OPT_VALHALLA_NESTMATES) */
JVMTI_ERROR_UNMODIFIABLE_CLASS = 79,
JVMTI_ERROR_UNMODIFIABLE_MODULE = 80,
JVMTI_ERROR_NOT_AVAILABLE = 98,
Expand Down
1 change: 1 addition & 0 deletions runtime/jcl/cl_se11/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<xi:include href="../uma/se8_exports.xml"></xi:include>
<xi:include href="../uma/se829_exports.xml"></xi:include>
<xi:include href="../uma/se9_exports.xml"></xi:include>
<xi:include href="../uma/se11_exports.xml"></xi:include>

<xi:include href="../uma/vendor_jcl_exports.xml">
<xi:fallback/>
Expand Down
Loading