Hello community,
here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory
checked in at Fri May 6 13:42:36 CEST 2011.
--------
--- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-03-15 10:00:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-04-19 10:52:20.000000000 +0200
@@ -1,0 +2,38 @@
+Thu Apr 14 12:37:43 UTC 2011 - mvyskocil@suse.cz
+
+ - Fix the keystore handling
+ * remove the default (32 bytes long) keystore, if installed
+ * install symlinks in %posttrans, because older file not dissapear in post
+
+-------------------------------------------------------------------
+Tue Apr 5 09:16:27 UTC 2011 - mvyskocil@suse.cz
+
+- Update to icedtea6-1.10.1, openjdk b22, hotdpot 20b11
+ see following links for more details
+ http://blog.fuseyism.com/index.php/2011/04/04/icedtea6-1101-released/
+ http://blog.fuseyism.com/index.php/2011/03/02/icedtea6-110-released/
+- Backports:
+ * S7023591, S7027667: Clipped antialiased rectangles are filled, not drawn.
+ Add missing privileged block around access to the sun.awt.nativedebug
+ property.
+ * S7032388, PR682: Make HotSpot work on machines without cmov instruction again
+ * S7031385, PR680: Incorrect register allocation in orderAccess_linux_x86.inline.hpp
+Bug fixes:
+ * G356743: Support libpng 1.5.
+ * RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
+ * PR600: HS19 upgrade broke CACAO build on ARM
+ * PR616, PR99: Don’t statically link libstdc++ or libgcc
+ * PR632: patches/security/20110215/6878713.patch breaks shark zero build
+ * PR103: Usage of native2ascii during bootstrap
+ * PR633: IcedTea installs javaws manpages on x86 even with –disable-webstart
+ * PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
+ * PR586: Sources missing from src.zip
+ * PR639: Add missing include line, paths and LLVM flags for Shark.
+ * PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
+ * PR641: Increase stack size for PPC
+ * PR497: Mercurial revision detection not very reliable
+ * PR585: Freenet throws java.lang.UnsatisfiedLinkError with OpenJDK/CACAO
+- remove webstart and plugin, as they are now in separate icedtwa-web project
+- fix bnc#596177 - generate java cacerts at runtime (enabled for openSUSE 11.3+)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
13edc857b967.tar.gz
icedtea6-1.7-no-return-in-non-void.patch
icedtea6-1.9.4-moonlight-symbol-clash.patch
icedtea6-1.9.4-realpath.patch
icedtea6-1.9.7.tar.gz
jdk6-jaxp-b20.zip
openjdk-6-src-b16-no-return-in-nonvoid-function.patch
openjdk-6-src-b20-21_jun_2010-fedora.tar.bz2
New:
----
f0f676c5a2c6.tar.gz
icedtea6-1.10.1.tar.gz
jaxp144_01.zip
openjdk-6-src-b22-28_feb_2011-fedora.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_6_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.ZaicNi/_old 2011-05-06 13:42:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ZaicNi/_new 2011-05-06 13:42:22.000000000 +0200
@@ -16,7 +16,7 @@
#
-%define gcjbootstrap 1
+%define gcjbootstrap 0
%define jit_arches %{ix86} x86_64
# Turn on/off some features depending on openSUSE version
@@ -36,10 +36,10 @@
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedteaver 1.9.7
+%define icedteaver 1.10.1
%define icedteasnapshot %{nil}
-%define openjdkver b20
-%define openjdkdate 21_jun_2010
+%define openjdkver b22
+%define openjdkdate 28_feb_2011
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -48,7 +48,7 @@
%define accessver %{accessmajorver}.%{accessminorver}
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
-%define hotspoturl http://hg.openjdk.java.net/hsx/hsx19/master/archive/
+%define hotspoturl http://hg.openjdk.java.net/hsx/hsx20/master/archive/
%define jaxpurl https://jaxp.dev.java.net/files/documents/913/150648/
%define jafurl https://jax-ws.dev.java.net/files/documents/4202/150725/
%define jaxwsurl https://jax-ws.dev.java.net/files/documents/4202/150724/
@@ -102,8 +102,6 @@
# simply be another alternative.
%define sdkname java-%{javaver}-%{origin}
%define archname %{sdkname}
-# use a same name of alternatives as Sun/IBM Java
-%define javaplugin javaplugin
# Standard JPackage directories and symbolic links.
# Make 64-bit JDKs just another alternative on 64-bit architectures.
# FIXME: add a archsuffix, or use of an baseline.conf
@@ -115,12 +113,6 @@
%define jrebindir %{_jvmdir}/%{jrelnk}/bin
%define jvmjardir %{_jvmjardir}/%{sdkdir}
%define jvmjarlink %{_jvmjardir}/%{sdklnk}
-# macros from Sun package to make them similar
-%define pluginsdir %{_libdir}/browser-plugins
-%define pluginpath %{_jvmdir}/%{jrelnk}/lib/%{archinstall}
-# From icedtea 1.8 the new plugin is on;ly one available and is named
-# IcedTeaPlugin.so (again)
-%define pluginname IcedTeaPlugin.so
# For openSUSE >= 11.2 demo, sample and src.zip is noarch ==> share
%define sdkshare %{_datadir}/%{sdkname}
@@ -137,9 +129,12 @@
%define tapsetdir %{_datadir}/systemtap/tapset/%{_build_cpu}
%endif
+# cacert file
+%define cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
+
Name: java-1_6_0-openjdk
Version: 1.6.0.0_%{openjdkver}.%{icedteaver}
-Release: 2
+Release: 1
Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6
Group: Development/Languages/Java
License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception
@@ -155,10 +150,10 @@
Source5: mauve-%{mauvedate}.tar.bz2
# from Fedora rpm
Source6: mauve_tests
-Source7: %{hotspoturl}13edc857b967.tar.gz
-Source8: %{jaxpurl}jdk6-jaxp-%{openjdkver}.zip
-Source9: %{jafurl}jdk6-jaf-%{openjdkver}.zip
-Source10: %{jaxwsurl}jdk6-jaxws-%{openjdkver}.zip
+Source7: %{hotspoturl}f0f676c5a2c6.tar.gz
+Source8: %{jaxpurl}jaxp144_01.zip
+Source9: %{jafurl}jdk6-jaf-b20.zip
+Source10: %{jaxwsurl}jdk6-jaxws-b20.zip
Source1000: java-1_6_0-openjdk-rpmlintrc
# those properties are for opeSUSE only
Source1001: fontconfig.SuSE.properties
@@ -180,14 +175,8 @@
# he will (hopefully) be able to push them to upstream
# PATCH-FIX-OPENSUSE bnc#594415#c8
Patch110: openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch
-Patch112: openjdk-6-src-b16-no-return-in-nonvoid-function.patch
-# PATCH-FIX-OPENSUSE bnc#490610
-# Icedtea lcms patches are not correct, this fixes it
-# Patch114: openjdk-6-src-b16-lcms.patch - OBSOLETED by b20
# PATCH-FIX-OPENSUSE: avoid multiline comments - sent to upstream
Patch117: openjdk-6-src-b20-no-multiline-comments.patch
-# PATCH-FIX-OPENSUSE: default branch in switch statement - sent to upstream
-#Patch118: openjdk-6-src-b17-enumeration-value.patch - upstreamed in b20
# PATCH-FIX-OPENSUSE: suggest parentheses - sent to upstream
Patch119: openjdk-6-src-b20-suggest-parentheses.patch
# PATCH-FIX-OPENSUSE: statement has no effect - sent to upstream
@@ -199,20 +188,11 @@
# PATCH-FIX-OPENSUSE: remove -Werror from the all possible makefiles, it produces
# more errors especially in autogenerated files - hard to fix without a chance to quick upstream
Patch123: openjdk-6-src-b20-no-werror.patch
-# PATCH-FIX-OPENSUSE: the no-return-in-non-void againd - sent to upstream
-Patch124: icedtea6-1.7-no-return-in-non-void.patch
# PATCH-FIX-OPENSUSE: gcc 4.5 warnings
Patch127: openjdk-6-src-b20-defined-but-not-used.patch
# PATCH-FIX-OPENSUSE: gcc 4.5 warnings
Patch128: openjdk-6-src-b20-may-be-used-uninitialized.patch
Patch129: openjdk-6-src-b20-array-subscript-has-type-char.patch
-#PATCH-FIX-UPSTREAM: bnc#635365
-# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=613
-Patch130: icedtea6-1.9.4-realpath.patch
-#PATCH-FIX-UPSTREAM:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=582130
-# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622
-Patch131: icedtea6-1.9.4-moonlight-symbol-clash.patch
# PATCH-FIX-OPENSUSE: the no-return-in-non-void again - now in openjdk-ecj
Patch132: openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch
# PATCH-FIX-OPENSUSE: the string and literal compare fix
@@ -245,6 +225,9 @@
%else
BuildRequires: java-1_6_0-openjdk java-1_6_0-openjdk-devel
%endif
+
+BuildRequires: mozilla-nss-devel
+
# Mauve build requirements.
%if %{runtests}
BuildRequires: xorg-x11-server-extra
@@ -253,41 +236,35 @@
BuildRequires: fontconfig
BuildRequires: ecj
%endif
+
# Java Access Bridge for GNOME build requirements.
BuildRequires: at-spi-devel
BuildRequires: gawk
BuildRequires: libbonobo-devel
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: xorg-x11-util-devel
-# IcedTeaPlugin build requirements.
-BuildRequires: glib2-devel
-BuildRequires: gtk2-devel
-BuildRequires: mozilla-nspr-devel
-%if 0%{?suse_version} > 1130
-BuildRequires: mozilla-xulrunner20-devel
-%endif
-%if 0%{?suse_version} == 1130
-BuildRequires: mozilla-xulrunner192-devel
-%endif
-%if 0%{?suse_version} <= 1120
-# in case of 11.1 needs to build against openSUSE:11:Update repo
-BuildRequires: mozilla-xulrunner191-devel
-%endif
+
# pulse audio requirements
BuildRequires: libpulse-devel >= 0.9.11
BuildRequires: pulseaudio >= 0.9.11
+
#system tap
%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel >= 1.0
%endif
+
+%if 0%{?suse_version} > 1110
#fixing RedHat bug #648499
BuildRequires: lsb-release
#the /etc/SuSE-release is needed as well
BuildRequires: distribution-release
+%endif
+
# Zero-assembler build requirement.
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
%endif
+
%if %defined suse_version
BuildRequires: fdupes
BuildRequires: unzip
@@ -297,11 +274,18 @@
BuildRequires: update-desktop-files
%endif
+# runtime ceritifacates generation available in 11.3+ - bnc#596177
+%if %{suse_version} >= 1130
+BuildRequires: java-ca-certificates
+Requires(post): java-ca-certificates
+#bnc#634793
+Requires(post): mozilla-nss
+%else
# the certificates will converted in a prep to standard keystore file - cacerts
# The openssl requirment seems to be necessary for build only.
-# FIXME: remove!!
Requires: openssl
BuildRequires: openssl-certs
+%endif
Requires: rhino
# Require jpackage-utils for ant.
@@ -465,39 +449,12 @@
-%package plugin
-License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception
-# As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier:
-Summary: Java web browser plugin based on OpenJDK 6 and IcedTea 6
-Group: Development/Languages/Java
-Requires: %{name} = %{version}-%{release}
-Requires(pre): %{_sbindir}/update-alternatives
-Provides: java-1.6.0-openjdk-plugin = %{version}-%{release}
-Provides: java-plugin = %{javaver}
-Provides: java-%{javaver}-plugin = %{version}
-
-%description plugin
-This package provides a Java plugin for using Java applets in web
-browsers such as FireFox. It is based on gcjwebplugin using OpenJDK 6
-and IcedTea 6.
-
-In Firefox, you can check the plugin used by the browser by typing the
-URL
-
-about:plugins
-
-into the URL field of the navigation toolbar.
-
-
%prep
%setup -q -n icedtea6-%{icedteaver}
%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0 -b .optflags
-%patch124 -p1 -b .no-return-in-non-void
-%patch130 -p1 -b .realpath
-%patch131 -p1 -b .moonlight
%patch1000 -p1
cp %{SOURCE6} .
@@ -518,19 +475,19 @@
%if 0%{?suse_version} >= 1120
--enable-pulse-java \
--enable-nss \
- --enable-plugin \
%endif
- --with-hotspot-build=hs19 \
+ --with-hotspot-build=hs20 \
--with-hotspot-src-zip=%{SOURCE7} \
--with-jaf-drop-zip=%{SOURCE9} \
--with-jaxp-drop-zip=%{SOURCE8} \
--with-jaxws-drop-zip=%{SOURCE10} \
%if %{gcjbootstrap}
--with-gcj-home=%{_jvmdir}/java-gcj \
- --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \
%else
- --with-openjdk=%{_jvmdir}/%{sdkdir} \
+ --with-jdk-home=%{_jvmdir}/%{sdkdir} \
+ --disable-bootstrap \
%endif
+ --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \
--with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=suse-%{release}-%{_arch}
@@ -553,8 +510,8 @@
qpatch -p0 %{PATCH104}
qpatch -p0 %{PATCH107}
-%ifarch %ix86
qpatch -p0 %{PATCH108}
+%ifarch %ix86
qpatch -p0 %{PATCH109}
%endif
%ifarch ppc ppc64
@@ -570,10 +527,12 @@
%{PATCH123} \
%{PATCH127} \
%{PATCH128} \
- %{PATCH129} \
+%if %{gcjbootstrap}
%{PATCH132} \
+ %{PATCH134} \
%{PATCH133} \
- %{PATCH134}
+%endif
+ %{PATCH129}
do
qpatch -p1 ${PATCH}
done
@@ -581,22 +540,20 @@
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
-# ========== a default keystore ==========
-# a cacerts generation
if [ -f %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts ]; then
rm %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts
fi
+%if %{suse_version} < 1130
+# ========== a default keystore ==========
+# a cacerts generation - 11.3+ use java-ca-certificates package
for PEM in /etc/ssl/certs/*.pem; do
ALIAS=$(basename ${PEM} .pem)
- %if %{suse_version} == 1100
- if [ $ALIAS = COMODO_ECC_Certification_Authority ]; then
- continue
- fi
- %endif
awk '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/{ print $0; }' ${PEM} > ${ALIAS}.pem
- yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem
+
+ yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore %{buildoutputdir}/j2sdk-image/jre/lib/security/cacerts -storepass 'changeit' -file ${ALIAS}.pem || :
rm ${ALIAS}.pem
done
+%endif
# ========== java access bridge ==========
pushd java-access-bridge-%{accessver}
@@ -715,9 +672,6 @@
ln -sf %{sdkdir} %{sdklnk}
popd
- # Remove javaws man page.
- rm -f man/man1/javaws.1
-
# Install man pages.
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
for manpage in man/man1/*
@@ -766,16 +720,13 @@
# Install desktop files.
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
-cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
%if ! %defined suse_version
-desktop-file-install --vendor ''\
- --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
for e in jconsole policytool ; do
desktop-file-install --vendor=fedora --mode=644 \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
done
%else
-for d in jconsole policytool javaws; do
+for d in jconsole policytool; do
install -m 0644 $d.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
%suse_update_desktop_file $d
done
@@ -789,7 +740,6 @@
# Find JRE files.
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
| grep -v jre/lib/security \
- | grep -v %{pluginname} \
| sed 's|'$RPM_BUILD_ROOT'||' \
%{name}.files
# Find demo directories.
@@ -831,17 +781,22 @@
%fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/demo
%fdupes -s $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname}
+%if ! %{suse_version} >= 1130
+# touch %{buildroot}/%{_jvmdir}/%{jredir}/lib/security/cacerts
+# %else
# bnc496378 - check the size of installed cacerts
# 32 bytes means a default empty one
-if [[ $(stat -c "%s" $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/lib/security/cacerts) == "32" ]]; then
+if [[ $(stat -c "%s" $RPM_BUILD_ROOT/%{cacerts}) == "32" ]]; then
echo "ERROR: Default keystore seems empty"
exit 1
fi
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post
+
#bnc#648260 - workaround
sed -i '/pack200/d' /var/lib/rpm/alternatives/java
#fix of the previous workaround ;-) bnc#669716
@@ -849,12 +804,12 @@
if [ -f %{_libexecdir}/%{name}/javafix ]; then
/bin/sh %{_libexecdir}/%{name}/javafix
fi
+
ext=.gz
update-alternatives \
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
- --slave %{_bindir}/javaws javaws %{jrebindir}/javaws \
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
--slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
--slave %{_bindir}/policytool policytool %{jrebindir}/policytool \
@@ -901,6 +856,23 @@
update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
fi
+%if %{suse_version} >= 1130
+
+%posttrans
+# if there's no java, certificates are not generated
+if [ ! -f /var/lib/ca-certificates/java-cacerts ]; then
+ /usr/lib/ca-certificates/update.d/java.run
+
+# remove the default empty cacert file, if it's installed
+if [ 0`stat -c "%s" %{cacerts} 2>/dev/null` = "032" ] ; then
+ rm -f %{cacerts}
+fi
+
+if [ ! -e %{cacerts} ]; then
+ ln -s /var/lib/ca-certificates/java-cacerts %{cacerts}
+fi
+%endif
+
%post devel
#bnc#648260 - workaround
sed -i '/pack200/d' /var/lib/rpm/alternatives/java
@@ -1025,21 +997,6 @@
update-alternatives --remove javadocdir %{_javadocdir}/%{sdkname}/api
fi
-%post plugin
-# The new icedtea plugin has been renamed back to IcedTeaPlugin.so
-alternatives --remove %{javaplugin} \
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null || :
-update-alternatives \
- --install %{pluginsdir}/javaplugin.so javaplugin \
- %{pluginpath}/%{pluginname} %{priority}
-
-%postun plugin
-if [ $1 -eq 0 ]
-then
-update-alternatives --remove javaplugin \
- %{pluginpath}/%{pluginname}
-fi
-
%files -f %{name}.files
%defattr(-,root,root,-)
%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
@@ -1057,7 +1014,11 @@
%{_jvmprivdir}/*
%{jvmjardir}
%dir %{_jvmdir}/%{jredir}/lib/security
+%if %{suse_version} < 1130
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
+#%else
+#%ghost %{_jvmdir}/%{jredir}/lib/security/cacerts
+%endif
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg
@@ -1086,8 +1047,6 @@
%{_datadir}/icons/hicolor/24x24
%{_datadir}/icons/hicolor/32x32
%{_datadir}/icons/hicolor/48x48
-%{_datadir}/pixmaps/javaws.png
-%{_datadir}/applications/javaws.desktop
%{_datadir}/applications/policytool.desktop
%files devel
@@ -1168,8 +1127,4 @@
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{sdkname}
-%files plugin
-%defattr(-,root,root,-)
-%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/%{pluginname}
-
%changelog
++++++ 13edc857b967.tar.gz -> f0f676c5a2c6.tar.gz ++++++
java-1_6_0-openjdk/13edc857b967.tar.gz /mounts/work_src_done/STABLE/java-1_6_0-openjdk/f0f676c5a2c6.tar.gz differ: char 5, line 1
++++++ icedtea6-1.9.7.tar.gz -> icedtea6-1.10.1.tar.gz ++++++
java-1_6_0-openjdk/icedtea6-1.9.7.tar.gz /mounts/work_src_done/STABLE/java-1_6_0-openjdk/icedtea6-1.10.1.tar.gz differ: char 5, line 1
++++++ java-1.6.0-openjdk-optflags.patch ++++++
--- /var/tmp/diff_new_pack.ZaicNi/_old 2011-05-06 13:42:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ZaicNi/_new 2011-05-06 13:42:22.000000000 +0200
@@ -1,12 +1,12 @@
---- configacorig 2008-08-05 10:16:04.000000000 -0400
-+++ configure.ac 2008-08-05 10:16:15.000000000 -0400
-@@ -9,6 +9,9 @@
+--- configure.ac 2011-03-02 19:34:58.692136324 +0100
++++ configure.ac 2011-03-25 14:56:40.798290097 +0100
+@@ -18,6 +18,9 @@
AC_PROG_CC
AC_PROG_CXX
+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+AC_SUBST(ALT_OPT_CFLAGS)
+
- FIND_TOOL([MAKE], [make])
- FIND_TOOL([GZIP], [gzip])
- FIND_TOOL([ANT], [ant])
+ IT_FIND_TOOL([MAKE], [make])
+ IT_FIND_TOOL([GZIP], [gzip])
+ IT_FIND_TOOL([ANT], [ant])
++++++ openjdk-6-src-b20-array-subscript-has-type-char.patch ++++++
--- /var/tmp/diff_new_pack.ZaicNi/_old 2011-05-06 13:42:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ZaicNi/_new 2011-05-06 13:42:22.000000000 +0200
@@ -1,7 +1,7 @@
-Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
===================================================================
---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
-+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
@@ -287,12 +287,12 @@ int hashstr(const void *t) {
register int sum = 0;
register const char *s = (const char *)t;
@@ -10,9 +10,9 @@
+ while( ((c = s[(int)k]) != '\0') && (k < MAXID-1) ) { // Get characters till nul
c = (c<<1)+1; // Characters are always odd!
- sum += c + (c<> 1); // Hash key, un-modulo'd table size
+ return (int)((sum+xsum[(int)k]) >> 1); // Hash key, un-modulo'd table size
}
++++++ openjdk-6-src-b20-initialized-after.patch ++++++
--- /var/tmp/diff_new_pack.ZaicNi/_old 2011-05-06 13:42:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ZaicNi/_new 2011-05-06 13:42:22.000000000 +0200
@@ -1,8 +1,8 @@
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
-@@ -234,18 +234,18 @@ class ReferenceProcessor : public CHeapO
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
+@@ -243,19 +243,19 @@ class ReferenceProcessor : public CHeapO
// constructor
ReferenceProcessor():
_span((HeapWord*)NULL, (HeapWord*)NULL),
@@ -19,6 +19,7 @@
+ _next_id(0),
_is_alive_non_header(NULL),
_num_q(0),
+ _max_num_q(0),
- _processing_is_mt(false),
- _next_id(0)
+ _discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL),
@@ -26,11 +27,11 @@
{}
ReferenceProcessor(MemRegion span, bool atomic_discovery,
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/code/dependencies.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp
-@@ -411,15 +411,15 @@ class Dependencies: public ResourceObj {
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/code/dependencies.hpp
+@@ -419,15 +419,15 @@ class Dependencies: public ResourceObj {
public:
DepStream(Dependencies* deps)
@@ -50,11 +51,11 @@
_bytes(code->dependencies_begin())
{
initial_asserts(code->dependencies_size());
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
-@@ -151,7 +151,7 @@ class FilterIntoCSClosure: public OopClo
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+@@ -152,7 +152,7 @@ class FilterIntoCSClosure: public OopClo
public:
FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl,
G1CollectedHeap* g1, OopClosure* oc) :
@@ -63,7 +64,7 @@
{}
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
-@@ -186,7 +186,7 @@ public:
+@@ -187,7 +187,7 @@ public:
FilterAndMarkInHeapRegionAndIntoCSClosure(G1CollectedHeap* g1,
OopsInHeapRegionClosure* oc,
ConcurrentMark* cm)
@@ -72,11 +73,11 @@
template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
-@@ -589,7 +589,7 @@ class SymbolHashMapEntry : public CHeapO
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
+@@ -711,7 +711,7 @@ class SymbolHashMapEntry : public CHeapO
void set_value(u2 value) { _value = value; }
SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value)
@@ -85,11 +86,11 @@
}; // End SymbolHashMapEntry class
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/generation.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp
-@@ -673,7 +673,8 @@ class OneContigSpaceCardGeneration: publ
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/generation.hpp
+@@ -692,7 +692,8 @@ class OneContigSpaceCardGeneration: publ
int level, GenRemSet* remset,
ContiguousSpace* space) :
CardGeneration(rs, initial_byte_size, level, remset),
@@ -99,11 +100,11 @@
{}
inline bool is_in(const void* p) const;
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/watermark.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp
-@@ -40,8 +40,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC {
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/watermark.hpp
+@@ -46,8 +46,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC {
void set_point(HeapWord* p) { _point = p; }
// Constructors
@@ -114,11 +115,11 @@
};
inline bool operator==(const WaterMark& x, const WaterMark& y) {
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
-@@ -83,11 +83,11 @@ class CollectorPolicy : public CHeapObj
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
+@@ -90,11 +90,11 @@ class CollectorPolicy : public CHeapObj
bool _all_soft_refs_clear;
CollectorPolicy() :
@@ -132,11 +133,11 @@
_size_policy(NULL),
_should_clear_all_soft_refs(false),
_all_soft_refs_clear(false)
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
-@@ -44,7 +44,7 @@ class GenerationCounters: public CHeapOb
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
+@@ -50,7 +50,7 @@ class GenerationCounters: public CHeapOb
// This constructor is only meant for use with the PSGenerationCounters
// constructor. The need for such an constructor should be eliminated
// when VirtualSpace and PSVirtualSpace are unified.
@@ -145,11 +146,11 @@
public:
GenerationCounters(const char* name, int ordinal, int spaces,
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/space.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/space.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp
-@@ -328,7 +328,7 @@ public:
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/memory/space.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/space.hpp
+@@ -351,7 +351,7 @@ public:
DirtyCardToOopClosure(Space* sp, OopClosure* cl,
CardTableModRefBS::PrecisionStyle precision,
HeapWord* boundary) :
@@ -158,11 +159,11 @@
_min_done(NULL) {
NOT_PRODUCT(_last_bottom = NULL);
NOT_PRODUCT(_last_explicit_min_done = NULL);
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
-@@ -314,8 +314,8 @@ class VM_FindDeadlocks: public VM_Operat
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
+@@ -329,8 +329,8 @@ class VM_FindDeadlocks: public VM_Operat
outputStream* _out;
public:
@@ -173,11 +174,11 @@
~VM_FindDeadlocks();
DeadlockCycle* result() { return _deadlocks; };
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/callnode.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp
-@@ -309,8 +309,8 @@ public:
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/callnode.hpp
+@@ -319,8 +319,8 @@ public:
// A plain safepoint advertises no memory effects (NULL):
const TypePtr* adr_type = NULL)
: MultiNode( edges ),
@@ -187,7 +188,7 @@
_adr_type(adr_type)
{
init_class_id(Class_SafePoint);
-@@ -848,8 +848,8 @@ protected:
+@@ -858,8 +858,8 @@ protected:
public:
AbstractLockNode(const TypeFunc *tf)
: CallNode(tf, NULL, TypeRawPtr::BOTTOM),
@@ -198,11 +199,11 @@
{
#ifndef PRODUCT
_counter = NULL;
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/type.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/type.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp
-@@ -575,7 +575,7 @@ class TypePtr : public Type {
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/type.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/type.hpp
+@@ -582,7 +582,7 @@ class TypePtr : public Type {
public:
enum PTR { TopPTR, AnyNull, Constant, Null, NotNull, BotPTR, lastPTR };
protected:
@@ -211,11 +212,11 @@
virtual bool eq( const Type *t ) const;
virtual int hash() const; // Type specific hashing
static const PTR ptr_meet[lastPTR][lastPTR];
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/machnode.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp
-@@ -780,7 +780,7 @@ public:
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/machnode.hpp
+@@ -845,7 +845,7 @@ public:
uint _block_num;
@@ -224,11 +225,11 @@
labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {}
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/runtime.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp
-@@ -64,8 +64,8 @@ private:
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/runtime.hpp
+@@ -74,8 +74,8 @@ private:
NamedCounter(const char *n, CounterTag tag = NoTag):
_name(n),
_count(0),
@@ -239,11 +240,11 @@
const char * name() const { return _name; }
int count() const { return _count; }
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/block.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/block.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp
-@@ -47,7 +47,7 @@ protected:
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/block.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/block.hpp
+@@ -54,7 +54,7 @@ protected:
public:
Arena *_arena; // Arena to allocate in
@@ -252,7 +253,7 @@
debug_only(_limit=0);
_blocks = NEW_ARENA_ARRAY( a, Block *, OptoBlockListSize );
for( int i = 0; i < OptoBlockListSize; i++ ) {
-@@ -583,7 +583,7 @@ class CFGEdge : public ResourceObj {
+@@ -590,7 +590,7 @@ class CFGEdge : public ResourceObj {
CFGEdge(Block *from, Block *to, float freq, int from_pct, int to_pct) :
_from(from), _to(to), _freq(freq),
@@ -261,7 +262,7 @@
_infrequent = from_infrequent() || to_infrequent();
}
-@@ -631,11 +631,11 @@ class Trace : public ResourceObj {
+@@ -638,11 +638,11 @@ class Trace : public ResourceObj {
public:
Trace(Block *b, Block **next_list, Block **prev_list) :
@@ -276,11 +277,11 @@
set_next(b, NULL);
set_prev(b, NULL);
};
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
-@@ -299,9 +299,9 @@ public:
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
+@@ -308,9 +308,9 @@ public:
: _parent(0), _next(0), _child(0),
_head(head), _tail(tail),
_phase(phase),
@@ -292,11 +293,11 @@
{ }
// Is 'l' a member of 'this'?
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/subnode.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp
-@@ -278,7 +278,7 @@ class BoolNode : public Node {
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/subnode.hpp
+@@ -285,7 +285,7 @@ class BoolNode : public Node {
virtual uint size_of() const;
public:
const BoolTest _test;
@@ -305,11 +306,11 @@
init_class_id(Class_Bool);
}
// Convert an arbitrary int value to a Bool or other suitable predicate.
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
-@@ -139,7 +139,7 @@ class ImplicitExceptionTable VALUE_OBJ_C
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
+@@ -145,7 +145,7 @@ class ImplicitExceptionTable VALUE_OBJ_C
implicit_null_entry *adr( uint idx ) const { return &_data[2*idx]; }
ReallocMark _nesting; // assertion check for reallocations
public:
@@ -318,10 +319,10 @@
// (run-time) construction from nmethod
ImplicitExceptionTable( const nmethod *nm );
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
@@ -166,13 +166,13 @@ void MatchList::output(FILE *fp) {
ArchDesc::ArchDesc()
@@ -340,11 +341,11 @@
// Initialize the opcode to MatchList table with NULLs
for( int i=0; i<_last_opcode; ++i ) {
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/forms.hpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp
-@@ -142,7 +142,7 @@ public:
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/forms.hpp
+@@ -145,7 +145,7 @@ public:
// Public Methods
Form(int formType=0, int line=0)
@@ -353,10 +354,10 @@
~Form() {};
virtual bool ideal_only() const {
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
@@ -29,8 +29,8 @@
//----------------------------ADLParser----------------------------------------
// Create a new ADL parser
@@ -368,10 +369,10 @@
_AD._syntax_errs = _AD._semantic_errs = 0; // No errors so far this file
_AD._warnings = 0; // No warnings either
_curline = _ptr = NULL; // No pointers into buffer yet
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/arena.cpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/arena.cpp
@@ -71,7 +71,7 @@ Arena::Arena() {
}
@@ -381,10 +382,10 @@
set_size_in_bytes(a->size_in_bytes());
}
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/dict2.cpp
@@ -52,11 +52,11 @@ public:
// doubled in size; the total amount of EXTRA times all hash functions are
// computed for the doubling is no more than the current size - thus the
@@ -399,10 +400,10 @@
init();
}
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
@@ -29,7 +29,7 @@ using namespace std;
//------------------------------FileBuff---------------------------------------
@@ -421,10 +422,10 @@
_next = NULL; // No chained regions
}
-Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
+Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
===================================================================
---- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
-+++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
+--- icedtea6-1.10.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
++++ icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
@@ -182,8 +182,8 @@ void RegisterForm::output(FILE *fp) {
RegDef::RegDef(char *regname, char *callconv, char *c_conv, char * idealtype, char * encode, char * concrete)
: _regname(regname), _callconv(callconv), _c_conv(c_conv),
++++++ openjdk-6-src-b20-no-werror.patch ++++++
--- /var/tmp/diff_new_pack.ZaicNi/_old 2011-05-06 13:42:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ZaicNi/_new 2011-05-06 13:42:22.000000000 +0200
@@ -86,68 +86,3 @@
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
-Index: icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk
-===================================================================
---- icedtea6-1.9.7.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk
-+++ icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk
-@@ -144,7 +144,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
- # Treat compiler warnings as errors, if warnings not allowed
- #
- ifeq ($(COMPILER_WARNINGS_FATAL),true)
-- GCC_WARNINGS += -Werror
-+ GCC_WARNINGS += -Wall
- endif
-
- #
-Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
-===================================================================
---- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
-+++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make
-@@ -62,7 +62,7 @@ CPPFLAGS += -DASSERT
-
- # CFLAGS_WARN holds compiler options to suppress/enable warnings.
- # Compiler warnings are treated as errors
--CFLAGS_WARN = -Werror
-+CFLAGS_WARN = -Wall
- CFLAGS += $(CFLAGS_WARN)
-
- OBJECTNAMES = \
-Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
-===================================================================
---- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
-+++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make
-@@ -118,7 +118,7 @@ else
- endif
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+WARNINGS_ARE_ERRORS = -Wall
-
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
-===================================================================
---- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
-+++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make
-@@ -111,7 +111,7 @@ endif
-
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+WARNINGS_ARE_ERRORS = -Wall
- # Enable these warnings. See 'info gcc' about details on these options
- ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
-Index: icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk
-===================================================================
---- icedtea6-1.9.7.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk
-+++ icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk
-@@ -154,7 +154,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G
- # Treat compiler warnings as errors, if warnings not allowed
- #
- ifeq ($(COMPILER_WARNINGS_FATAL),true)
-- GCC_WARNINGS += -Werror
-+ GCC_WARNINGS += -Wall
- endif
-
- #
++++++ openjdk-6-src-b20-suggest-parentheses.patch ++++++
--- /var/tmp/diff_new_pack.ZaicNi/_old 2011-05-06 13:42:22.000000000 +0200
+++ /var/tmp/diff_new_pack.ZaicNi/_new 2011-05-06 13:42:22.000000000 +0200
@@ -1,89 +1,3 @@
-Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
-===================================================================
---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
-+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
-@@ -986,22 +986,22 @@ inline intx byte_size(void* from, void*
-
- // This routine takes eight bytes:
- inline u8 build_u8_from( u1 c1, u1 c2, u1 c3, u1 c4, u1 c5, u1 c6, u1 c7, u1 c8 ) {
-- return ( u8(c1) << 56 ) & ( u8(0xff) << 56 )
-- | ( u8(c2) << 48 ) & ( u8(0xff) << 48 )
-- | ( u8(c3) << 40 ) & ( u8(0xff) << 40 )
-- | ( u8(c4) << 32 ) & ( u8(0xff) << 32 )
-- | ( u8(c5) << 24 ) & ( u8(0xff) << 24 )
-- | ( u8(c6) << 16 ) & ( u8(0xff) << 16 )
-- | ( u8(c7) << 8 ) & ( u8(0xff) << 8 )
-- | ( u8(c8) << 0 ) & ( u8(0xff) << 0 );
-+ return (( u8(c1) << 56 ) & ( u8(0xff) << 56 ))
-+ | (( u8(c2) << 48 ) & ( u8(0xff) << 48 ))
-+ | (( u8(c3) << 40 ) & ( u8(0xff) << 40 ))
-+ | (( u8(c4) << 32 ) & ( u8(0xff) << 32 ))
-+ | (( u8(c5) << 24 ) & ( u8(0xff) << 24 ))
-+ | (( u8(c6) << 16 ) & ( u8(0xff) << 16 ))
-+ | (( u8(c7) << 8 ) & ( u8(0xff) << 8 ))
-+ | (( u8(c8) << 0 ) & ( u8(0xff) << 0 ));
- }
-
- // This routine takes four bytes:
- inline u4 build_u4_from( u1 c1, u1 c2, u1 c3, u1 c4 ) {
-- return ( u4(c1) << 24 ) & 0xff000000
-- | ( u4(c2) << 16 ) & 0x00ff0000
-- | ( u4(c3) << 8 ) & 0x0000ff00
-- | ( u4(c4) << 0 ) & 0x000000ff;
-+ return (( u4(c1) << 24 ) & 0xff000000)
-+ | (( u4(c2) << 16 ) & 0x00ff0000)
-+ | (( u4(c3) << 8 ) & 0x0000ff00)
-+ | (( u4(c4) << 0 ) & 0x000000ff);
- }
-
- // And this one works if the four bytes are contiguous in memory:
-@@ -1011,8 +1011,8 @@ inline u4 build_u4_from( u1* p ) {
-
- // Ditto for two-byte ints:
- inline u2 build_u2_from( u1 c1, u1 c2 ) {
-- return u2(( u2(c1) << 8 ) & 0xff00
-- | ( u2(c2) << 0 ) & 0x00ff);
-+ return u2((( u2(c1) << 8 ) & 0xff00)
-+ | (( u2(c2) << 0 ) & 0x00ff));
- }
-
- // And this one works if the two bytes are contiguous in memory:
-@@ -1035,14 +1035,14 @@ inline jfloat build_float_from( u1* p )
- // now (64-bit) longs
-
- inline jlong build_long_from( u1 c1, u1 c2, u1 c3, u1 c4, u1 c5, u1 c6, u1 c7, u1 c8 ) {
-- return ( jlong(c1) << 56 ) & ( jlong(0xff) << 56 )
-- | ( jlong(c2) << 48 ) & ( jlong(0xff) << 48 )
-- | ( jlong(c3) << 40 ) & ( jlong(0xff) << 40 )
-- | ( jlong(c4) << 32 ) & ( jlong(0xff) << 32 )
-- | ( jlong(c5) << 24 ) & ( jlong(0xff) << 24 )
-- | ( jlong(c6) << 16 ) & ( jlong(0xff) << 16 )
-- | ( jlong(c7) << 8 ) & ( jlong(0xff) << 8 )
-- | ( jlong(c8) << 0 ) & ( jlong(0xff) << 0 );
-+ return (( jlong(c1) << 56 ) & ( jlong(0xff) << 56 ))
-+ | (( jlong(c2) << 48 ) & ( jlong(0xff) << 48 ))
-+ | (( jlong(c3) << 40 ) & ( jlong(0xff) << 40 ))
-+ | (( jlong(c4) << 32 ) & ( jlong(0xff) << 32 ))
-+ | (( jlong(c5) << 24 ) & ( jlong(0xff) << 24 ))
-+ | (( jlong(c6) << 16 ) & ( jlong(0xff) << 16 ))
-+ | (( jlong(c7) << 8 ) & ( jlong(0xff) << 8 ))
-+ | (( jlong(c8) << 0 ) & ( jlong(0xff) << 0 ));
- }
-
- inline jlong build_long_from( u1* p ) {
-Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
-===================================================================
---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
-+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
-@@ -346,7 +346,7 @@ class NoRefDiscovery: StackObj {
- bool _was_discovering_refs;
- public:
- NoRefDiscovery(ReferenceProcessor* rp) : _rp(rp) {
-- if (_was_discovering_refs = _rp->discovery_enabled()) {
-+ if ((_was_discovering_refs = _rp->discovery_enabled())) {
- _rp->disable_discovery();
- }
- }
Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
===================================================================
--- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
++++++ openjdk-6-src-b20-21_jun_2010-fedora.tar.bz2 -> openjdk-6-src-b22-28_feb_2011-fedora.tar.bz2 ++++++
java-1_6_0-openjdk/openjdk-6-src-b20-21_jun_2010-fedora.tar.bz2 /mounts/work_src_done/STABLE/java-1_6_0-openjdk/openjdk-6-src-b22-28_feb_2011-fedora.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org