Fix various makefile issues with JDK11 #7

ChengJin01 · 2018-07-25T20:21:42Z

The changes are to resolve all makefile issues
when compiling JDK11 on Windows.

Signed-off-by: CHENGJin [email protected]

ChengJin01 · 2018-07-25T20:23:29Z

Reviewer: @keithc-ca , @pshipton
FYI: @DanHeidinga

ChengJin01 · 2018-07-25T20:24:18Z

The following issues are addressed in the changes:

closed/OpenJ9.gmk:
[1] set up enviroment variable (lib, include)
[2] override vm/lib/jvm.dll & exp with /vm/j9vm_jdk11/jdk11_jvm.dll & exp to
ensure new JDK11 natives are exported correctly
closed/autoconf/custom-hook.m4:
specify the library path on Windows (vm/lib)
closed/autoconf/custom-spec.gmk.in:
export MSVC_VERSION (2017) to have openJ9 set up the new library(ucrt, vcruntime) with VS2017
closed/make/copy/Copy-java.base.gmk: set up another path for jvm.dll
closed/src/java.base/conf/jvm.cfg: disable server/client
closed/make/lib/LibCommon.gmk: removed as FindSrcDirsForLib no longer exists in make/lib/LibCommon.gmk

ChengJin01

Reviewer: @keithc-ca , @pshipton

keithc-ca · 2018-07-25T21:05:55Z

closed/OpenJ9.gmk

+ifeq (windows,$(OPENJDK_TARGET_OS))
+	@$(ECHO) "Updating vm/lib/jvm.* with vm/j9vm_jdk11/jdk11_jvm.*"
+	@$(CP) -p $(OUTPUTDIR)/vm/j9vm_jdk11/jdk11_jvm$(STATIC_LIBRARY_SUFFIX) $(OUTPUTDIR)/vm/lib/jvm$(STATIC_LIBRARY_SUFFIX)
+	@$(CP) -p $(OUTPUTDIR)/vm/j9vm_jdk11/jdk11_jvm.exp $(OUTPUTDIR)/vm/lib/jvm.exp


These commands ought to use $(LIBRARY_PREFIX) even though it's normally empty.

Agreed and added.

It should have been added to both arguments of $(CP).

pshipton · 2018-07-25T20:49:30Z

closed/src/java.base/conf/jvm.cfg

@@ -17,6 +17,8 @@
 # 
 # ===========================================================================
 -j9vm KNOWN
+-server IGNORE


Does not having these IGNORE's cause any problem?

We still have the following setting in OpenJ9.gmk to deal with the /server directory
e.g.

@$(MKDIR) -p $(MODULES_LIBS_DIR)/java.base/server @$(CP) -p $(OUTPUTDIR)/vm/redirector/$(LIBRARY_PREFIX)jvm_jdk11$(SHARED_LIBRARY_SUFFIX) $(MODULES_LIBS_DIR)/java.base/server/$(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX)

If the /server should be totally removed, then all changes in jvm.cfg and Copy-java.base.gmk won't be necessary.

Not sure why its different from jdk10, which doesn't IGNORE server.

Although the file is there in the jdk10 extensions, perhaps its not used?

I will try recompiling without the setting with /server and all changes with jvm.cfg to whether it still works.

We create a server directory intentionally, for compatibility with OpenJDK. So an app which looks in the server directory for the libjvm.so will find it and work. I don't want to remove that part, if that is what you meant.

Yes. So all changes related to jvm.cfg should be kept there in favor of the operations on the server directory.

pshipton · 2018-07-25T21:00:48Z

closed/make/copy/Copy-java.base.gmk

@@ -29,6 +29,7 @@ ALT_JVMCFG_SRC := $(TOPDIR)/closed/src/java.base/conf/jvm.cfg
 override-jvm.cfg : $(LIB_DST_DIR)/jvm.cfg
 	$(ECHO) "Overriding jvm.cfg with J9VM version"
 	$(CP) $(ALT_JVMCFG_SRC) $(LIB_DST_DIR)/jvm.cfg
+	$(CP) $(ALT_JVMCFG_SRC) $(OUTPUTDIR)/jdk/lib/jvm.cfg


Why is this required?

As explained above, it is checked for /server. If we agree to remove all setting for /server, then there is no need to change here.

pshipton · 2018-07-25T21:17:37Z

closed/OpenJ9.gmk

+ifeq (windows,$(OPENJDK_TARGET_OS))
+	@$(ECHO) "Updating vm/lib/jvm.* with vm/j9vm_jdk11/jdk11_jvm.*"
+	@$(CP) -p $(OUTPUTDIR)/vm/j9vm_jdk11/jdk11_jvm$(STATIC_LIBRARY_SUFFIX) $(OUTPUTDIR)/vm/lib/jvm$(STATIC_LIBRARY_SUFFIX)
+	@$(CP) -p $(OUTPUTDIR)/vm/j9vm_jdk11/jdk11_jvm.exp $(OUTPUTDIR)/vm/lib/jvm.exp


Does it still work without copying the .exp file?

It needs to recompiled without .exp to see whether it still works.

