Hello community, here is the log from the commit of package java-1_9_0-openjdk for openSUSE:Factory checked in at 2015-04-07 09:30:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_9_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_9_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/java-1_9_0-openjdk.changes 2015-03-25 21:32:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes 2015-04-07 09:30:10.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Mar 30 11:16:47 UTC 2015 - fst...@suse.com + +- Upgrade to upstream tag jdk9-b56 +- Removed integrated patch: + * hotspot-missing-symbol.patch + +------------------------------------------------------------------- +Sun Mar 29 15:52:16 UTC 2015 - fst...@suse.com + +- Modified patch: + * s390-size_t.patch + - Rediff and patch some more problems + +------------------------------------------------------------------- Old: ---- 0c37a832458f.tar.bz2 2a460ce60ed4.tar.bz2 32a2e7249884.tar.bz2 734ca5311a22.tar.bz2 b2b332e64b7b.tar.bz2 be49ab55e5c4.tar.bz2 ca481b0492c8.tar.bz2 d49e247dade6.tar.bz2 hotspot-missing-symbol.patch New: ---- 139092a10ded.tar.bz2 2e640036000d.tar.bz2 5ee7bba6ef41.tar.bz2 7969f7b6465e.tar.bz2 b4f913b48e69.tar.bz2 eb7febe45865.tar.bz2 ef4afd6832b0.tar.bz2 fd2d5ec7e7b1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_9_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.65me0V/_old 2015-04-07 09:30:12.000000000 +0200 +++ /var/tmp/diff_new_pack.65me0V/_new 2015-04-07 09:30:12.000000000 +0200 @@ -33,17 +33,17 @@ %global minorver 9 %global microver 0 %global updatever 0 -%global buildver b55 +%global buildver b56 %global root_project jdk9 %global root_repository jdk9 -%global root_revision 0c37a832458f -%global corba_revision 734ca5311a22 -%global hotspot_revision be49ab55e5c4 -%global jaxp_revision 2a460ce60ed4 -%global jaxws_revision ca481b0492c8 -%global jdk_revision d49e247dade6 -%global langtools_revision 32a2e7249884 -%global nashorn_revision b2b332e64b7b +%global root_revision eb7febe45865 +%global corba_revision ef4afd6832b0 +%global hotspot_revision fd2d5ec7e7b1 +%global jaxp_revision 139092a10ded +%global jaxws_revision b4f913b48e69 +%global jdk_revision 7969f7b6465e +%global langtools_revision 5ee7bba6ef41 +%global nashorn_revision 2e640036000d %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority %(echo "10000 * %{majorver} + 1000 * %{minorver} + 100 * %{microver} + %{updatever}" | bc) @@ -200,8 +200,6 @@ Patch5: multiple-pkcs11-library-init.patch # Disable doclint for compatibility Patch6: disable-doclint-by-default.patch -# Missing symbol in hotspot with CPP interpreter -Patch7: hotspot-missing-symbol.patch # From icedtea: Increase default memory limits Patch10: memory-limits.patch # Fix use of unintialized memory in adlc parser @@ -482,7 +480,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch10 -p1 %patch12 -p1 %patch13 -p1 ++++++ 0c37a832458f.tar.bz2 -> 139092a10ded.tar.bz2 ++++++ ++++ 823934 lines of diff (skipped) ++++++ 2a460ce60ed4.tar.bz2 -> 2e640036000d.tar.bz2 ++++++ ++++ 1112380 lines of diff (skipped) ++++++ 0c37a832458f.tar.bz2 -> 5ee7bba6ef41.tar.bz2 ++++++ ++++ 743176 lines of diff (skipped) ++++++ 0c37a832458f.tar.bz2 -> 7969f7b6465e.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0c37a832458f.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/7969f7b6465e.tar.bz2 differ: char 11, line 1 ++++++ 0c37a832458f.tar.bz2 -> b4f913b48e69.tar.bz2 ++++++ ++++ 695666 lines of diff (skipped) ++++++ 0c37a832458f.tar.bz2 -> eb7febe45865.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/.hg_archival.txt new/jdk9-eb7febe45865/.hg_archival.txt --- old/jdk9-0c37a832458f/.hg_archival.txt 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/.hg_archival.txt 2015-03-20 00:11:51.000000000 +0100 @@ -1,4 +1,4 @@ repo: cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d -node: 0c37a832458f0e0b7d2a3f1a6f69aeae311aeb18 +node: eb7febe45865ba6b81f2ea68082262d0708a0b22 branch: default -tag: jdk9-b55 +tag: jdk9-b56 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/.hgtags new/jdk9-eb7febe45865/.hgtags --- old/jdk9-0c37a832458f/.hgtags 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/.hgtags 2015-03-20 00:11:51.000000000 +0100 @@ -297,3 +297,4 @@ 1822e59f17121b09e7899cf338cfb6e37fe5fceb jdk9-b52 d6ed47125a76cd1cf8a100568507bfb5e9669d9f jdk9-b53 cb7367141e910e265b8344a8facee740bd1e5467 jdk9-b54 +0c37a832458f0e0b7d2a3f1a6f69aeae311aeb18 jdk9-b55 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/common/autoconf/configure.ac new/jdk9-eb7febe45865/common/autoconf/configure.ac --- old/jdk9-0c37a832458f/common/autoconf/configure.ac 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/common/autoconf/configure.ac 2015-03-20 00:11:51.000000000 +0100 @@ -54,6 +54,7 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK]) AC_DEFUN_ONCE([CUSTOM_LATE_HOOK]) +AC_DEFUN_ONCE([CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK]) AC_DEFUN_ONCE([CUSTOM_SUMMARY_AND_WARNINGS_HOOK]) # This line needs to be here, verbatim, after all includes and the dummy hook @@ -265,6 +266,7 @@ # Create the actual output files. Now the main work of configure is done. AC_OUTPUT +CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK # Try to move the config.log file to the output directory. if test -e ./config.log; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/common/autoconf/flags.m4 new/jdk9-eb7febe45865/common/autoconf/flags.m4 --- old/jdk9-0c37a832458f/common/autoconf/flags.m4 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/common/autoconf/flags.m4 2015-03-20 00:11:51.000000000 +0100 @@ -481,9 +481,8 @@ CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -errtags=yes -errfmt" CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -errtags=yes -errfmt" elif test "x$TOOLCHAIN_TYPE" = xxlc; then - LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall" - CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" - CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" + CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" + CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" fi if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then @@ -762,6 +761,8 @@ elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext" LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib" + elif test "x$TOOLCHAIN_TYPE" = xxlc; then + LDFLAGS_JDK="${LDFLAGS_JDK} -brtl -bnolibpath -liconv -bexpall -bernotok" fi # Customize LDFLAGS for executables diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/common/autoconf/generated-configure.sh new/jdk9-eb7febe45865/common/autoconf/generated-configure.sh --- old/jdk9-0c37a832458f/common/autoconf/generated-configure.sh 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/common/autoconf/generated-configure.sh 2015-03-20 00:11:51.000000000 +0100 @@ -4362,13 +4362,14 @@ + # This line needs to be here, verbatim, after all includes and the dummy hook # definitions. It is replaced with custom functionality when building # custom sources. #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1425994551 +DATE_WHEN_GENERATED=1426774983 ############################################################################### # @@ -41173,7 +41174,7 @@ # jtreg win32 script works for everybody - JTREGEXE="$JT_HOME/win32/bin/jtreg" + JTREGEXE="$JT_HOME/bin/jtreg" if test ! -f "$JTREGEXE"; then as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5 @@ -42372,9 +42373,8 @@ CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -errtags=yes -errfmt" CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -errtags=yes -errfmt" elif test "x$TOOLCHAIN_TYPE" = xxlc; then - LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall" - CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" - CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" + CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" + CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" fi if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then @@ -42668,6 +42668,8 @@ elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext" LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib" + elif test "x$TOOLCHAIN_TYPE" = xxlc; then + LDFLAGS_JDK="${LDFLAGS_JDK} -brtl -bnolibpath -liconv -bexpall -bernotok" fi # Customize LDFLAGS for executables @@ -52969,6 +52971,7 @@ fi + # Try to move the config.log file to the output directory. if test -e ./config.log; then $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/common/autoconf/toolchain.m4 new/jdk9-eb7febe45865/common/autoconf/toolchain.m4 --- old/jdk9-0c37a832458f/common/autoconf/toolchain.m4 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/common/autoconf/toolchain.m4 2015-03-20 00:11:51.000000000 +0100 @@ -763,7 +763,7 @@ BASIC_FIXUP_PATH([JT_HOME]) # jtreg win32 script works for everybody - JTREGEXE="$JT_HOME/win32/bin/jtreg" + JTREGEXE="$JT_HOME/bin/jtreg" if test ! -f "$JTREGEXE"; then AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/make/CompileJavaModules.gmk new/jdk9-eb7febe45865/make/CompileJavaModules.gmk --- old/jdk9-0c37a832458f/make/CompileJavaModules.gmk 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/make/CompileJavaModules.gmk 2015-03-20 00:11:51.000000000 +0100 @@ -90,12 +90,16 @@ ################################################################################ +java.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' + +################################################################################ + java.datatransfer_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' java.datatransfer_COPY := flavormap.properties ################################################################################ -java.desktop_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-missing,-reference '-Xdoclint/package:java.*,javax.*' +java.desktop_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-missing,-reference '-Xdoclint/package:java.*,javax.*' java.desktop_COPY := .gif .png .wav .txt .xml .css .pf java.desktop_CLEAN := iio-plugin.properties cursors.properties @@ -336,6 +340,7 @@ ################################################################################ +jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' jdk.compiler_COPY := javax.tools.JavaCompilerTool jdk.compiler_CLEAN_FILES := $(wildcard \ $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/make/Images.gmk new/jdk9-eb7febe45865/make/Images.gmk --- old/jdk9-0c37a832458f/make/Images.gmk 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/make/Images.gmk 2015-03-20 00:11:51.000000000 +0100 @@ -494,29 +494,16 @@ GCOV_FIND_EXPR := -type f -name "*.gcno" - ifeq ($(JVM_VARIANT_CLIENT), true) - $(eval $(call SetupCopyFiles,COPY_HOTSPOT_CLIENT_GCOV_GCNO, \ - SRC := $(HOTSPOT_OUTPUTDIR), \ - DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/client, \ - FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler1/ $(GCOV_FIND_EXPR)), \ - FLATTEN := true)) + $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \ + SRC := $(OUTPUT_ROOT), \ + DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \ + FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR)))) - SYMBOLS_TARGETS += $(COPY_HOTSPOT_CLIENT_GCOV_GCNO) - endif - - ifeq ($(JVM_VARIANT_SERVER), true) - $(eval $(call SetupCopyFiles,COPY_HOTSPOT_SERVER_GCOV_GCNO, \ - SRC := $(HOTSPOT_OUTPUTDIR), \ - DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/server, \ - FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler2/ $(GCOV_FIND_EXPR)), \ - FLATTEN := true)) - - SYMBOLS_TARGETS += $(COPY_HOTSPOT_SERVER_GCOV_GCNO) - endif + SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO) $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \ - SRC := $(SUPPORT_OUTPUTDIR)/native, \ - DEST := $(SYMBOLS_IMAGE_DIR)/gcov/jdk, \ + SRC := $(OUTPUT_ROOT), \ + DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \ FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR)))) SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/make/common/JavaCompilation.gmk new/jdk9-eb7febe45865/make/common/JavaCompilation.gmk --- old/jdk9-0c37a832458f/make/common/JavaCompilation.gmk 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/make/common/JavaCompilation.gmk 2015-03-20 00:11:51.000000000 +0100 @@ -369,7 +369,7 @@ $(MKDIR) -p $$(@D) export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \ | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \ - -e 's/\([^\\]\)!/\1\\!/g' -e 's/#.*/#/g' \ + -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ ]*#.*/#/g' \ | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \ | $(SED) -e '/^#/d' -e '/^$$$$/d' \ -e :a -e '/\\$$$$/N; s/\\\n//; ta' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/make/common/NativeCompilation.gmk new/jdk9-eb7febe45865/make/common/NativeCompilation.gmk --- old/jdk9-0c37a832458f/make/common/NativeCompilation.gmk 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/make/common/NativeCompilation.gmk 2015-03-20 00:11:51.000000000 +0100 @@ -60,7 +60,7 @@ -e 's|Note: including file: *||' \ -e 's|\\|/|g' \ -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \ - -e '/$(subst /,\/,$(TOPDIR))/!d' \ + -e '\|$(TOPDIR)|I !d' \ -e 's|$$$$| \\|g' \ # @@ -153,7 +153,7 @@ exit `cat $$($1_$2_DEP).exitvalue` $(RM) $$($1_$2_DEP).exitvalue ($(ECHO) $$@: \\ \ - && $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) > $$($1_$2_DEP) + && $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) | $(SORT) -u > $$($1_$2_DEP) endif # Create a dependency target file from the dependency file. # Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/ @@ -392,12 +392,6 @@ $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) endif - # Pick up disabled warnings, if possible on this platform. - ifneq ($(DISABLE_WARNING_PREFIX),) - $1_EXTRA_CFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE))) - $1_EXTRA_CXXFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE))) - endif - ifeq ($$($1_DEBUG_SYMBOLS), true) ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifdef OPENJDK @@ -415,6 +409,9 @@ endif endif + # If no C++ flags are explicitly set, default to using the C flags. + # After that, we can set additional C++ flags that should not interfere + # with the mechanism for copying the C flags by default. ifeq ($$($1_CXXFLAGS),) $1_CXXFLAGS:=$$($1_CFLAGS) endif @@ -427,6 +424,12 @@ $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) endif + # Pick up disabled warnings, if possible on this platform. + ifneq ($(DISABLE_WARNING_PREFIX),) + $1_EXTRA_CFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE))) + $1_EXTRA_CXXFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE))) + endif + ifeq (NONE, $$($1_OPTIMIZATION)) $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE) $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jdk9-0c37a832458f/test/lib/sun/hotspot/WhiteBox.java new/jdk9-eb7febe45865/test/lib/sun/hotspot/WhiteBox.java --- old/jdk9-0c37a832458f/test/lib/sun/hotspot/WhiteBox.java 2015-03-13 05:12:51.000000000 +0100 +++ new/jdk9-eb7febe45865/test/lib/sun/hotspot/WhiteBox.java 2015-03-20 00:11:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,7 @@ import java.lang.reflect.Executable; import java.util.Arrays; import java.util.List; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Stream; import java.security.BasicPermission; @@ -250,6 +251,23 @@ } return offset; } + public native Boolean getMethodBooleanOption(Executable method, String name); + public native Long getMethodIntxOption(Executable method, String name); + public native Long getMethodUintxOption(Executable method, String name); + public native Double getMethodDoubleOption(Executable method, String name); + public native String getMethodStringOption(Executable method, String name); + private final List<BiFunction<Executable,String,Object>> methodOptionGetters + = Arrays.asList(this::getMethodBooleanOption, this::getMethodIntxOption, + this::getMethodUintxOption, this::getMethodDoubleOption, + this::getMethodStringOption); + + public Object getMethodOption(Executable method, String name) { + return methodOptionGetters.stream() + .map(f -> f.apply(method, name)) + .filter(x -> x != null) + .findAny() + .orElse(null); + } // Safepoint Checking public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue); ++++++ 0c37a832458f.tar.bz2 -> ef4afd6832b0.tar.bz2 ++++++ ++++ 354950 lines of diff (skipped) ++++++ 0c37a832458f.tar.bz2 -> fd2d5ec7e7b1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/0c37a832458f.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/fd2d5ec7e7b1.tar.bz2 differ: char 11, line 1 ++++++ s390-size_t.patch ++++++ --- /var/tmp/diff_new_pack.65me0V/_old 2015-04-07 09:30:24.000000000 +0200 +++ /var/tmp/diff_new_pack.65me0V/_new 2015-04-07 09:30:24.000000000 +0200 @@ -1,5 +1,5 @@ ---- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-03-05 09:23:23.714320208 +0100 -+++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-03-05 09:24:37.023580367 +0100 +--- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-03-29 16:10:46.649313752 +0200 ++++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2015-03-29 16:15:27.153543255 +0200 @@ -299,7 +299,7 @@ _heaps->append(heap); @@ -9,8 +9,8 @@ size_initial = round_to(size_initial, os::vm_page_size()); if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) { vm_exit_during_initialization("Could not reserve enough space for code cache"); ---- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-02-20 14:19:59.901506607 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-02-20 14:20:36.722643899 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-03-29 16:10:46.651313631 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-03-29 16:15:27.154543216 +0200 @@ -2645,7 +2645,7 @@ if (ResizeOldPLAB && CMSOldPLABResizeQuicker) { size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks); @@ -20,8 +20,8 @@ } assert(n_blks > 0, "Error"); _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl); ---- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-02-20 14:19:59.901506607 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-02-20 14:20:36.725643829 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-03-29 16:10:46.651313631 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-03-29 16:15:27.156543137 +0200 @@ -853,7 +853,7 @@ if (free_percentage < desired_free_percentage) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); @@ -49,8 +49,8 @@ // Do not give up existing stack until we have managed to // get the double capacity that we desired. ReservedSpace rs(ReservedSpace::allocation_align_size_up( ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-02-20 14:19:59.902506583 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-02-20 14:20:36.726643805 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-03-29 16:10:46.654313449 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-03-29 16:15:27.157543098 +0200 @@ -3796,7 +3796,7 @@ // of things to do) or totally (at the very end). size_t target_size; @@ -60,8 +60,8 @@ } else { target_size = 0; } ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-02-20 14:19:59.903506560 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-02-20 14:20:36.728643759 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-03-29 16:10:46.655313388 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-03-29 16:15:27.158543058 +0200 @@ -1650,7 +1650,7 @@ verify_region_sets_optional(); @@ -71,9 +71,9 @@ ergo_verbose1(ErgoHeapSizing, "attempt heap expansion", ergo_format_reason("allocation request failed") ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-02-20 14:19:59.904506536 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-02-20 14:20:36.728643759 +0100 -@@ -39,7 +39,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-03-29 16:10:46.656313327 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-03-29 16:15:27.158543058 +0200 +@@ -41,7 +41,7 @@ _cancel(false), _empty(true), _dropped(0) { @@ -82,9 +82,9 @@ _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC); for (size_t i = 0; i < _nqueues; i++) { new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size); ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-02-20 14:19:59.904506536 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-02-20 14:20:36.729643735 +0100 -@@ -110,7 +110,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-03-29 16:10:46.656313327 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-03-29 16:15:27.159543019 +0200 +@@ -111,7 +111,7 @@ }; G1StringDedupEntryCache::G1StringDedupEntryCache() { @@ -93,8 +93,8 @@ _lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists); } ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-02-20 14:19:59.904506536 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-02-20 14:20:36.729643735 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-03-29 16:10:46.656313327 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-03-29 16:15:27.159543019 +0200 @@ -110,7 +110,7 @@ if (FLAG_IS_DEFAULT(G1HeapRegionSize)) { size_t average_heap_size = (initial_heap_size + max_heap_size) / 2; @@ -104,8 +104,8 @@ } int region_size_log = log2_long((jlong) region_size); ---- jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-02-20 14:19:59.907506466 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-02-20 14:20:36.730643712 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-03-29 16:10:46.659313145 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-03-29 16:15:27.160542979 +0200 @@ -912,8 +912,8 @@ void PSParallelCompact::initialize_dead_wood_limiter() { @@ -117,8 +117,8 @@ _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev); DEBUG_ONLY(_dwl_initialized = true;) _dwl_adjustment = normal_distribution(1.0); ---- jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-02-20 14:19:59.905506513 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-02-20 14:20:36.731643688 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-03-29 16:10:46.657313267 +0200 ++++ jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-03-29 16:15:27.160542979 +0200 @@ -194,7 +194,7 @@ const size_t num_overflow_elems = of_stack->size(); const size_t space_available = queue->max_elems() - queue->size(); @@ -128,8 +128,8 @@ num_overflow_elems); // Transfer the most recent num_take_elems from the overflow // stack to our work queue. ---- jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-02-20 14:19:59.911506373 +0100 -+++ jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-02-20 14:20:36.731643688 +0100 +--- jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-03-29 16:10:46.663312903 +0200 ++++ jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-03-29 16:15:27.160542979 +0200 @@ -383,7 +383,7 @@ uintx calculated_size = NewSize + OldSize; double shrink_factor = (double) MaxHeapSize / calculated_size; @@ -157,8 +157,8 @@ } } ---- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-02-20 14:19:59.913506326 +0100 -+++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-02-20 14:20:36.733643642 +0100 +--- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-03-29 16:10:46.665312782 +0200 ++++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-03-29 16:15:27.161542940 +0200 @@ -1458,7 +1458,7 @@ void MetaspaceGC::post_initialize() { @@ -186,7 +186,7 @@ if (PrintGCDetails && Verbose) { gclog_or_tty->print_cr(" " " maximum_free_percentage: %6.2f" -@@ -3269,7 +3269,7 @@ +@@ -3314,7 +3314,7 @@ // on the medium chunk list. The next chunk will be small and progress // from there. This size calculated by -version. _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6, @@ -195,8 +195,8 @@ _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size); // Arbitrarily set the initial virtual space to a multiple // of the boot class loader size. ---- jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-02-20 14:19:59.916506255 +0100 -+++ jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-02-20 14:20:36.734643618 +0100 +--- jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-03-29 16:10:46.668312600 +0200 ++++ jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-03-29 16:15:27.162542900 +0200 @@ -48,7 +48,7 @@ const size_t beg_index = size_t(index); assert(beg_index < len || len == 0, "index too large"); @@ -215,8 +215,8 @@ const size_t end_index = beg_index + stride; T* const base = (T*)a->base(); T* const beg = base + beg_index; ---- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-02-20 14:19:59.926506021 +0100 -+++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-02-20 14:20:36.735643595 +0100 +--- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-03-29 16:10:46.678311993 +0200 ++++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-03-29 16:15:27.162542900 +0200 @@ -724,7 +724,7 @@ WB_END @@ -226,9 +226,18 @@ if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) { ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI return longBox(thread, env, result); ---- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-02-20 14:19:59.927505998 +0100 -+++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-02-20 14:20:36.736643571 +0100 -@@ -1336,7 +1336,7 @@ +--- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-03-29 16:10:46.678311993 +0200 ++++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-03-29 17:49:57.971094740 +0200 +@@ -1163,7 +1163,7 @@ + // Increase the code cache size - tiered compiles a lot more. + if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) { + FLAG_SET_ERGO(uintx, ReservedCodeCacheSize, +- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5)); ++ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)(ReservedCodeCacheSize * 5))); + } + // Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M + if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) { +@@ -1341,7 +1341,7 @@ // NewSize was set on the command line and it is larger than // preferred_max_new_size. if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line @@ -237,7 +246,7 @@ } else { FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size); } -@@ -1361,8 +1361,8 @@ +@@ -1366,8 +1366,8 @@ // Unless explicitly requested otherwise, make young gen // at least min_new, and at most preferred_max_new_size. if (FLAG_IS_DEFAULT(NewSize)) { @@ -248,7 +257,7 @@ if (PrintGCDetails && Verbose) { // Too early to use gclog_or_tty tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize); -@@ -1372,7 +1372,7 @@ +@@ -1377,7 +1377,7 @@ // so it's NewRatio x of NewSize. if (FLAG_IS_DEFAULT(OldSize)) { if (max_heap > NewSize) {