Replace JITSERVER_SUPPORT with J9VM_OPT_JITSERVER #8656
Conversation
|
Please fix the copyright dates. |
|
Pull requests will be required for jdk14 and jdk(next). |
Replace macro JITSERVER_SUPPORT with J9VM_OPT_JITSERVER so as to have a single macro to enable the JITServer support both in VM and JIT. Closes: eclipse-openj9#8229 Signed-off-by: Ashutosh Mehra <mehra.ashutosh@ibm.com>
ashu-mehra
force-pushed
the
change_macro
branch
from
9c4157a
to
b9c1fd8
Compare
|
PR for openj9-openjdk-jdk: ibmruntimes/openj9-openjdk-jdk#173
|
|
Do we need similar change in openj9-openjdk-jdk13 as well or is it discontinued? |
|
@mpirvu fyi |
jdk13 is out of support |
|
This removes |
|
@keithc-ca If I remove |
|
It wasn't clear that your intent was to remove the references to |
It's also not hard to do this. PR testing can cover dependent changes. There is no acceptance build to promote, so all the PRs can be delivered at approximately the same time. |
|
@pshipton Is your preference that we just do one round of changes to the extension repos for this? |
|
I have no preference, just saying it's possible to merge it all at once, it doesn't need to be staged like OMR changes do. |
Ok, then let me update the pr in extension repos to remove old variables and then all can be merged together. |
|
Updated the extensions repo to remove old flag. |
| @@ -138,10 +138,6 @@ ifeq ($(HOST_ARCH),x) | |||
| CX_DEFINES+=J9HAMMER | |||
| CX_FLAGS+=-m64 -fPIC | |||
| endif | |||
|
|
|||
| ifneq ($(JITSERVER_SUPPORT),) | |||
There was a problem hiding this comment.
Don't we need these defines? Are the definitions added in some other place?
There was a problem hiding this comment.
This check is for defining the macro JITSERVER_SUPPORT. We should instead use J9VM_OPT_JITSERVER which gets defined in j9cfg.h (when using UMA build system) or by CMakeLists.txt in VM and JIT.
Normally j9cfg.h gets included via j9.h and any code using J9VM_OPT_JITSERVER should now include j9.h.
Before this PR, JIT files didn't include j9.h if there isn't any dependency on it, but with this PR if the JIT files need to see J9VM_OPT_JITSERVER, then j9.h needs to be included.
A case in point is https://github.com/eclipse/openj9/pull/8656/files#diff-65a548d2a6dcefcbcdd234568cac76ab where I have to explicitly include j9.h.
ashu-mehra
changed the title
Instead of adding -DJ9VM_OPT_JITSERVER, add it to j9cfg.h.in so that cmake system can convert it to define or undef depending on the env variable with same name. Signed-off-by: Ashutosh Mehra <mehra.ashutosh@ibm.com>
ashu-mehra
force-pushed
the
change_macro
branch
from
6e04e23
to
c5f120f
Compare
|
@keithc-ca I added a new commit with the suggested changes. Please review. |
|
Jenkins test sanity,extended plinux,xlinuxcm jdk11 depends ibmruntimes/openj9-openjdk-jdk11#269 |
Replace macro JITSERVER_SUPPORT with J9VM_OPT_JITSERVER so as to have
a single macro to enable the JITServer support both in VM and JIT.
Closes: #8229
Signed-off-by: Ashutosh Mehra mehra.ashutosh@ibm.com