Hello community,
here is the log from the commit of package java-1_9_0-openjdk for
openSUSE:Factory checked in at 2015-01-30 15:07:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-29 09:55:38.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes
2015-01-30 15:07:41.000000000 +0100
@@ -1,0 +2,72 @@
+Thu Jan 29 12:59:14 UTC 2015 - [email protected]
+
+- Upgrade to upstream tag jdk9-b48
+- Use the aarch64-port stage repository for aarch64 hotspot
+- Added patch:
+ * icedtea-sound-1.0.1-runtime.patch
+ - Allow building against jdk9 post b41 which does not have
+ any more jar files.
+
+-------------------------------------------------------------------
+Sun Jan 25 18:36:12 UTC 2015 - [email protected]
+
+- Modify patch: system-giflib5.patch
+ * Fix build with giflib 5.1.x
+
+-------------------------------------------------------------------
+Mon Dec 8 13:14:41 UTC 2014 - [email protected]
+
+- Require versions of jpackage-utils and tzdata-java compatible
+ with this version of Java.
+
+-------------------------------------------------------------------
+Tue Nov 11 12:48:58 UTC 2014 - [email protected]
+
+- Add the jvm.cfg file for aarch64
+ * hopefully fixes aarch64 build
+
+-------------------------------------------------------------------
+Mon Nov 10 14:57:53 UTC 2014 - [email protected]
+
+- Put manpage alternative for policy-tool to the right package
+
+-------------------------------------------------------------------
+Wed Nov 5 09:10:07 UTC 2014 - [email protected]
+
+- Upgrade to upstream tag jdk9-b37
+- Upgrade to new tip of aarch64 hotspot including b37 changes
+- Remove aarch64-b35.patch
+ * changes integrated in the new aarch64 hotspot tip
+
+-------------------------------------------------------------------
+Wed Oct 29 08:41:58 UTC 2014 - [email protected]
+
+- Update config.sub and config.guess to the recent master of
+ http://git.savannah.gnu.org/cgit/config.git
+- Add aarch64 back to JIT architectures to see whether it builds
+ better
+- Don't apply 1015432.patch for aarch64
+ * Whitespace difference causes problems for a patch that is not
+ needed for aarch64
+
+-------------------------------------------------------------------
+Fri Oct 17 07:52:46 UTC 2014 - [email protected]
+
+- Upgrade to upstream jdk9-b35 tag
+- Add patch: aarch64-b35.patch
+ * bring changes from jdk9-b35 to the aarch64 hotspot tarball
+ manually
+
+-------------------------------------------------------------------
+Thu Oct 16 20:11:42 UTC 2014 - [email protected]
+
+- Allow building for SLE11
+ * Conditionalize BuildRequires
+ * Conditionalize cxxflags not understood by gcc 4.3
+ * Conditionalize javadoc noarch build for distributions that
+ understand the per-package BuildArch
+- Try to make the jre-32 and jre-64 provides more automatic
+- Disable brp-check-bytecode-version during install
+ * java9 will have bytecode version 9 in its jars
+
+-------------------------------------------------------------------
Old:
----
46b360454dad.tar.bz2
60fe681c30bc.tar.bz2
77a45995dd3b.tar.bz2
9b3f5e4f3372.tar.bz2
b374d8910e7f.tar.bz2
cc1c34d661e9.tar.bz2
cfdac5887952.tar.bz2
e4ba01b726e2.tar.bz2
e891e0c4edc5.tar.bz2
New:
----
0064e246d83f.tar.bz2
33e7e6998048.tar.bz2
5b102fc29edf.tar.bz2
833051855168.tar.bz2
a13c49c5f289.tar.bz2
cc775a4a24c7.tar.bz2
ebb2eb7f1aec.tar.bz2
f08660f30051.tar.bz2
f624acc711e2.tar.bz2
icedtea-sound-1.0.1-runtime.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_9_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:07:43.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:07:43.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package java-1_9_0-openjdk
+# spec file for package java
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,10 @@
#
+%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
+%global jit_arches %ix86 x86_64 ppc64 ppc64le
%global debug 0
%global bootcycle 1
-%global jit_arches %ix86 x86_64 aarch64 ppc64 ppc64le
%global buildoutputdir build
# Convert an absolute path to a relative path. Each symbolic link is
# specified relative to the directory in which it is installed so that
@@ -32,20 +33,20 @@
%global minorver 9
%global microver 0
%global updatever 0
-%global buildver b33
+%global buildver b48
%global root_project jdk9
%global root_repository jdk9
-%global root_revision e4ba01b726e2
-%global corba_revision cfdac5887952
-%global hotspot_revision 9b3f5e4f3372
-%global jaxp_revision 46b360454dad
-%global jaxws_revision 77a45995dd3b
-%global jdk_revision 60fe681c30bc
-%global langtools_revision e891e0c4edc5
-%global nashorn_revision b374d8910e7f
+%global root_revision 0064e246d83f
+%global corba_revision a13c49c5f289
+%global hotspot_revision cc775a4a24c7
+%global jaxp_revision 833051855168
+%global jaxws_revision 33e7e6998048
+%global jdk_revision ebb2eb7f1aec
+%global langtools_revision 5b102fc29edf
+%global nashorn_revision f08660f30051
%global aarch64_project aarch64-port
-%global aarch64_repository jdk9
-%global aarch64_hotspot_revision cc1c34d661e9
+%global aarch64_repository stage
+%global aarch64_hotspot_revision f624acc711e2
%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)
@@ -58,15 +59,17 @@
%global jredir %{sdkdir}/jre
%global sdkbindir %{_jvmdir}/%{sdklnk}/bin
%global jrebindir %{_jvmdir}/%{jrelnk}/bin
-%global jvmjardir %{_jvmjardir}/%{sdkdir}
-%global jvmjarlink %{_jvmjardir}/%{sdklnk}
# Prevent brp-java-repack-jars from being run.
%global __jar_repack 0
# cacert symlink
%global cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
# real file made by update-ca-certificates
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
-%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
+%global with_pulseaudio 0
+# turn zero on non jit arches by default
+%ifnarch %{jit_arches}
+%global _with_zero 1
+%endif
%ifarch x86_64
%global archinstall amd64
%endif
@@ -117,15 +120,31 @@
%global imagesdir images
%global imagestarget images
%endif
-%ifarch %{jit_arches}
+%ifnarch %{jit_arches}
+%global _with_zero 1
+%endif
+# bnc#542545
+# 32-bit versus 64-bit specific provides:
+%ifarch %ix86 ppc s390
+%global bits 32
+%endif
+%ifarch x86_64 ia64 s390x
+%global bits 64
+%endif
+%bcond_with zero
+# Turn on/off some features depending on openSUSE version
+%if 0%{?suse_version} >= 1130
+%if ! %{with zero}
%global with_systemtap 1
%else
%global with_systemtap 0
%endif
-%if 0%{?suse_version} >= 1140
-%global with_pulseaudio 1
%else
-%global with_pulseaudio 0
+%global with_systemtap 0
+%endif
+%if %{with_systemtap}
+%global tapsetroot %{_datadir}/systemtap
+%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
%endif
%if %{with_systemtap}
# Where to install systemtap tapset (links)
@@ -172,6 +191,8 @@
Source100: config.guess
Source101: config.sub
# RPM/distribution specific patches
+# Don't look for inexistant jars
+Patch0: icedtea-sound-1.0.1-runtime.patch
# Source and target to java 6 for icedtea-sound
Patch1: icedtea-sound-source_target.patch
# RHBZ 1015432
@@ -214,15 +235,10 @@
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: fontconfig
-BuildRequires: freetype-devel
+BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: giflib-devel
BuildRequires: gtk2-devel
-BuildRequires: libX11-devel
-BuildRequires: libXi-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXt-devel
-BuildRequires: libXtst-devel
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpng-devel
@@ -252,22 +268,40 @@
Provides: jre-openjdk = %{version}-%{release}
# Standard JPackage extensions provides.
Provides: java-fonts = %{version}
+# Required at least by fop
+Provides: java-%{bits} = %{javaver}
+Provides: java-%{javaver}-%{bits}
+Provides: java-openjdk-%{bits} = %{version}-%{release}
+Provides: jre-%{bits} = %{javaver}
+Provides: jre-%{javaver}-%{bits}
+Provides: jre-%{javaver}-openjdk-%{bits} = %{version}-%{release}
+Provides: jre-openjdk-%{bits} = %{version}-%{release}
+Provides: jre1.3.x
+Provides: jre1.4.x
+Provides: jre1.5.x
+Provides: jre1.6.x
+Provides: jre1.7.x
+Provides: jre1.8.x
+Provides: jre1.9.x
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%ifarch %ix86 ppc
-Provides: jre-32 = %{javaver}
+# Zero-assembler build requirement.
+%if %{with zero}
+BuildRequires: libffi-devel
%endif
-%ifarch x86_64
-Provides: jre-64 = %{javaver}
+%if 0%{?suse_version} <= 1130
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libX11-devel
+BuildRequires: libXi-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXt-devel
+BuildRequires: libXtst-devel
%endif
%if %{bootcycle}
BuildRequires: java-1.8.0-devel >= 1.8.0
%else
BuildRequires: java-devel >= %{javaver}
%endif
-# Zero-assembler build requirement.
-%ifnarch %{jit_arches}
-BuildRequires: libffi-devel
-%endif
# runtime certificates generation available in 11.3+ - bnc#596177
%if 0%{?suse_version} >= 1130
BuildRequires: java-ca-certificates
@@ -294,10 +328,10 @@
%package headless
Summary: OpenJDK Runtime Environment
Group: Development/Languages
-# Require jpackage-utils for ownership of /usr/lib/jvm/
-Requires: jpackage-utils
-# Require zoneinfo data provided by tzdata-java subpackage.
-Requires: tzdata-java
+# Require jpackage-utils (with java9 compatibility) for ownership of
/usr/lib/jvm/
+Requires: jpackage-utils-java9
+# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
+Requires: tzdata-java8
# Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall tool update-alternatives.
@@ -365,7 +399,7 @@
%package javadoc
Summary: OpenJDK API Documentation
Group: Documentation
-Requires: jpackage-utils
+Requires: jpackage-utils-java9
# Post requires update-alternatives to install javadoc alternative.
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall javadoc alternative.
@@ -373,7 +407,9 @@
# Standard JPackage javadoc provides.
Provides: java-%{javaver}-javadoc = %{version}-%{release}
Provides: java-javadoc = %{version}-%{release}
+%if 0%{?suse_version} >= 1120
BuildArch: noarch
+%endif
%description javadoc
The OpenJDK API documentation.
@@ -450,10 +486,15 @@
%patch205 -p1
%if %{with_pulseaudio}
+%patch0 -p1
%patch1 -p1
%endif
+# Due to whitespace differences the patch does not apply to the aarch64 tarball
+# and also is not needed there, so just apply to non aarch64 only.
+%ifnarch %{aarch64}
%patch2 -p1
+%endif
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -538,7 +579,7 @@
pushd %{buildoutputdir}
bash ../configure \
-%ifnarch %{jit_arches}
+%if %{with zero}
--with-jvm-variants=zero \
%endif
--disable-zip-debug-info \
@@ -556,8 +597,10 @@
%ifnarch %{arm}
--with-num-cores="$NUM_PROC" \
%endif
+%if 0%{?suse_version} >= 1120
--with-extra-cflags="-fno-devirtualize" \
--with-extra-cxxflags="-fno-devirtualize"
+%endif
# The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
# disables FDS for all build configs and reverts to pre-FDS make logic.
@@ -574,17 +617,19 @@
LOG=debug \
%{imagestarget} docs
+(cd %{imagesdir}/jdk && mv ../jre jre)
+
# remove redundant *diz and *debuginfo files
-find %{imagesdir}/j2sdk-image -iname '*.diz' -exec rm {} \;
-find %{imagesdir}/j2sdk-image -iname '*.debuginfo' -exec rm {} \;
+find %{imagesdir}/jdk -iname '*.diz' -exec rm {} \;
+find %{imagesdir}/jdk -iname '*.debuginfo' -exec rm {} \;
popd >& /dev/null
-export JAVA_HOME=$(pwd)/%{buildoutputdir}/%{imagesdir}/j2sdk-image
+export JAVA_HOME=$(pwd)/%{buildoutputdir}/%{imagesdir}/jdk
# cacerts are generated in runtime in openSUSE
-if [ -f %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts ];
then
- rm %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts
+if [ -f %{buildoutputdir}/%{imagesdir}/jdk/jre/lib/security/cacerts ]; then
+ rm %{buildoutputdir}/%{imagesdir}/jdk/jre/lib/security/cacerts
fi
%if 0%{?suse_version} < 1130
@@ -594,7 +639,7 @@
ALIAS=$(basename ${PEM} .pem)
awk '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/{ print $0;
}' ${PEM} > ${ALIAS}.pem
- yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore
%{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts -storepass
'changeit' -file ${ALIAS}.pem || :
+ yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore
%{buildoutputdir}/%{imagesdir}/jdk/jre/lib/security/cacerts -storepass
'changeit' -file ${ALIAS}.pem || :
rm ${ALIAS}.pem
done
%endif
@@ -608,7 +653,7 @@
--with-jdk-home=$JAVA_HOME \
--disable-docs
make %{?_smp_mflags}
-cp icedtea-sound.jar $JAVA_HOME/jre/lib/ext/
+mkdir -p $JAVA_HOME/jre/lib/%{archinstall}
cp build/native/libicedtea-sound.so $JAVA_HOME/jre/lib/%{archinstall}/
echo "#Config file to enable PulseAudio support" >
$JAVA_HOME/jre/lib/pulseaudio.properties
echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
@@ -639,7 +684,11 @@
fi
%install
-STRIP_KEEP_SYMTAB=libjvm*
+export LANG=en_US.UTF-8
+#bnc#530046
+export STRIP_KEEP_SYMTAB=libjvm*
+# skip /usr/lib/rpm/brp-check-bytecode-version:
+export NO_BRP_CHECK_BYTECODE_VERSION=true
%if %{with_systemtap}
# Install systemtap support files.
@@ -652,7 +701,7 @@
popd
%endif
-pushd %{buildoutputdir}/%{imagesdir}/j2sdk-image
+pushd %{buildoutputdir}/%{imagesdir}/jdk
# Install main files.
install -d -m 755 %{buildroot}%{_jvmdir}/%{sdkdir}
@@ -660,30 +709,6 @@
install -d -m 755 %{buildroot}%{_jvmdir}/%{jredir}
cp -a jre/bin jre/lib %{buildroot}%{_jvmdir}/%{jredir}
- # Install extension symlinks.
- install -d -m 755 %{buildroot}%{jvmjardir}
- pushd %{buildroot}%{jvmjardir}
- RELATIVE=$(%{abs2rel} %{_jvmdir}/%{jredir}/lib %{jvmjardir})
- ln -sf $RELATIVE/jsse.jar jsse-%{version}.jar
- ln -sf $RELATIVE/jce.jar jce-%{version}.jar
- ln -sf $RELATIVE/rt.jar jndi-%{version}.jar
- ln -sf $RELATIVE/rt.jar jndi-ldap-%{version}.jar
- ln -sf $RELATIVE/rt.jar jndi-cos-%{version}.jar
- ln -sf $RELATIVE/rt.jar jndi-rmi-%{version}.jar
- ln -sf $RELATIVE/rt.jar jaas-%{version}.jar
- ln -sf $RELATIVE/rt.jar jdbc-stdext-%{version}.jar
- ln -sf jdbc-stdext-%{version}.jar jdbc-stdext-3.0.jar
- ln -sf $RELATIVE/rt.jar sasl-%{version}.jar
- for jar in *-%{version}.jar
- do
- if [ x%{version} != x%{javaver} ]
- then
- ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|-%{javaver}.jar|g")
- fi
- ln -sf $jar $(echo $jar | sed "s|-%{version}.jar|.jar|g")
- done
- popd
-
# Install JCE policy symlinks.
install -d -m 755 %{buildroot}%{_jvmprivdir}/%{archname}/jce/vanilla
@@ -693,11 +718,6 @@
ln -sf %{sdkdir} %{sdklnk}
popd
- pushd %{buildroot}%{_jvmjardir}
- ln -sf %{sdkdir} %{jrelnk}
- ln -sf %{sdkdir} %{sdklnk}
- popd
-
# Remove javaws man page
rm -f man/man1/javaws*
@@ -726,7 +746,7 @@
# Install Javadoc documentation.
install -d -m 755 %{buildroot}%{_javadocdir}
-cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
+cp -a %{buildoutputdir}/images/docs %{buildroot}%{_javadocdir}/%{sdklnk}
# Install icons and menu entries.
for s in 16 24 32 48 ; do
@@ -808,7 +828,6 @@
# links points to java-atk-wrapper - an dependence
# mvyskocil: links are handled in post, lets make ghost files there
touch %{buildroot}/%{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
- touch %{buildroot}/%{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
pushd %{buildroot}/%{_jvmdir}/%{jredir}/lib/
echo "#Config file to enable java-atk-wrapper" > accessibility.properties
echo "" >> accessibility.properties
@@ -836,7 +855,6 @@
update-alternatives \
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
- --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
--slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
--slave %{_bindir}/policytool policytool %{jrebindir}/policytool \
@@ -865,14 +883,10 @@
update-alternatives \
--install %{_jvmdir}/jre-openjdk \
- jre_openjdk %{_jvmdir}/%{jrelnk} %{priority} \
- --slave %{_jvmjardir}/jre-openjdk \
- jre_openjdk_exports %{_jvmjardir}/%{jrelnk}
+ jre_openjdk %{_jvmdir}/%{jrelnk} %{priority}
update-alternatives \
--install %{_jvmdir}/jre-%{javaver} \
- jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \
- --slave %{_jvmjardir}/jre-%{javaver} \
- jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
+ jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority}
%postun headless
if [ $1 -eq 0 ]
@@ -922,9 +936,7 @@
update-alternatives \
--install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
- --slave %{_jvmjardir}/java java_sdk_exports %{jvmjarlink} \
--slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \
- --slave %{_bindir}/extcheck extcheck %{sdkbindir}/extcheck \
--slave %{_bindir}/jar jar %{sdkbindir}/jar \
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \
--slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \
@@ -952,8 +964,6 @@
--slave %{_bindir}/xjc xjc %{sdkbindir}/xjc \
--slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \
%{_mandir}/man1/appletviewer-%{sdklnk}.1$ext \
- --slave %{_mandir}/man1/extcheck.1$ext extcheck.1$ext \
- %{_mandir}/man1/extcheck-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \
%{_mandir}/man1/jar-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \
@@ -1013,14 +1023,10 @@
update-alternatives \
--install %{_jvmdir}/java-openjdk \
- java_sdk_openjdk %{_jvmdir}/%{sdklnk} %{priority} \
- --slave %{_jvmjardir}/java-openjdk \
- java_sdk_openjdk_exports %{jvmjarlink}
+ java_sdk_openjdk %{_jvmdir}/%{sdklnk} %{priority}
update-alternatives \
--install %{_jvmdir}/java-%{javaver} \
- java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \
- --slave %{_jvmjardir}/java-%{javaver} \
- java_sdk_%{javaver}_exports %{jvmjarlink}
+ java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority}
%postun devel
if [ $1 -eq 0 ]
@@ -1046,9 +1052,6 @@
if [ ! -e %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so ]; then
ln -sf %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
fi
-if [ ! -e %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar ]; then
- ln -sf %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar
%{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
-fi
%files -f %{name}.files
%defattr(-,root,root)
@@ -1066,34 +1069,28 @@
%dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/jli
%dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/server
%dir %{_jvmdir}/%{jredir}/lib/desktop
-%dir %{_jvmdir}/%{jredir}/lib/ext
%dir %{_jvmdir}/%{jredir}/lib/images
%dir %{_jvmdir}/%{jredir}/lib/images/cursors
-%dir %{_jvmdir}/%{jredir}/lib/management
+%dir %{_jvmdir}/%{jredir}/lib/modules
%dir %{_jvmdir}/%{jredir}/lib/security
-%dir %{_libdir}/jvm-exports
-%dir %{_libdir}/jvm-private
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/LICENSE
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/THIRD_PARTY_README
+%doc %{buildoutputdir}/%{imagesdir}/jdk/jre/ASSEMBLY_EXCEPTION
+%doc %{buildoutputdir}/%{imagesdir}/jdk/jre/LICENSE
+%doc %{buildoutputdir}/%{imagesdir}/jdk/jre/THIRD_PARTY_README
%dir %{_jvmdir}/%{sdkdir}
%{_jvmdir}/%{jrelnk}
-%{_jvmjardir}/%{jrelnk}
%{_jvmprivdir}/*
-%{jvmjardir}
%if 0%{?suse_version} <= 1130
%config(noreplace) %{cacerts}
%endif
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs
%{_mandir}/man1/java-%{sdklnk}.1*
%{_mandir}/man1/jjs-%{sdklnk}.1*
%{_mandir}/man1/keytool-%{sdklnk}.1*
%{_mandir}/man1/orbd-%{sdklnk}.1*
%{_mandir}/man1/pack200-%{sdklnk}.1*
+%{_mandir}/man1/policytool-%{sdklnk}.1*
%{_mandir}/man1/rmid-%{sdklnk}.1*
%{_mandir}/man1/rmiregistry-%{sdklnk}.1*
%{_mandir}/man1/servertool-%{sdklnk}.1*
@@ -1119,9 +1116,7 @@
%{_jvmdir}/%{sdkdir}/tapset/*.stp
%endif
%{_jvmdir}/%{sdklnk}
-%{_jvmjardir}/%{sdklnk}
%{_mandir}/man1/appletviewer-%{sdklnk}.1*
-%{_mandir}/man1/extcheck-%{sdklnk}.1*
%{_mandir}/man1/idlj-%{sdklnk}.1*
%{_mandir}/man1/jar-%{sdklnk}.1*
%{_mandir}/man1/jarsigner-%{sdklnk}.1*
@@ -1143,7 +1138,6 @@
%{_mandir}/man1/jstat-%{sdklnk}.1*
%{_mandir}/man1/jstatd-%{sdklnk}.1*
%{_mandir}/man1/native2ascii-%{sdklnk}.1*
-%{_mandir}/man1/policytool-%{sdklnk}.1*
%{_mandir}/man1/rmic-%{sdklnk}.1*
%{_mandir}/man1/schemagen-%{sdklnk}.1*
%{_mandir}/man1/serialver-%{sdklnk}.1*
@@ -1170,9 +1164,7 @@
%files accessibility
%defattr(-,root,root)
-%dir %{_jvmdir}/%{jredir}/lib/ext
%config(noreplace) %{_jvmdir}/%{jredir}/lib/accessibility.properties
%ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
-%ghost %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
%changelog
++++++ 46b360454dad.tar.bz2 -> 0064e246d83f.tar.bz2 ++++++
++++ 732328 lines of diff (skipped)
++++++ e4ba01b726e2.tar.bz2 -> 33e7e6998048.tar.bz2 ++++++
++++ 692428 lines of diff (skipped)
++++++ 46b360454dad.tar.bz2 -> 5b102fc29edf.tar.bz2 ++++++
++++ 1215876 lines of diff (skipped)
++++++ 46b360454dad.tar.bz2 -> 833051855168.tar.bz2 ++++++
++++ 91062 lines of diff (skipped)
++++++ 46b360454dad.tar.bz2 -> a13c49c5f289.tar.bz2 ++++++
++++ 830164 lines of diff (skipped)
++++++ aarch64-misc.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:07:57.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:07:57.000000000 +0100
@@ -83,4 +83,41 @@
// **********************************
// Make sure you set X_PLATFORM and X_ARCH defines correctly.
-Only in jdk9/jdk/src/solaris: bin
+--- jdk9/jdk/src/java.base/unix/conf/aarch64/jvm.cfg
++++ jdk9/jdk/src/java.base/unix/conf/aarch64/jvm.cfg
+@@ -0,0 +1,35 @@
++# Copyright (c) 2003, 2013, 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
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++#
++# List of JVMs that can be used as an option to java, javac, etc.
++# Order is important -- first in this list is the default JVM.
++# NOTE that this both this file and its format are UNSUPPORTED and
++# WILL GO AWAY in a future release.
++#
++# You may also select a JVM in an arbitrary location with the
++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
++# and may not be available in a future release.
++#
++-server KNOWN
++-client IGNORE
++++++ applet-hole.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:07:57.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:07:57.000000000 +0100
@@ -1,5 +1,5 @@
---- jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
2014-10-02 10:59:00.306661639 +0200
-+++ jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
2014-10-02 12:04:42.720636133 +0200
+--- jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
2015-01-21 11:27:05.801718902 +0100
++++ jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
2015-01-21 11:27:46.966774557 +0100
@@ -62,7 +62,7 @@
/**
* The applet (if loaded).
@@ -19,7 +19,7 @@
// Create a thread group for the applet, and start a new
// thread to load the applet.
String nm = "applet-" + getCode();
-@@ -305,7 +306,7 @@
+@@ -307,7 +308,7 @@
/**
* Get an event from the queue.
*/
@@ -28,18 +28,18 @@
while (queue == null || queue.isEmpty()) {
wait();
}
-@@ -700,7 +701,8 @@
- * applet event processing so that it can be gracefully interrupted from
+@@ -703,7 +704,8 @@
* things like HotJava.
*/
+ @SuppressWarnings("deprecation")
- private void runLoader() {
+ //Overridden by NetxPanel.
+ protected void runLoader() {
if (status != APPLET_DISPOSE) {
showAppletStatus("notdisposed");
return;
---- jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
2014-10-02 10:59:00.306661639 +0200
-+++ jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
2014-10-02 12:07:00.069483568 +0200
+--- jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
2015-01-21 11:27:05.801718902 +0100
++++ jdk9/jdk/src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
2015-01-21 11:27:46.966774557 +0100
@@ -41,25 +41,25 @@
*
* @author Arthur van Hoff
++++++ 46b360454dad.tar.bz2 -> cc775a4a24c7.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/46b360454dad.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/cc775a4a24c7.tar.bz2 differ:
char 11, line 1
++++++ config.guess ++++++
++++ 630 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/config.guess
++++ and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/config.guess
++++++ config.sub ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:07:57.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:07:57.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-10-01'
+timestamp='2014-09-26'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -283,8 +283,10 @@
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -296,11 +298,11 @@
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb |
shbe | shle | sh[1234]le | sh3ele \
@@ -325,6 +327,9 @@
c6x)
basic_machine=tic6x-unknown
;;
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
@@ -402,8 +407,10 @@
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +422,7 @@
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -769,6 +777,9 @@
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
@@ -824,6 +835,10 @@
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1369,14 +1384,14 @@
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems*
\
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* |
-tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1594,9 +1609,6 @@
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
++++++ disable-doclint-by-default.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:07:57.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:07:57.000000000 +0100
@@ -1,5 +1,5 @@
----
jdk9/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocEnv.java
2014-10-02 10:59:01.662630729 +0200
-+++
jdk9/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocEnv.java
2014-10-02 11:28:00.135388374 +0200
+---
jdk9/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocEnv.java
2015-01-13 11:33:23.444933430 +0100
++++
jdk9/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/DocEnv.java
2015-01-13 11:34:43.514036048 +0100
@@ -821,10 +821,9 @@
doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION :
DocLint.XMSGS_CUSTOM_PREFIX + opt);
}
@@ -14,33 +14,33 @@
return;
}
---- jdk9/langtools/test/tools/javadoc/doclint/DocLintTest.java 2014-10-02
10:59:01.836626762 +0200
-+++ jdk9/langtools/test/tools/javadoc/doclint/DocLintTest.java 2014-10-02
11:28:00.135388374 +0200
-@@ -130,12 +130,12 @@
- };
-
- test(Collections.<String>emptyList(),
-- Main.Result.ERROR,
-- EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
+--- jdk9/langtools/test/tools/javadoc/doclint/DocLintTest.java 2015-01-13
11:33:23.605929630 +0100
++++ jdk9/langtools/test/tools/javadoc/doclint/DocLintTest.java 2015-01-13
11:34:43.514036048 +0100
+@@ -131,12 +131,12 @@
+ };
+
+ test(Collections.<String>emptyList(),
+- Main.Result.ERROR,
+- EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
+ Main.Result.OK,
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
- test(Arrays.asList(rawDiags),
-- Main.Result.ERROR,
-- EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
+ test(Arrays.asList(rawDiags),
+- Main.Result.ERROR,
+- EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
+ Main.Result.OK,
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
- test(Arrays.asList("-Xdoclint:none"),
- Main.Result.OK,
-@@ -158,8 +158,8 @@
- EnumSet.of(Message.DL_WRN12));
-
- test(Arrays.asList(rawDiags, "-private"),
-- Main.Result.ERROR,
-- EnumSet.of(Message.DL_ERR6, Message.DL_ERR9,
Message.DL_WRN12));
+ test(Arrays.asList("-Xdoclint:none"),
+ Main.Result.OK,
+@@ -159,8 +159,8 @@
+ EnumSet.of(Message.DL_WRN12));
+
+ test(Arrays.asList(rawDiags, "-private"),
+- Main.Result.ERROR,
+- EnumSet.of(Message.DL_ERR6, Message.DL_ERR9,
Message.DL_WRN12));
+ Main.Result.OK,
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
- test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"),
- Main.Result.ERROR,
+ test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"),
+ Main.Result.ERROR,
++++++ 46b360454dad.tar.bz2 -> ebb2eb7f1aec.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/46b360454dad.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/ebb2eb7f1aec.tar.bz2 differ:
char 11, line 1
++++++ 46b360454dad.tar.bz2 -> f08660f30051.tar.bz2 ++++++
++++ 991923 lines of diff (skipped)
++++++ 46b360454dad.tar.bz2 -> f624acc711e2.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_9_0-openjdk/46b360454dad.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/f624acc711e2.tar.bz2 differ:
char 11, line 1
++++++ icedtea-sound-1.0.1-runtime.patch ++++++
--- jdk9/icedtea-sound/Makefile.am 2014-07-19 00:37:29.899679075 +0200
+++ jdk9/icedtea-sound/Makefile.am 2015-01-21 15:17:52.194764331 +0100
@@ -28,7 +28,6 @@
ICEDTEA_SOUND_JAVA_GENDIR = $(abs_top_builddir)/src/java
# Build directories
-RUNTIME = $(SYSTEM_JDK_DIR)/jre/lib/rt.jar
ICEDTEA_SOUND_BUILDDIR = $(abs_top_builddir)/build
ICEDTEA_SOUND_NATIVE_BUILDDIR = $(ICEDTEA_SOUND_BUILDDIR)/native
ICEDTEA_SOUND_NATIVE_OBJECTS = \
@@ -114,7 +113,7 @@
stamps/icedtea-sound-class.stamp:
mkdir -p $(ICEDTEA_SOUND_CLASS_DIR)
$(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d
$(ICEDTEA_SOUND_CLASS_DIR) \
- -bootclasspath $(RUNTIME) $(ICEDTEA_SOUND_JAVA_SRCS)
+ $(ICEDTEA_SOUND_JAVA_SRCS)
cp -r $(ICEDTEA_SOUND_JAVA_SRCDIR)/META-INF $(ICEDTEA_SOUND_CLASS_DIR)
chmod -R ug+w $(ICEDTEA_SOUND_CLASS_DIR)/META-INF
mkdir -p stamps
++++++ java-atk-wrapper-security.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:08:00.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:08:00.000000000 +0100
@@ -1,17 +1,17 @@
---- jdk9/jdk/src/java.base/share/conf/security/java.security 2014-10-02
10:59:00.983646206 +0200
-+++ jdk9/jdk/src/java.base/share/conf/security/java.security 2014-10-02
11:16:59.356230852 +0200
-@@ -226,6 +226,8 @@
- jdk.nashorn.internal.,\
+--- jdk9/jdk/src/java.base/share/conf/security/java.security 2015-01-21
11:14:03.406754718 +0100
++++ jdk9/jdk/src/java.base/share/conf/security/java.security 2015-01-21
11:19:39.398988262 +0100
+@@ -238,6 +238,8 @@
jdk.nashorn.tools.,\
+ jdk.tools.jimage.,\
com.sun.activation.registries.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.,\
#ifdef macosx
apple.,\
#endif
-@@ -275,6 +277,8 @@
- jdk.nashorn.internal.,\
+@@ -289,6 +291,8 @@
jdk.nashorn.tools.,\
+ jdk.tools.jimage.,\
com.sun.activation.registries.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.,\
++++++ link-with-as-needed.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:08:00.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:08:00.000000000 +0100
@@ -1,5 +1,5 @@
---- jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2014-10-02
10:59:00.992646001 +0200
-+++ jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2014-10-02
12:32:56.098093951 +0200
+--- jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2015-01-21
11:14:03.248758378 +0100
++++ jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2015-01-21
11:15:33.648665485 +0100
@@ -46,7 +46,7 @@
ifeq ($(USE_EXTERNAL_LIBZ), true)
@@ -8,9 +8,9 @@
+ UNPACKEXE_LIBS := -lz
else
UNPACKEXE_CFLAGS +=
-I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8
- UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
+ UNPACKEXE_ZIPOBJS :=
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zcrc32$(OBJ_SUFFIX) \
@@ -105,9 +105,9 @@
- LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
+ LDFLAGS_unix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
$(call
SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_linux := -lc, \
@@ -18,12 +18,12 @@
LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
- LDFLAGS_SUFFIX := $(LIBCXX), \
+ LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
+ OBJECT_DIR :=
$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \
+ OUTPUT_DIR :=
$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \
PROGRAM := unpack200, \
---- jdk9/jdk/make/lib/Awt2dLibraries.gmk 2014-10-02 10:59:00.991646024
+0200
-+++ jdk9/jdk/make/lib/Awt2dLibraries.gmk 2014-10-02 12:30:50.076942896
+0200
-@@ -497,7 +497,7 @@
+--- jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-01-21 11:14:03.248758378
+0100
++++ jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-01-21 11:15:33.648665485
+0100
+@@ -500,7 +500,7 @@
LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
++++++ s390-java-opts.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:08:00.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:08:00.000000000 +0100
@@ -1,17 +1,35 @@
---- jdk8/common/autoconf/boot-jdk.m4 2014-06-18 21:34:07.000000000 +0200
-+++ jdk8/common/autoconf/boot-jdk.m4 2014-07-09 22:00:05.272599977 +0200
-@@ -315,12 +315,12 @@
- fi
+--- jdk9/common/autoconf/boot-jdk.m4 2014-11-13 10:35:36.853382238 +0100
++++ jdk9/common/autoconf/boot-jdk.m4 2014-11-13 10:47:03.279862048 +0100
+@@ -366,30 +366,12 @@
+ AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
+
+ # Starting amount of heap memory.
+- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
++ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
+
+ # Maximum amount of heap memory.
+ # Maximum stack size.
+- JVM_MAX_HEAP=`expr $MEMORY_SIZE / 2`
+- if test "x$BUILD_NUM_BITS" = x32; then
+- if test "$JVM_MAX_HEAP" -gt "1100"; then
+- JVM_MAX_HEAP=1100
+- elif test "$JVM_MAX_HEAP" -lt "512"; then
+- JVM_MAX_HEAP=512
+- fi
++ JVM_MAX_HEAP=768
+ STACK_SIZE=768
+- else
+- # Running Javac on a JVM on a 64-bit machine, takes more space since
64-bit
+- # pointers are used. Apparently, we need to increase the heap and stack
+- # space for the jvm. More specifically, when running javac to build huge
+- # jdk batch
+- if test "$JVM_MAX_HEAP" -gt "1600"; then
+- JVM_MAX_HEAP=1600
+- elif test "$JVM_MAX_HEAP" -lt "512"; then
+- JVM_MAX_HEAP=512
+- fi
+- STACK_SIZE=1536
+- fi
+ ADD_JVM_ARG_IF_OK([-Xmx${JVM_MAX_HEAP}M],boot_jdk_jvmargs_big,[$JAVA])
+
ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
- # Minimum amount of heap memory.
-- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA])
-+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs,[$JAVA])
- if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU"
= "xppc64" ; then
- # Why does macosx need more heap? Its the huge JDK batch.
- ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
- else
-- ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA])
-+ ADD_JVM_ARG_IF_OK([-Xmx768M],boot_jdk_jvmargs,[$JAVA])
- fi
- # When is adding -client something that speeds up the JVM?
- # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
++++++ s390-size_t.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:08:00.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:08:00.000000000 +0100
@@ -1,6 +1,21 @@
----
jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2014-07-03 21:56:12.000000000 +0200
-+++
jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2014-07-11 13:41:53.568013676 +0200
-@@ -2686,7 +2686,7 @@
+--- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2014-11-13
10:35:38.014355933 +0100
++++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2014-11-16
12:11:02.771465686 +0100
+@@ -204,9 +204,9 @@
+ size_t non_profiled_size =
ReservedCodeSpace::allocation_align_size_up(NonProfiledCodeHeapSize);
+
+ // Compute initial sizes of CodeHeaps
+- size_t init_non_method_size = MIN2(InitialCodeCacheSize, non_method_size);
+- size_t init_profiled_size = MIN2(InitialCodeCacheSize, profiled_size);
+- size_t init_non_profiled_size = MIN2(InitialCodeCacheSize,
non_profiled_size);
++ size_t init_non_method_size = MIN2((size_t)InitialCodeCacheSize,
non_method_size);
++ size_t init_profiled_size = MIN2((size_t)InitialCodeCacheSize,
profiled_size);
++ size_t init_non_profiled_size = MIN2((size_t)InitialCodeCacheSize,
non_profiled_size);
+
+ // Reserve one continuous chunk of memory for CodeHeaps and split it into
+ // parts for the individual heaps. The memory layout looks like this:
+---
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2014-11-13 10:35:38.017355865 +0100
++++
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2014-11-16 12:11:02.772465660 +0100
+@@ -2659,7 +2659,7 @@
if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
size_t multiple =
_num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
n_blks += CMSOldPLABReactivityFactor*multiple*n_blks;
@@ -9,9 +24,9 @@
}
assert(n_blks > 0, "Error");
_cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
----
jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
2014-07-03 21:56:12.000000000 +0200
-+++
jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
2014-07-11 13:58:22.740341755 +0200
-@@ -950,7 +950,7 @@
+---
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
2014-11-13 10:35:38.017355865 +0100
++++
jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
2014-11-16 12:11:02.774465609 +0100
+@@ -939,7 +939,7 @@
if (free_percentage < desired_free_percentage) {
size_t desired_capacity = (size_t)(used() / ((double) 1 -
desired_free_percentage));
assert(desired_capacity >= capacity(), "invalid expansion size");
@@ -20,7 +35,7 @@
if (PrintGCDetails && Verbose) {
size_t desired_capacity = (size_t)(used() / ((double) 1 -
desired_free_percentage));
gclog_or_tty->print_cr("\nFrom compute_new_size: ");
-@@ -6559,7 +6559,7 @@
+@@ -6468,7 +6468,7 @@
HeapWord* curAddr = _markBitMap.startWord();
while (curAddr < _markBitMap.endWord()) {
size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
@@ -29,7 +44,7 @@
_markBitMap.clear_large_range(chunk);
if (ConcurrentMarkSweepThread::should_yield() &&
!foregroundGCIsActive() &&
-@@ -6858,7 +6858,7 @@
+@@ -6767,7 +6767,7 @@
return;
}
// Double capacity if possible
@@ -38,9 +53,9 @@
// 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(
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2014-07-11 13:57:11.817966591 +0200
-@@ -3767,7 +3767,7 @@
+--- jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2014-11-13 10:35:38.018355842 +0100
++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
2014-11-16 12:11:02.776465559 +0100
+@@ -3848,7 +3848,7 @@
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -49,9 +64,9 @@
} else {
target_size = 0;
}
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2014-07-11 13:41:53.582013356 +0200
-@@ -1730,7 +1730,7 @@
+--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2014-11-13 10:35:38.019355819 +0100
++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
2014-11-16 12:11:02.778465508 +0100
+@@ -1734,7 +1734,7 @@
verify_region_sets_optional();
@@ -60,9 +75,9 @@
ergo_verbose1(ErgoHeapSizing,
"attempt heap expansion",
ergo_format_reason("allocation request failed")
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2014-07-11 15:59:18.899087161 +0200
-@@ -38,7 +38,7 @@
+--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2014-11-13 10:35:38.020355797 +0100
++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
2014-11-16 12:11:02.778465508 +0100
+@@ -39,7 +39,7 @@
_cancel(false),
_empty(true),
_dropped(0) {
@@ -71,8 +86,8 @@
_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);
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
2014-07-11 16:09:06.970540320 +0200
+--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
2014-11-13 10:35:38.021355774 +0100
++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
2014-11-16 12:11:02.778465508 +0100
@@ -110,7 +110,7 @@
};
@@ -82,31 +97,20 @@
_lists = PaddedArray<G1StringDedupEntryFreeList,
mtGC>::create_unfreeable((uint)_nlists);
}
---- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
2014-07-11 13:41:53.582013356 +0200
-@@ -160,7 +160,7 @@
+--- jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
2014-11-13 10:35:38.021355774 +0100
++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
2014-11-16 12:11:02.779465483 +0100
+@@ -148,7 +148,7 @@
if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
- region_size = MAX2(average_heap_size / TARGET_REGION_NUMBER,
-- (uintx) MIN_REGION_SIZE);
-+ (size_t) MIN_REGION_SIZE);
+ region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(),
+- (uintx) HeapRegionBounds::min_size());
++ (size_t) HeapRegionBounds::min_size());
}
int region_size_log = log2_long((jlong) region_size);
----
jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
2014-07-03 21:56:12.000000000 +0200
-+++
jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
2014-07-11 17:39:05.464946601 +0200
-@@ -71,7 +71,7 @@
- if (_virtual_space != NULL &&
_virtual_space->expand_by(_reserved_byte_size)) {
- _region_start = covered_region.start();
- _region_size = covered_region.word_size();
-- idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
-+ BitMap::bm_word_t* map =
(BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
- _beg_bits.set_map(map);
- _beg_bits.set_size(bits / 2);
- _end_bits.set_map(map + words / 2);
----
jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2014-07-03 21:56:12.000000000 +0200
-+++
jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2014-07-11 13:41:53.584013310 +0200
-@@ -910,8 +910,8 @@
+---
jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2014-11-13 10:35:38.023355729 +0100
++++
jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
2014-11-16 12:11:02.780465458 +0100
+@@ -912,8 +912,8 @@
void PSParallelCompact::initialize_dead_wood_limiter()
{
const size_t max = 100;
@@ -117,9 +121,9 @@
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
DEBUG_ONLY(_dwl_initialized = true;)
_dwl_adjustment = normal_distribution(1.0);
---- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
2014-07-11 13:41:53.585013287 +0200
-@@ -194,7 +194,7 @@
+--- jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
2014-11-13 10:35:38.022355751 +0100
++++ jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
2014-11-16 12:11:02.780465458 +0100
+@@ -195,7 +195,7 @@
const size_t num_overflow_elems = of_stack->size();
const size_t space_available = queue->max_elems() - queue->size();
const size_t num_take_elems = MIN3(space_available / 4,
@@ -128,67 +132,38 @@
num_overflow_elems);
// Transfer the most recent num_take_elems from the overflow
// stack to our work queue.
---- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-07-03
21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-07-11
13:38:14.060047977 +0200
-@@ -389,7 +389,7 @@
+--- jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-11-13
10:35:38.028355616 +0100
++++ jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-11-16
12:15:10.065860961 +0100
+@@ -384,7 +384,7 @@
uintx calculated_size = NewSize + OldSize;
double shrink_factor = (double) MaxHeapSize / calculated_size;
uintx smaller_new_size = align_size_down((uintx)(NewSize *
shrink_factor), _gen_alignment);
- FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(),
smaller_new_size));
+ FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(),
(size_t)smaller_new_size));
- _initial_gen0_size = NewSize;
+ _initial_young_size = NewSize;
// OldSize is already aligned because above we aligned MaxHeapSize to
-@@ -437,7 +437,7 @@
+@@ -449,7 +449,7 @@
// yield a size that is too small) and bound it by MaxNewSize above.
// Ergonomics plays here by previously calculating the desired
// NewSize and MaxNewSize.
-- max_new_size = MIN2(MAX2(max_new_size, NewSize), MaxNewSize);
-+ max_new_size = MIN2(MAX2(max_new_size, (size_t)NewSize),
(size_t)MaxNewSize);
+- _max_young_size = MIN2(MAX2(_max_young_size, _initial_young_size),
MaxNewSize);
++ _max_young_size = MIN2(MAX2(_max_young_size, _initial_young_size),
(size_t)MaxNewSize);
}
- assert(max_new_size > 0, "All paths should set max_new_size");
-@@ -459,23 +459,23 @@
- // lower limit.
- _min_gen0_size = NewSize;
- desired_new_size = NewSize;
-- max_new_size = MAX2(max_new_size, NewSize);
-+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
- } else if (FLAG_IS_ERGO(NewSize)) {
- // If NewSize is set ergonomically, we should use it as a lower
- // limit, but use NewRatio to calculate the initial size.
- _min_gen0_size = NewSize;
- desired_new_size =
-- MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-- max_new_size = MAX2(max_new_size, NewSize);
-+ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size),
(size_t)NewSize);
-+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
- } else {
- // For the case where NewSize is the default, use NewRatio
- // to size the minimum and initial generation sizes.
- // Use the default NewSize as the floor for these values. If
- // NewRatio is overly large, the resulting sizes can be too
- // small.
-- _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size),
NewSize);
-+ _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size),
(size_t)NewSize);
- desired_new_size =
-- MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-+ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size),
(size_t)NewSize);
+ // Given the maximum young size, determine the initial and
+@@ -479,7 +479,7 @@
+ // NewSize as the floor, because if NewRatio is overly large, the
resulting
+ // size can be too small.
+ _initial_young_size =
+- MIN2(_max_young_size,
MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize));
++ MIN2(_max_young_size,
MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize));
}
+ }
- assert(_min_gen0_size > 0, "Sanity check");
-@@ -577,7 +577,7 @@
- } else {
- // It's been explicitly set on the command line. Use the
- // OldSize and then determine the consequences.
-- _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size);
-+ _min_gen1_size = MIN2((size_t)OldSize, _min_heap_byte_size -
_min_gen0_size);
- _initial_gen1_size = OldSize;
-
- // If the user has explicitly set an OldSize that is inconsistent
---- jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2014-07-03
21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp 2014-07-11
16:19:00.043879052 +0200
-@@ -1431,7 +1431,7 @@
+--- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2014-11-13
10:35:38.030355570 +0100
++++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2014-11-16
12:11:02.781465432 +0100
+@@ -1456,7 +1456,7 @@
void MetaspaceGC::post_initialize() {
// Reset the high-water mark once the VM initialization is done.
@@ -197,7 +172,7 @@
}
bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
-@@ -1491,7 +1491,7 @@
+@@ -1516,7 +1516,7 @@
(size_t)MIN2(min_tmp, double(max_uintx));
// Don't shrink less than the initial generation size
minimum_desired_capacity = MAX2(minimum_desired_capacity,
@@ -206,7 +181,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
-@@ -1546,7 +1546,7 @@
+@@ -1575,7 +1575,7 @@
const double max_tmp = used_after_gc / minimum_used_percentage;
size_t maximum_desired_capacity = (size_t)MIN2(max_tmp,
double(max_uintx));
maximum_desired_capacity = MAX2(maximum_desired_capacity,
@@ -215,7 +190,7 @@
if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr(" "
" maximum_free_percentage: %6.2f"
-@@ -3197,7 +3197,7 @@
+@@ -3237,7 +3237,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,
@@ -224,8 +199,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.
---- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
2014-07-03 21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
2014-07-11 17:50:56.051695703 +0200
+--- jdk9/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
2014-11-13 10:35:38.031355547 +0100
++++ jdk9/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
2014-11-16 12:11:02.782465407 +0100
@@ -238,7 +238,7 @@
size_t init_sz;
@@ -235,8 +210,8 @@
} else if (global_stats() == NULL) {
// Startup issue - main thread initialized before heap initialized.
init_sz = min_size();
---- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-07-03
21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-07-11
13:41:56.743940848 +0200
+--- jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-11-13
10:35:38.033355502 +0100
++++ jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-11-16
12:11:02.782465407 +0100
@@ -48,7 +48,7 @@
const size_t beg_index = size_t(index);
assert(beg_index < len || len == 0, "index too large");
@@ -255,9 +230,20 @@
const size_t end_index = beg_index + stride;
T* const base = (T*)a->base();
T* const beg = base + beg_index;
---- jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2014-07-03
21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp 2014-07-11
11:47:11.845740259 +0200
-@@ -1244,7 +1244,7 @@
+--- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2014-11-13
10:35:38.044355253 +0100
++++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2014-11-17
05:50:43.714512893 +0100
+@@ -656,7 +656,7 @@
+ WB_END
+
+ WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
+- uintx result;
++ size_t result;
+ 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 2014-11-13
10:35:38.045355230 +0100
++++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2014-11-16
12:11:02.783465381 +0100
+@@ -1344,7 +1344,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
@@ -266,7 +252,7 @@
} else {
FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
}
-@@ -1269,8 +1269,8 @@
+@@ -1369,8 +1369,8 @@
// Unless explicitly requested otherwise, make young gen
// at least min_new, and at most preferred_max_new_size.
if (FLAG_IS_DEFAULT(NewSize)) {
@@ -277,7 +263,7 @@
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
-@@ -1280,7 +1280,7 @@
+@@ -1380,7 +1380,7 @@
// so it's NewRatio x of NewSize.
if (FLAG_IS_DEFAULT(OldSize)) {
if (max_heap > NewSize) {
@@ -286,12 +272,3 @@
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
-@@ -1401,7 +1401,7 @@
- return true;
- }
-
--uintx Arguments::max_heap_for_compressed_oops() {
-+size_t Arguments::max_heap_for_compressed_oops() {
- // Avoid sign flip.
- assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page
size");
- // We need to fit both the NULL page and the heap into the memory budget,
while
++++++ system-giflib5.patch ++++++
--- /var/tmp/diff_new_pack.VsxC3z/_old 2015-01-30 15:08:00.000000000 +0100
+++ /var/tmp/diff_new_pack.VsxC3z/_new 2015-01-30 15:08:00.000000000 +0100
@@ -1,6 +1,21 @@
--- jdk9/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
2014-10-02 10:59:00.410659268 +0200
+++ jdk9/jdk/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
2014-10-02 12:51:37.035664378 +0200
-@@ -318,9 +318,18 @@
+@@ -310,7 +310,14 @@
+ free(pBitmapBits);
+ free(pOldBitmapBits);
+
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ int error = 0;
++ DGifCloseFile(gif, &error);
++ if (error)
++ return 0;
++#else
+ DGifCloseFile(gif);
++#endif
+
+ return 1;
+ }
+@@ -318,9 +325,18 @@
int
SplashDecodeGifStream(Splash * splash, SplashStream * stream)
{
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
