Re: RFR: JDK-8198303 - jdk11+1 was build with incorrect GA date as 2018-03-20
Retroactively Reviewed. Thanks, David On 21/02/2018 5:09 PM, Abhijit Saha wrote: It's a retroactive review request. Fix has been integrated after reviewed internally. jdk11+1 (first build of jdk11) was promoted with incorrect Release Date. Need to be updated with correct GA date as per internal release roadmap. Bug: https://bugs.openjdk.java.net/browse/JDK-8198303 Webrev: http://cr.openjdk.java.net/~asaha/8198303/webrev.01/ Thanks Abhijit
RFR: JDK-8198303 - jdk11+1 was build with incorrect GA date as 2018-03-20
It's a retroactive review request. Fix has been integrated after reviewed internally. jdk11+1 (first build of jdk11) was promoted with incorrect Release Date. Need to be updated with correct GA date as per internal release roadmap. Bug: https://bugs.openjdk.java.net/browse/JDK-8198303 Webrev: http://cr.openjdk.java.net/~asaha/8198303/webrev.01/ Thanks Abhijit
Re: RFR: JDK-8198243: Add build time check for global operator new/delete in object files
Hi Erik, This seems okay. Just wondering: a) how much time it adds to the build? b) why this doesn't work for Solaris Studio? Thanks, David On 21/02/2018 4:05 AM, Erik Joelsson wrote: Hello, This patch adds a build time check for uses of global operators new and delete in hotspot C++ code. The check is only run with toolchains GCC and Clang (Linux and Macos builds). I have also modified the Oracle devkit on Linux to add the necessary symlink so that objdump will get picked up by configure. This change is depending on several fixes removing such uses that are currently in jdk/hs so this change will need to be pushed there as well. Bug: https://bugs.openjdk.java.net/browse/JDK-8198243 Webrev: http://cr.openjdk.java.net/~erikj/8198243/webrev.01/ /Erik
Re: RFR: JDK-8198243: Add build time check for global operator new/delete in object files
On 2018-02-20 12:51, Magnus Ihse Bursie wrote: On 2018-02-20 19:05, Erik Joelsson wrote: Hello, This patch adds a build time check for uses of global operators new and delete in hotspot C++ code. The check is only run with toolchains GCC and Clang (Linux and Macos builds). I have also modified the Oracle devkit on Linux to add the necessary symlink so that objdump will get picked up by configure. This change is depending on several fixes removing such uses that are currently in jdk/hs so this change will need to be pushed there as well. Bug: https://bugs.openjdk.java.net/browse/JDK-8198243 Webrev: http://cr.openjdk.java.net/~erikj/8198243/webrev.01/ It seems dtrace disappeared when you sorted the line in make/devkit/Tools.gmk. There's a new dwp, should it be there? Yes and yes. I added links for all the missing tools (which was dwp and objdump) and removed dtrace which was accidentally added in JDK-8196998 (new devkit with 7.3). Dtrace is actually handled separately a few lines above. /Erik Otherwise it looks good. /Magnus /Erik
Re: RFR: JDK-8198243: Add build time check for global operator new/delete in object files
On 2018-02-20 19:05, Erik Joelsson wrote: Hello, This patch adds a build time check for uses of global operators new and delete in hotspot C++ code. The check is only run with toolchains GCC and Clang (Linux and Macos builds). I have also modified the Oracle devkit on Linux to add the necessary symlink so that objdump will get picked up by configure. This change is depending on several fixes removing such uses that are currently in jdk/hs so this change will need to be pushed there as well. Bug: https://bugs.openjdk.java.net/browse/JDK-8198243 Webrev: http://cr.openjdk.java.net/~erikj/8198243/webrev.01/ It seems dtrace disappeared when you sorted the line in make/devkit/Tools.gmk. There's a new dwp, should it be there? Otherwise it looks good. /Magnus /Erik
Re: RFR: JDK-8198450 Make jdk.internal.vm.compiler/module-info.java.extra reproducable
+1 Mandy On 2/20/18 11:47 AM, Magnus Ihse Bursie wrote: The file jdk.internal.vm.compiler/module-info.java.extra is generated on build time. On systems with non-sorted output from ls and find, the file contents will change and thus not be reproducible. Fix is to sort file system information before using it. Bug: https://bugs.openjdk.java.net/browse/JDK-8198450 WebRev: http://cr.openjdk.java.net/~ihse/JDK-8198450-make-compiler-module-info_java_extra-reproducable/webrev.01 /Magnus
Re: RFR: JDK-8198450 Make jdk.internal.vm.compiler/module-info.java.extra reproducable
Looks good. /Erik On 2018-02-20 11:47, Magnus Ihse Bursie wrote: The file jdk.internal.vm.compiler/module-info.java.extra is generated on build time. On systems with non-sorted output from ls and find, the file contents will change and thus not be reproducible. Fix is to sort file system information before using it. Bug: https://bugs.openjdk.java.net/browse/JDK-8198450 WebRev: http://cr.openjdk.java.net/~ihse/JDK-8198450-make-compiler-module-info_java_extra-reproducable/webrev.01 /Magnus
RFR: JDK-8198450 Make jdk.internal.vm.compiler/module-info.java.extra reproducable
The file jdk.internal.vm.compiler/module-info.java.extra is generated on build time. On systems with non-sorted output from ls and find, the file contents will change and thus not be reproducible. Fix is to sort file system information before using it. Bug: https://bugs.openjdk.java.net/browse/JDK-8198450 WebRev: http://cr.openjdk.java.net/~ihse/JDK-8198450-make-compiler-module-info_java_extra-reproducable/webrev.01 /Magnus
Re: RFR: JDK-8198243: Add build time check for global operator new/delete in object files
Erik: This patch adds a build time check for uses of global operators new and delete in hotspot C++ code. The check is only run with toolchains GCC and Clang (Linux and Macos builds). I have also modified the Oracle devkit on Linux to add the necessary symlink so that objdump will get picked up by configure. This change is depending on several fixes removing such uses that are currently in jdk/hs so this change will need to be pushed there as well. Bug: https://bugs.openjdk.java.net/browse/JDK-8198243 Webrev: http://cr.openjdk.java.net/~erikj/8198243/webrev.01/ Looks good. Tim
RFR: JDK-8198243: Add build time check for global operator new/delete in object files
Hello, This patch adds a build time check for uses of global operators new and delete in hotspot C++ code. The check is only run with toolchains GCC and Clang (Linux and Macos builds). I have also modified the Oracle devkit on Linux to add the necessary symlink so that objdump will get picked up by configure. This change is depending on several fixes removing such uses that are currently in jdk/hs so this change will need to be pushed there as well. Bug: https://bugs.openjdk.java.net/browse/JDK-8198243 Webrev: http://cr.openjdk.java.net/~erikj/8198243/webrev.01/ /Erik
Re: RFR: JDK-8198328: Create devkit for Solaris with developer studio 12.6 and Solaris11.3
Erik: Looks good to me as well. Tim On 02/18/18 15:39, Magnus Ihse Bursie wrote: Looks good to me. /Magnus 17 feb. 2018 kl. 02:56 skrev Erik Joelsson: We need a new devkit for Solaris based on Developer Studio 12.6 and with Solaris 11.3 as sysroot. This patch adds the script used to generate the kit. Bug: https://bugs.openjdk.java.net/browse/JDK-8198328 Webrev: http://cr.openjdk.java.net/~erikj/8198328/webrev.01/ /Erik
Re: RFR: 8194870: Some regression tests throw NPE exception on a specific Solaris 11.2 sun4v sparc machine
Looks good to me. /Erik On 2018-02-16 15:04, Phil Race wrote: Bug: https://bugs.openjdk.java.net/browse/JDK-8194870 diff inline below : It seems to be sufficient to make this change. If there is some Sun Studio / linker args needed to ensure the undefined symbols are allowed they are apparently already present .. Details in the bug report. And as noted there I have left the AIX line alone. diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -691,7 +691,7 @@ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ LIBS_linux := -lc, \ - LIBS_solaris := -lawt_headless -lc, \ + LIBS_solaris := -lc, \ LIBS_aix := -lawt_headless,\ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ $(WIN_AWT_LIB), \ -phil.
Re: Proposal: make/Main.gmk Add extra extension/override points to the make file
This looks ok, I will push it. https://bugs.openjdk.java.net/browse/JDK-8198425 /Erik On 2018-02-19 04:39, Steve Groeger wrote: diff -r b2f2bdba0472 make/Main.gmk --- a/make/Main.gmkFri Jan 26 11:27:53 2018 -0800 +++ b/make/Main.gmkMon Feb 19 12:31:55 2018 + @@ -644,8 +644,11 @@ generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs + # If not already set, set the JVM variant target so that the JVM will be built. + JVM_MAIN_LIB_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-libs + # Building one JVM variant is enough to start building the other libs - $(LIBS_TARGETS): hotspot-$(JVM_VARIANT_MAIN)-libs + $(LIBS_TARGETS): $(JVM_MAIN_LIB_TARGETS) $(LAUNCHER_TARGETS): java.base-libs @@ -722,8 +725,11 @@ java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS)) endif - # Building java.base-jmod requires all of hotspot to be built. - java.base-jmod: hotspot + # If not already set, set the JVM target so that the JVM will be built. + JVM_MAIN_TARGETS ?= hotspot + + # Building java.base-jmod requires all of VM (ie hotspot) to be built. + java.base-jmod: $(JVM_MAIN_TARGETS) # Declare dependencies from -jmod to all other module targets # When creating a BUILDJDK, the java compilation has already been done by the @@ -749,7 +755,7 @@ # in java.base-copy) and tzdb.dat (done in java.base-gendata) to the # appropriate location otherwise jimage, jlink and jmod won't start. This # also applies when creating the buildjdk. - DEFAULT_JMOD_DEPS := java.base-libs java.base-copy java.base-gendata \ + DEFAULT_JMOD_DEPS += java.base-libs java.base-copy java.base-gendata \ jdk.jlink-launchers # When cross compiling and buildjdk is to be created, depend on creating the # buildjdk instead of the default dependencies. @@ -824,9 +830,11 @@ docs-javase-api-modulegraph: exploded-image buildtools-modules docs-reference-api-modulegraph: exploded-image buildtools-modules - + # If not already set, then set the JVM specific docs targets + JVM_DOCS_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc + # The gensrc steps for hotspot and jdk.jdi create html spec files. - docs-jdk-specs: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc \ + docs-jdk-specs: $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \ docs-jdk-index docs-jdk-index: exploded-image buildtools-modules @@ -893,8 +901,10 @@ # Virtual targets without recipes +# If not already set, set the JVM specific tools targets +JVM_TOOLS_TARGETS ?= buildtools-hotspot buildtools: buildtools-langtools interim-langtools interim-rmic \ - buildtools-jdk buildtools-hotspot + buildtools-jdk $(JVM_TOOLS_TARGETS) hotspot: $(HOTSPOT_VARIANT_TARGETS) hotspot-jsig @@ -937,7 +947,7 @@ $(foreach m, $(ALL_COPY_MODULES), $(eval $m: $m-copy)) # Building java.base includes building all of hotspot. -java.base: hotspot +java.base: $(JVM_MAIN_TARGETS) demos: demos-jdk @@ -1004,10 +1014,15 @@ # This target builds the documentation image docs-image: docs-jdk +# If not already set, set the JVM specific targets to built the test image +JVM_TEST_IMAGE_TARGETS ?= test-image-hotspot-jtreg-native test-image-hotspot-gtest + # This target builds the test image -test-image: prepare-test-image test-image-hotspot-jtreg-native \ - test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest \ - test-image-demos-jdk +test-image: prepare-test-image \ + test-image-jdk-jtreg-native test-image-failure-handler \ + test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS) + + # all-images builds all our deliverables as images. all-images: product-images test-image docs-image @@ -1146,7 +1161,10 @@ $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, Main-post.gmk)) .PHONY: $(ALL_TARGETS) FRC: # Force target