Define JAVA_SPEC_VERSION only in j9cfg.h #2459
Conversation
| ifdef VERSION_MAJOR | ||
| EXTRA_CMAKE_ARGS += -DJ9VM_JAVA_VERSION=$(VERSION_MAJOR) | ||
| ifneq (,$(VERSION_MAJOR)) | ||
| EXTRA_CMAKE_ARGS += -DJAVA_SPEC_VERSION=$(VERSION_MAJOR) |
There was a problem hiding this comment.
It doesn't seem right to stop defining J9VM_JAVA_VERSION for cmake, at least without fixing all the references. Its used in platform.cmake and version.cmake
There was a problem hiding this comment.
It seems my search for for J9VM_JAVA_VERSION was incomplete: I'll fix those references.
runtime/include/j9cfg.h.ftl
Outdated
| @@ -41,6 +41,8 @@ extern "C" { | |||
|
|
|||
| #define EsExtraVersionString "" | |||
|
|
|||
| #define JAVA_SPEC_VERSION <#if uma.spec.properties.JAVA_SPEC_VERSION.defined>${uma.spec.properties.JAVA_SPEC_VERSION.value}<#else>8</#if> | |||
There was a problem hiding this comment.
Should it be an error if uma.spec.properties.JAVA_SPEC_VERSION is not defined, rather than defaulting to 8?
There was a problem hiding this comment.
Yes an error would be better: I'll fix that.
|
Updated with requested changes. |
|
@dnakamura any concerns with these changes? |
| @@ -43,7 +42,7 @@ target_include_directories(jvm_redirect | |||
| "${j9vm_SOURCE_DIR}/j9vm" | |||
| "${j9vm_BINARY_DIR}/j9vm" | |||
| ) | |||
| target_compile_definitions(jvm_redirect PRIVATE J9VM_JAVA_VERSION=148) | |||
| target_compile_definitions(jvm_redirect PRIVATE J9VM_JAVA9_BUILD=148) | |||
There was a problem hiding this comment.
Are the changes in this file to change from J9VM_JAVA_VERSION to J9VM_JAVA9_BUILD a bug fix, not directly related to the other changes?
There was a problem hiding this comment.
This is an unrelated bug fix. The redirector code cares about J9VM_JAVA9_BUILD.
|
jenkins test sanity win |
|
fyi the jdk8 build failure |
Signed-off-by: Keith W. Campbell <[email protected]>
* don't define JAVA_SPEC_VERSION on any compile command line CMake * redirector code depends on J9VM_JAVA9_BUILD, not J9VM_JAVA_VERSION j9cfg.h.in * fix J9VM_VERSION_MINOR * remove temporary #undefs (EsVersionMajor and EsVersionMinor are not defined elsewhere) Signed-off-by: Keith W. Campbell <[email protected]>
|
jenkins test sanity win |
|
JDK8 - win_x86-64_cmprssptrs failure is the known NPT_ERROR |
Enhance UMA to accept
-Moptions to allow definitions of new macros.Use that new option in buildtools.mk.
Adjust j9cfg.h.ftl to define JAVA_SPEC_VERSION accordingly.
A similar change to j9cfg.h.in was needed for cmake usage.
Remove all definitions of JAVA_SPEC_VERSION on command lines.