Hello community,
here is the log from the commit of package java-1_9_0-openjdk for
openSUSE:Factory checked in at 2015-04-27 22:08:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-21 10:52:55.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes
2015-04-27 22:09:23.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 22 08:06:05 UTC 2015 - [email protected]
+
+- Upgrade to upstream tag jdk9-b60
+- Updated patches:
+ * memory-limits.patch
+ * ppc-zero-hotspot.patch
+ - rediff to correspond to the uintx -> size_t changes
+- Added patch:
+ * configure-errors.patch
+ - revert hunks of upstream commit that break the build in our
+ build environment
+
+-------------------------------------------------------------------
Old:
----
17c4241395e9.tar.bz2
2c417f7d7b0d.tar.bz2
3bcfcb13c234.tar.bz2
56a85ffe743d.tar.bz2
c76339e86ea7.tar.bz2
d8ebf1a5b18c.tar.bz2
ec977a00cecb.tar.bz2
f25ee9f62427.tar.bz2
New:
----
81bdc4545337.tar.bz2
84c5527f742b.tar.bz2
9c916db4bf3b.tar.bz2
9fa2185bee17.tar.bz2
c12db18748da.tar.bz2
c55ce3738888.tar.bz2
caa330b275f3.tar.bz2
configure-errors.patch
f31835b59035.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_9_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.FDqWu1/_old 2015-04-27 22:09:26.000000000 +0200
+++ /var/tmp/diff_new_pack.FDqWu1/_new 2015-04-27 22:09:26.000000000 +0200
@@ -33,17 +33,17 @@
%global minorver 9
%global microver 0
%global updatever 0
-%global buildver b57
+%global buildver b60
%global root_project jdk9
%global root_repository jdk9
-%global root_revision f25ee9f62427
-%global corba_revision d8ebf1a5b18c
-%global hotspot_revision 56a85ffe743d
-%global jaxp_revision 2c417f7d7b0d
-%global jaxws_revision 17c4241395e9
-%global jdk_revision c76339e86ea7
-%global langtools_revision ec977a00cecb
-%global nashorn_revision 3bcfcb13c234
+%global root_revision 9fa2185bee17
+%global corba_revision caa330b275f3
+%global hotspot_revision 9c916db4bf3b
+%global jaxp_revision c12db18748da
+%global jaxws_revision f31835b59035
+%global jdk_revision 84c5527f742b
+%global langtools_revision 81bdc4545337
+%global nashorn_revision c55ce3738888
%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,6 +200,8 @@
Patch5: multiple-pkcs11-library-init.patch
# Disable doclint for compatibility
Patch6: disable-doclint-by-default.patch
+# Revert some configure changes
+Patch7: configure-errors.patch
# From icedtea: Increase default memory limits
Patch10: memory-limits.patch
# Fix use of unintialized memory in adlc parser
@@ -480,6 +482,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%patch10 -p1
%patch12 -p1
%patch13 -p1
++++++ 17c4241395e9.tar.bz2 -> 81bdc4545337.tar.bz2 ++++++
++++ 1182861 lines of diff (skipped)
++++++ 2c417f7d7b0d.tar.bz2 -> 84c5527f742b.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/2c417f7d7b0d.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/84c5527f742b.tar.bz2 differ:
char 11, line 1
++++++ 17c4241395e9.tar.bz2 -> 9c916db4bf3b.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/17c4241395e9.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/9c916db4bf3b.tar.bz2 differ:
char 11, line 1
++++++ 17c4241395e9.tar.bz2 -> 9fa2185bee17.tar.bz2 ++++++
++++ 696123 lines of diff (skipped)
++++++ 17c4241395e9.tar.bz2 -> c12db18748da.tar.bz2 ++++++
++++ 1260184 lines of diff (skipped)
++++++ 17c4241395e9.tar.bz2 -> c55ce3738888.tar.bz2 ++++++
++++ 984715 lines of diff (skipped)
++++++ 17c4241395e9.tar.bz2 -> caa330b275f3.tar.bz2 ++++++
++++ 791817 lines of diff (skipped)
++++++ configure-errors.patch ++++++
--- jdk9/common/autoconf/basics.m4 2015-04-22 10:44:41.403887706 +0200
+++ jdk9/common/autoconf/basics.m4 2015-04-22 10:45:06.750438857 +0200
@@ -658,8 +658,6 @@
fi
OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
$MKDIR -p "$OUTPUT_ROOT"
- CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support"
- $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
if test ! -d "$OUTPUT_ROOT"; then
AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
fi
@@ -705,7 +703,6 @@
AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
AC_SUBST(CONF_NAME, $CONF_NAME)
AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
- AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
# The spec.gmk file contains all variables for the make system.
AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
--- jdk9/common/autoconf/basics_windows.m4 2015-04-22 10:44:41.404887688
+0200
+++ jdk9/common/autoconf/basics_windows.m4 2015-04-22 10:45:06.751438839
+0200
@@ -383,46 +383,45 @@
if test "x$OPENJDK_BUILD_OS" = xwindows; then
AC_MSG_CHECKING([if fixpath can be created])
FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
- FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
- FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
+ FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+ FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
+ FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
# Important to keep the .exe suffix on Cygwin for Hotspot makefiles
- FIXPATH="$FIXPATH_BIN -c"
+ FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
+ FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
+ FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
+
# Take all collected prefixes and turn them into a -m/c/foo@/c/bar@...
command line
# @ was chosen as separator to minimize risk of other tools messing
around with it
- all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \
- | tr ' ' '\n' | grep '^/./' | sort | uniq`
+ all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' '
'\n' | grep '^/./' | sort | uniq`
fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
- FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
+
+ FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
fi
- FIXPATH_SRC_W="$FIXPATH_SRC"
- FIXPATH_BIN_W="$FIXPATH_BIN"
- BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
- BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
- $RM -rf $FIXPATH_BIN $FIXPATH_DIR
- $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
- cd $FIXPATH_DIR
- $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
+ rm -f $OUTPUT_ROOT/fixpath*
+ cd $OUTPUT_ROOT
+ $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
cd $CURDIR
- if test ! -x $FIXPATH_BIN; then
+ if test ! -x $OUTPUT_ROOT/fixpath.exe; then
AC_MSG_RESULT([no])
- cat $FIXPATH_DIR/fixpath1.log
- AC_MSG_ERROR([Could not create $FIXPATH_BIN])
+ cat $OUTPUT_ROOT/fixpath1.log
+ AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe])
fi
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([if fixpath.exe works])
- cd $FIXPATH_DIR
- $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
- > $FIXPATH_DIR/fixpath2.log 2>&1
+ cd $OUTPUT_ROOT
+ $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe >
$OUTPUT_ROOT/fixpath2.log 2>&1
cd $CURDIR
- if test ! -x $FIXPATH_DIR/fixpath2.exe; then
+ if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
AC_MSG_RESULT([no])
- cat $FIXPATH_DIR/fixpath2.log
+ cat $OUTPUT_ROOT/fixpath2.log
AC_MSG_ERROR([fixpath did not work!])
fi
AC_MSG_RESULT([yes])
+ rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
fi
AC_SUBST(FIXPATH)
--- jdk9/common/autoconf/build-performance.m4 2015-04-22 10:44:41.404887688
+0200
+++ jdk9/common/autoconf/build-performance.m4 2015-04-22 10:45:06.751438839
+0200
@@ -336,4 +336,11 @@
AC_MSG_CHECKING([whether to use sjavac])
AC_MSG_RESULT([$ENABLE_SJAVAC])
AC_SUBST(ENABLE_SJAVAC)
+
+ if test "x$ENABLE_SJAVAC" = xyes; then
+ SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
+ else
+ SJAVAC_SERVER_DIR=
+ fi
+ AC_SUBST(SJAVAC_SERVER_DIR)
])
--- jdk9/common/autoconf/configure.ac 2015-04-22 10:44:41.404887688 +0200
+++ jdk9/common/autoconf/configure.ac 2015-04-22 10:45:06.751438839 +0200
@@ -261,7 +261,7 @@
# We're messing a bit with internal autoconf variables to put the config.status
# in the output directory instead of the current directory.
-CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
+CONFIG_STATUS="$OUTPUT_ROOT/config.status"
# Create the actual output files. Now the main work of configure is done.
AC_OUTPUT
@@ -269,7 +269,7 @@
# Try to move the config.log file to the output directory.
if test -e ./config.log; then
- $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
+ $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
fi
# Make the compare script executable
--- jdk9/common/autoconf/generated-configure.sh 2015-04-22 10:44:41.409887600
+0200
+++ jdk9/common/autoconf/generated-configure.sh 2015-04-22 10:45:06.765438591
+0200
@@ -632,6 +632,7 @@
CFLAGS_CCACHE
CCACHE
USE_PRECOMPILED_HEADER
+SJAVAC_SERVER_DIR
ENABLE_SJAVAC
SJAVAC_SERVER_JAVA_FLAGS
SJAVAC_SERVER_JAVA
@@ -883,7 +884,6 @@
CHECK_MAKE
CHECK_GMAKE
PKGHANDLER
-CONFIGURESUPPORT_OUTPUTDIR
OUTPUT_ROOT
CONF_NAME
SPEC
@@ -4365,7 +4365,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency
checks:
-DATE_WHEN_GENERATED=1428676283
+DATE_WHEN_GENERATED=1428017006
###############################################################################
#
@@ -15266,8 +15266,6 @@
fi
OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
$MKDIR -p "$OUTPUT_ROOT"
- CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support"
- $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
if test ! -d "$OUTPUT_ROOT"; then
as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO"
5
fi
@@ -27625,7 +27622,7 @@
$as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
# We need to create a couple of temporary files.
- VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
+ VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
$MKDIR -p $VS_ENV_TMP_DIR
# Cannot use the VS10 setup script directly (since it only updates the DOS
subshell environment).
@@ -43139,69 +43136,50 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be
created" >&5
$as_echo_n "checking if fixpath can be created... " >&6; }
FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
- FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
- FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
+ FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
+ FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
+ FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
# Important to keep the .exe suffix on Cygwin for Hotspot makefiles
- FIXPATH="$FIXPATH_BIN -c"
+ FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
+ FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
+ FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
+
# Take all collected prefixes and turn them into a -m/c/foo@/c/bar@...
command line
# @ was chosen as separator to minimize risk of other tools messing
around with it
- all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" \
- | tr ' ' '\n' | grep '^/./' | sort | uniq`
+ all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' |
grep '^/./' | sort | uniq`
fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'`
- FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
- fi
- FIXPATH_SRC_W="$FIXPATH_SRC"
- FIXPATH_BIN_W="$FIXPATH_BIN"
- unix_path="$FIXPATH_SRC_W"
- if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- windows_path=`$CYGPATH -m "$unix_path"`
- FIXPATH_SRC_W="$windows_path"
- elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
- windows_path=`cmd //c echo $unix_path`
- FIXPATH_SRC_W="$windows_path"
+ FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
fi
-
-
- unix_path="$FIXPATH_BIN_W"
- if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
- windows_path=`$CYGPATH -m "$unix_path"`
- FIXPATH_BIN_W="$windows_path"
- elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
- windows_path=`cmd //c echo $unix_path`
- FIXPATH_BIN_W="$windows_path"
- fi
-
- $RM -rf $FIXPATH_BIN $FIXPATH_DIR
- $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
- cd $FIXPATH_DIR
- $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
+ rm -f $OUTPUT_ROOT/fixpath*
+ cd $OUTPUT_ROOT
+ $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
cd $CURDIR
- if test ! -x $FIXPATH_BIN; then
+ if test ! -x $OUTPUT_ROOT/fixpath.exe; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- cat $FIXPATH_DIR/fixpath1.log
- as_fn_error $? "Could not create $FIXPATH_BIN" "$LINENO" 5
+ cat $OUTPUT_ROOT/fixpath1.log
+ as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
$as_echo_n "checking if fixpath.exe works... " >&6; }
- cd $FIXPATH_DIR
- $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
- > $FIXPATH_DIR/fixpath2.log 2>&1
+ cd $OUTPUT_ROOT
+ $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe >
$OUTPUT_ROOT/fixpath2.log 2>&1
cd $CURDIR
- if test ! -x $FIXPATH_DIR/fixpath2.exe; then
+ if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- cat $FIXPATH_DIR/fixpath2.log
+ cat $OUTPUT_ROOT/fixpath2.log
as_fn_error $? "fixpath did not work!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
fi
@@ -51437,6 +51415,13 @@
$as_echo "$ENABLE_SJAVAC" >&6; }
+ if test "x$ENABLE_SJAVAC" = xyes; then
+ SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
+ else
+ SJAVAC_SERVER_DIR=
+ fi
+
+
# Can the C/C++ compiler use precompiled headers?
@@ -51864,7 +51849,7 @@
# We're messing a bit with internal autoconf variables to put the config.status
# in the output directory instead of the current directory.
-CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
+CONFIG_STATUS="$OUTPUT_ROOT/config.status"
# Create the actual output files. Now the main work of configure is done.
cat >confcache <<\_ACEOF
@@ -53032,7 +53017,7 @@
# Try to move the config.log file to the output directory.
if test -e ./config.log; then
- $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
+ $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
fi
# Make the compare script executable
--- jdk9/common/autoconf/spec.gmk.in 2015-04-22 10:44:41.410887582 +0200
+++ jdk9/common/autoconf/spec.gmk.in 2015-04-22 10:45:06.766438573 +0200
@@ -237,8 +237,6 @@
IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make
MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support
-# This does not get overridden in a bootcycle build
-CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
HOTSPOT_DIST=@HOTSPOT_DIST@
@@ -260,7 +258,7 @@
ENABLE_SJAVAC:=@ENABLE_SJAVAC@
# Store sjavac server synchronization files here, and
# the sjavac server log files.
-SJAVAC_SERVER_DIR=$(MAKESUPPORT_OUTPUTDIR)/javacservers
+SJAVAC_SERVER_DIR:=@SJAVAC_SERVER_DIR@
# Number of parallel jobs to use for compilation
JOBS?=@JOBS@
--- jdk9/common/autoconf/toolchain_windows.m4 2015-04-22 10:44:41.410887582
+0200
+++ jdk9/common/autoconf/toolchain_windows.m4 2015-04-22 10:45:06.767438555
+0200
@@ -270,7 +270,7 @@
AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
# We need to create a couple of temporary files.
- VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
+ VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
$MKDIR -p $VS_ENV_TMP_DIR
# Cannot use the VS10 setup script directly (since it only updates the DOS
subshell environment).
++++++ 17c4241395e9.tar.bz2 -> f31835b59035.tar.bz2 ++++++
++++ 4465 lines of diff (skipped)
++++++ memory-limits.patch ++++++
--- /var/tmp/diff_new_pack.FDqWu1/_old 2015-04-27 22:09:46.000000000 +0200
+++ /var/tmp/diff_new_pack.FDqWu1/_new 2015-04-27 22:09:46.000000000 +0200
@@ -1,11 +1,11 @@
--- jdk8/hotspot/src/share/vm/runtime/globals.hpp 2014-04-23
22:06:29.000000000 +0100
+++ jdk8/hotspot/src/share/vm/runtime/globals.hpp 2014-05-12
20:42:01.633428300 +0100
@@ -3113,7 +3113,7 @@
- product(uintx, InitialHeapSize, 0, \
+ product(size_t, InitialHeapSize, 0, \
"Initial heap size (in bytes); zero means use ergonomics") \
\
-- product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \
-+ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \
+- product(size_t, MaxHeapSize, ScaleForWordSize(96*M), \
++ product(size_t, MaxHeapSize, ScaleForWordSize(512*M), \
"Maximum heap size (in bytes)") \
\
- product(uintx, OldSize, ScaleForWordSize(4*M), \
+ product(size_t, OldSize, ScaleForWordSize(4*M), \
++++++ ppc-zero-hotspot.patch ++++++
--- /var/tmp/diff_new_pack.FDqWu1/_old 2015-04-27 22:09:46.000000000 +0200
+++ /var/tmp/diff_new_pack.FDqWu1/_new 2015-04-27 22:09:46.000000000 +0200
@@ -1,6 +1,5 @@
-diff -up jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64
jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
---- jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64
2013-02-22 19:02:06.000000000 +0100
-+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
2013-04-18 16:21:24.897403406 +0200
+--- jdk9/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
2015-04-10 02:38:28.000000000 +0200
++++ jdk9/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
2015-04-23 08:39:28.282139950 +0200
@@ -32,11 +32,15 @@
//
@@ -19,4 +18,4 @@
+define_pd_global(intx, VMThreadStackSize, 640);
#endif // _LP64
define_pd_global(intx, CompilerThreadStackSize, 0);
- define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
+ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