Already recompiled and it seems there is no issue detected during compilation (also no problem with jdk/bin/java -version). So removed the setting for jvm.exp.

pshipton · 2018-07-25T23:46:19Z

@jdekonin do we have any PR builds for jdk11 yet?

jenkins compile xlinux

pshipton · 2018-07-26T01:34:55Z

@jdekonin Adam mentioned that only you can run jdk11 builds, however all committers should be able to start them from extensions, or from OpenJ9. For OpenJ9 they just shouldn't be enabled by default, but must be explicitly requested.

pshipton · 2018-07-26T01:35:46Z

Anyway, I want to ensure these changes for Windows don't break the xLinux build.

pshipton · 2018-07-26T01:59:14Z

@ChengJin01 note that once we finalize these changes, they should also be delivered to the "head" stream https://github.com/ibmruntimes/openj9-openjdk-jdk

The changes are to resolve all makefile issues when compiling JDK11 on Windows. Signed-off-by: CHENGJin <[email protected]>

ChengJin01 · 2018-07-26T02:05:46Z

once we finalize these changes, they should also be delivered to the "head" stream https://github.com/ibmruntimes/openj9-openjdk-jdk

If so, I need to create a pull request on ibmruntimes/openj9-openjdk-jdk to verify the compilation result.

AdamBrousseau · 2018-07-26T13:12:16Z

jenkins compile xlinux

Copy configured values to relevant UMA properties in .spec files

Changes to get z/OS build to work

ChengJin01 commented Jul 25, 2018

View reviewed changes

keithc-ca reviewed Jul 25, 2018

View reviewed changes

pshipton reviewed Jul 25, 2018

View reviewed changes

ChengJin01 mentioned this pull request Jul 25, 2018

Support for compiling Windows on VS2017 eclipse-openj9/openj9#1697

Closed

ChengJin01 force-pushed the WIN_JDK11_COMP_OPENJ9 branch from a786f96 to c162312 Compare July 25, 2018 22:15

Fix various makefile issues with JDK11

286ddeb

The changes are to resolve all makefile issues when compiling JDK11 on Windows. Signed-off-by: CHENGJin <[email protected]>

ChengJin01 force-pushed the WIN_JDK11_COMP_OPENJ9 branch from c162312 to 286ddeb Compare July 26, 2018 02:02

pshipton approved these changes Jul 26, 2018

View reviewed changes

pshipton merged commit e5c64f5 into ibmruntimes:openj9 Jul 26, 2018

hangshao0 pushed a commit to hangshao0/openj9-openjdk-jdk11 that referenced this pull request Dec 24, 2018

Merge pull request ibmruntimes#7 from keithc-ca/tools

07634c1

Copy configured values to relevant UMA properties in .spec files

ChengJin01 deleted the WIN_JDK11_COMP_OPENJ9 branch June 19, 2019 20:49

keithc-ca pushed a commit to keithc-ca/openj9-openjdk11 that referenced this pull request Mar 24, 2021

Merge pull request ibmruntimes#7 from GROEGES/sg-zos_bringup

398a240

Changes to get z/OS build to work

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix various makefile issues with JDK11 #7

Fix various makefile issues with JDK11 #7

ChengJin01 commented Jul 25, 2018

ChengJin01 commented Jul 25, 2018

ChengJin01 commented Jul 25, 2018

ChengJin01 left a comment

keithc-ca Jul 25, 2018

ChengJin01 Jul 25, 2018

keithc-ca Jul 31, 2018

pshipton Jul 25, 2018

ChengJin01 Jul 25, 2018 •

edited

Loading

pshipton Jul 25, 2018

pshipton Jul 25, 2018

ChengJin01 Jul 26, 2018

pshipton Jul 26, 2018

ChengJin01 Jul 26, 2018

pshipton Jul 25, 2018

ChengJin01 Jul 25, 2018 •

edited

Loading

pshipton Jul 25, 2018

ChengJin01 Jul 25, 2018

ChengJin01 Jul 26, 2018

pshipton commented Jul 25, 2018

pshipton commented Jul 26, 2018 •

edited

Loading

pshipton commented Jul 26, 2018

pshipton commented Jul 26, 2018

ChengJin01 commented Jul 26, 2018

AdamBrousseau commented Jul 26, 2018

Fix various makefile issues with JDK11 #7

Fix various makefile issues with JDK11 #7

Conversation

ChengJin01 commented Jul 25, 2018

ChengJin01 commented Jul 25, 2018

ChengJin01 commented Jul 25, 2018

ChengJin01 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChengJin01 Jul 25, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChengJin01 Jul 25, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pshipton commented Jul 25, 2018

pshipton commented Jul 26, 2018 • edited Loading

pshipton commented Jul 26, 2018

pshipton commented Jul 26, 2018

ChengJin01 commented Jul 26, 2018

AdamBrousseau commented Jul 26, 2018

ChengJin01 Jul 25, 2018 •

edited

Loading

ChengJin01 Jul 25, 2018 •

edited

Loading

pshipton commented Jul 26, 2018 •

edited

Loading