5 Mar
2010
5 Mar
'10
15:00
Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Fri Mar 5 16:00:08 CET 2010. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-11-10 14:50:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2010-03-04 09:50:49.000000000 +0100 @@ -1,0 +2,40 @@ +Thu Mar 4 08:50:07 UTC 2010 - mvyskocil@suse.cz + +- Updates: + * icedtea6-1.7 + * openjdk6 b17 14_oct_2009 +- Enabled NPPlugin - fix [bnc#582206] +- patches changes: + * obsolete java-1.6.0-openjdk-sparc-fixes.patch + * obsolete java-1.6.0-openjdk-sparc-hotspot.patch + * obsolete icedtea6-1.6-npplugin-xulrunner191.patch + * obsolete icedtea6-1.6-no-return-in-nonvoid-function.patch + * obsolete icedtea6-ecc-support-b387a64caa08.patch + * add a lot of patches fixes a build of openjdk6 with gcc4.5 using + -Werror -Wall + openjdk-6-src-b17-no-multiline-comments.patch + openjdk-6-src-b17-enumeration-value.patch + openjdk-6-src-b17-suggest-parentheses.patch + openjdk-6-src-b17-no-efect.patch + openjdk-6-src-b17-initialized-after.patch + openjdk-6-src-b17-unused-variable.patch + * openjdk-6-src-b17-no-werror.patch (suppress the errors in autogenerated + code) + * icedtea6-1.7-no-return-in-non-void.patch +- move the noarch content to %%{_datadir}/ and create symlinks in usual + locations +- move demo/jvmti to the -devel package as it contains so files +- enable the --short-circuit in %%install section +- new alternatives - policytool and policytool.1.gz + +------------------------------------------------------------------- +Tue Feb 9 14:09:35 UTC 2010 - prusnak@suse.cz + +- enable noarch subpackages + +------------------------------------------------------------------- +Mon Nov 23 11:16:34 UTC 2009 - mvyskocil@suse.cz + +- Removed openjdk-6-src-b14-confluence-crash.patch from source dir + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hotspot.tar.gz icedtea6-1.6-no-return-in-nonvoid-function.patch icedtea6-1.6-nppplugin-xulrunner191.patch icedtea6-1.6.2.tar.bz2 icedtea6-ecc-support-b387a64caa08.patch java-1.6.0-openjdk-sparc-fixes.patch java-1.6.0-openjdk-sparc-hotspot.patch netbeans-6.1-200805300101-basic_cluster-src.tar.bz2 netbeans-profiler-visualvm_preview2.tar.bz2 openjdk-6-src-b14-confluence-crash.patch openjdk-6-src-b16-24_apr_2009-fedora.tar.bz2 New: ---- icedtea6-1.7-no-return-in-non-void.patch icedtea6-1.7.tar.bz2 netbeans-profiler-visualvm_release65_mod.tar.bz2 openjdk-6-src-b17-14_oct_2009-fedora.tar.bz2 openjdk-6-src-b17-enumeration-value.patch openjdk-6-src-b17-initialized-after.patch openjdk-6-src-b17-no-efect.patch openjdk-6-src-b17-no-multiline-comments.patch openjdk-6-src-b17-no-werror.patch openjdk-6-src-b17-suggest-parentheses.patch openjdk-6-src-b17-unused-variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.CqvarE/_old 2010-03-05 15:58:26.000000000 +0100 +++ /var/tmp/diff_new_pack.CqvarE/_new 2010-03-05 15:58:26.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package java-1_6_0-openjdk (Version 1.6.0.0_b16) +# spec file for package java-1_6_0-openjdk (Version 1.6.0.0_b17) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,19 @@ %define gcjbootstrap 0 %define runtests 0 -%define icedteaver 1.6.2 +%define icedteaver 1.7 %define icedteasnapshot %{nil} -%define openjdkver b16 -%define openjdkdate 24_apr_2009 +%define openjdkver b17 +%define openjdkdate 14_oct_2009 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ %define accessmajorver 1.23 %define accessminorver 0 %define accessver %{accessmajorver}.%{accessminorver} %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ -%define visualvmurl http://icedtea.classpath.org/visualvm/ -%define netbeansurl http://nbi.netbeans.org/files/documents/210/2056/ +%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/ +%define netbeansurl http://icedtea.classpath.org/visualvm/ %define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/ -%define hotspotsnapshot -09f7962b8b44 +%define hotspotsnapshot %{nil} %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ %define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.bz2 @@ -70,7 +70,7 @@ %endif # Standard JPackage naming and versioning defines. %define origin openjdk -%define priority 17103 +%define priority 17104 %define javaver 1.6.0 %define buildver 0 # Hard-code libdir on 64-bit architectures to make the 64-bit JDK @@ -93,7 +93,9 @@ # macros from Sun package to make them similar %define pluginsdir %{_libdir}/browser-plugins %define pluginpath %{_jvmdir}/%{jrelnk}/lib/%{archinstall} -%define pluginname IcedTeaPlugin.so +%define pluginname IcedTeaNPPlugin.so +# For openSUSE >= 11.2 demo, sample and src.zip is noarch ==> share +%define sdkshare %{_datadir}/%{sdkname} Name: java-1_6_0-openjdk %define obsoletes java-1_7_0-icedtea @@ -102,47 +104,26 @@ Obsoletes: %obsoletes %endif Version: 1.6.0.0_%{openjdkver} -Release: 7 +Release: 1 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java -License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception +License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://openjdk.java.net/ -%if 0%suse_version > 1030 -BuildRequires: lzma -%endif # hg clone http://icedtea.classpath.org/hg/icedtea6-%{icedteaver} icedtea6-%{icedteaver} # tar --exclude-vcs -cjf icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 icedtea6-%{icedteaver} Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 -# wget http://cvs.fedoraproject.org/viewvc/devel/java-1.6.0-openjdk/generate-fedora-zip.sh?view=co -o generate-fedora-zip.sh -# sed -i 's#tar czf ../$(basename $1 -fedora.tar.gz)-fedora.tar.gz#tar cjf ../$(basename $1 .tar.bz2)-fedora.tar.bz2#' generate-fedora-zip.sh -# sed -i 's/# Create new tarball with new name./find openjdk -type 'f' -perm 0444 | xargs chmod 0644\n\n&/' generate-fedora-zip.sh # # download the openjdk from http://download.java.net/openjdk/jdk6/promoted/latest/ # sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz Source1: %{fedorazip} Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2 +# wget http://cvs.fedoraproject.org/viewvc/devel/java-1.6.0-openjdk/generate-fedora-zip.sh?view=co -o generate-fedora-zip.sh Source3: %{genurl}generate-fedora-zip.sh # wget ftp://sources.redhat.com/pub/mauve/snapshot/mauve-nigthly.tar.bz mauve-%(date '+%Y-%m-%d').tar.bz2 -Source6: mauve-%{mauvedate}.tar.bz2 +Source5: mauve-%{mauvedate}.tar.bz2 # from Fedora rpm -Source7: mauve_tests -# donwload the original zip -# unzip -qq -d tmp/ netbeans-6.1-200805300101-basic_cluster-src.zip -# cd tmp -# tar -cjf ../netbeans-6.1-200805300101-basic_cluster-src.tar.bz2 * -# cd .. -Source8: %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.tar.bz2 -# just download and repack the original tar.gz -Source9: %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.bz2 -Source10: %{visualvmurl}/visualvm-111-src.tar.bz2 -# hg clone http://hg.openjdk.java.net/jdk7/hotspot/hotspot/ -# pushd hotspot -# HOTSPOT_SNAPSHOT=-$(hg log | head -n 1 | cut -d : -f 3) -# rm -rf .hg* -# popd -# mv hotspot hotspot-${HOTSPOT_SNAPSHOT} -# tar -cjf hotspot${HOTSPOT_SNAPSHOT}.tar.bz2 hotspot-${HOTSPOT_SNAPSHOT} -# Used a hotspot from Fedora package -Source11: %{hotspoturl}/hotspot.tar.gz +Source6: mauve_tests +Source7: %{visualvmurl}/netbeans-profiler-visualvm_release65_mod.tar.bz2 +Source8: %{visualvmurl}/visualvm-111-src.tar.bz2 Source1000: java-1_6_0-openjdk-rpmlintrc # those properties are for opeSUSE only Source1001: fontconfig.SuSE.properties @@ -154,8 +135,6 @@ Patch2: java-1.6.0-openjdk-java-access-bridge-idlj.patch Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch Patch4: java-1.6.0-openjdk-accessible-toolkit.patch -Patch5: java-1.6.0-openjdk-sparc-fixes.patch -Patch6: java-1.6.0-openjdk-sparc-hotspot.patch # SUSE patches Patch104: openjdk-6-src-b09-gcc4-warningfixes.patch Patch107: openjdk-6-src-b14-no-return-in-nonvoid-function.patch @@ -165,17 +144,26 @@ # will be sent to upstream after sign of SCA (http://openjdk.java.net/contribute/) Patch110: openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch Patch112: openjdk-6-src-b16-no-return-in-nonvoid-function.patch -Patch113: icedtea6-1.6-nppplugin-xulrunner191.patch # PATCH-FIX-OPENSUSE bnc#490610 # Icedtea lcms patches are not correct, this fixes it Patch114: openjdk-6-src-b16-lcms.patch -# PATCH-FIX-OPENSUSE -# sent to distro-pkg-dev ML -Patch115: icedtea6-1.6-no-return-in-nonvoid-function.patch -# PATCH-FIX-UPSTREAM revb387a64caa08 -# elliptic curves support for jdk - icedtea bug 356 -# http://icedtea.classpath.org/hg/icedtea6/rev/b387a64caa08 -Patch116: icedtea6-ecc-support-b387a64caa08.patch +# PATCH-FIX-OPENSUSE: avoid multiline comments - sent to upstream +Patch117: openjdk-6-src-b17-no-multiline-comments.patch +# PATCH-FIX-OPENSUSE: default branch in switch statement - sent to upstream +Patch118: openjdk-6-src-b17-enumeration-value.patch +# PATCH-FIX-OPENSUSE: suggest parentheses - sent to upstream +Patch119: openjdk-6-src-b17-suggest-parentheses.patch +# PATCH-FIX-OPENSUSE: statement has no effect - sent to upstream +Patch120: openjdk-6-src-b17-no-efect.patch +# PATCH-FIX-OPENSUSE: order of declaration and initialization don't match - sent to upstream +Patch121: openjdk-6-src-b17-initialized-after.patch +# PATCH-FIX-OPENSUSE: unused variable warnings - sent to upstream +Patch122: openjdk-6-src-b17-unused-variable.patch +# PATCH-FIX-OPENSUSE: remove -Werror from the linux/gcc.make, it produces +# more errors especially in autogenerated files - hard to fix +Patch123: openjdk-6-src-b17-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-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -229,7 +217,7 @@ BuildRequires: pulseaudio >= 0.9.11 %ifarch %{jit_arches} #system tap -BuildRequires: systemtap-sdt-devel +BuildRequires: systemtap-sdt-devel >= 1.0 %endif # Zero-assembler build requirement. %ifnarch %{jit_arches} @@ -267,7 +255,7 @@ %else PreReq: update-alternatives %endif -Recommends: systemtap +Recommends: systemtap >= 1.0 # Standard JPackage base provides. Provides: java-1.6.0-openjdk = %{version}-%{release} Provides: jre-%{javaver}-%{origin} = %{version}-%{release} @@ -325,7 +313,7 @@ %package devel -License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception +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: %if 0%suse_version <= 1100 Obsoletes: %obsoletes-devel @@ -358,7 +346,7 @@ %package demo -License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception +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: %if 0%suse_version <= 1100 Obsoletes: %obsoletes-demo @@ -367,6 +355,9 @@ Group: Development/Languages/Java Provides: java-1.6.0-openjdk-demo = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description demo This package provides sources of demonstration applications for OpenJDK @@ -376,7 +367,7 @@ %package src -License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception +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: %if 0%suse_version <= 1100 Obsoletes: %obsoletes-src @@ -384,6 +375,9 @@ Summary: OpenJDK 6 Java class sources for developers Group: Development/Languages/Java Requires: %{name}-devel = %{version}-%{release} +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description src This package provides Java Runtime librarcy class sources of OpenJDK 6 @@ -393,7 +387,7 @@ %package javadoc -License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception +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: %if 0%suse_version <= 1100 Obsoletes: %obsoletes-javadoc @@ -404,6 +398,9 @@ Provides: java-1.6.0-openjdk-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} Provides: java-%{javaver}-javadoc = %{version}-%{release} +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description javadoc This package provides documentation of the API provided by OpenJDK 6 @@ -413,7 +410,7 @@ %package plugin -License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception +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: %if 0%suse_version <= 1100 Obsoletes: %obsoletes-plugin @@ -442,21 +439,13 @@ %prep %setup -q -n icedtea6-%{icedteaver} -%setup -q -n icedtea6-%{icedteaver} -T -D -a 6 +%setup -q -n icedtea6-%{icedteaver} -T -D -a 5 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2 %patch0 -b .optflags -%patch5 -p1 -%patch115 -p1 -b .no-return-in-nonvoid -%if %{suse_version} >= 1120 -%patch113 -p1 -b .xulrunner191 -%patch116 -p1 -b .ecc-support-b387a64caa08 -%endif +%patch124 -p1 -b .no-return-in-non-void %patch1000 -p1 cp %{SOURCE7} . cp %{SOURCE8} . -cp %{SOURCE9} . -cp %{SOURCE10} . -cp %{SOURCE11} . %build ulimit -a @@ -471,11 +460,11 @@ --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} \ --enable-pulse-java \ - --enable-nio2 \ %if 0%{suse_version} >= 1120 --enable-nss \ %endif - --with-hotspot-src-zip=hotspot.tar.gz + --enable-npplugin \ + --enable-nio2 sed -i 's/MEMORY_LIMIT = -J-Xmx512m/MEMORY_LIMIT = -J-Xmx768m/' Makefile %if %{gcjbootstrap} make stamps/patch-ecj.stamp @@ -484,7 +473,7 @@ # Those patches are from Fedora package patch -l -p0 < %{PATCH3} patch -l -p0 < %{PATCH4} -patch -l -p0 < %{PATCH6} + patch -l -p0 < %{PATCH104} patch -l -p0 < %{PATCH107} %ifarch %ix86 @@ -496,6 +485,13 @@ %endif patch -l -p0 < %{PATCH112} patch -l -p1 < %{PATCH114} +patch -l -p1 < %{PATCH117} +patch -l -p1 < %{PATCH118} +patch -l -p1 < %{PATCH119} +patch -l -p1 < %{PATCH120} +patch -l -p1 < %{PATCH121} +patch -l -p1 < %{PATCH122} +patch -l -p1 < %{PATCH123} make export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image # ========== a default keystore ========== @@ -567,6 +563,14 @@ # Install main files. install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} cp -a bin include lib src.zip $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + # noarch sub packages in openSUSE >= 11.2 + %if 0%{?suse_version} >= 1120 + install -d -m 755 $RPM_BUILD_ROOT%{sdkshare} + pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + mv src.zip $RPM_BUILD_ROOT%{sdkshare} + ln -sf %{sdkshare}/src.zip + popd + %endif install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} # bnc#438674 @@ -620,9 +624,30 @@ done # Install demos and samples. cp -a demo $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} - mkdir sample/rmi - mv bin/java-rmi.cgi sample/rmi + # enable short-circuit + [ ! -d sample/rmi ] && mkdir sample/rmi + [ -f bin/java-rmi.cgi ] && mv bin/java-rmi.cgi sample/rmi cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + + # noarch sub packages in openSUSE >= 11.2 + %if 0%{?suse_version} >= 1120 + pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + # samples can go all + mv sample $RPM_BUILD_ROOT%{sdkshare} + ln -sf %{sdkshare}/sample + + # leave the demo/jvmti in the -devel package in %{_libdir} - contains .so files + install -d -m 0755 $RPM_BUILD_ROOT%{sdkshare}/demo + DEMODIRS=$(ls -1d demo/* | grep -v jvmti) + mv $DEMODIRS $RPM_BUILD_ROOT%{sdkshare}/demo + pushd demo + for dir in $DEMODIRS; do + ln -sf %{sdkshare}/$dir + done + popd + popd + %endif + %ifarch %{jit_arches} # systemtap support install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/ @@ -631,7 +656,7 @@ popd # Install Javadoc documentation. install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} -mv %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname} +cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname} # Install icons and menu entries. for s in 16 24 32 48 ; do install -D -p -m 644 \ @@ -652,7 +677,8 @@ done %else # bnc#525097 removed visualvm, because it's not in openSUSE (yet) -rm visualvm.desktop +# enable short-circuit +[ -f visualvm.desktop ] && rm visualvm.desktop install -m 0644 *.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ for d in jconsole policytool javaws; do %suse_update_desktop_file $d @@ -690,9 +716,20 @@ | sed 's|'$RPM_BUILD_ROOT'||' \ | sed 's|^|%doc |' \ >> %{name}-demo.files + # noarch sub packages in openSUSE >= 11.2 + %if 0%{?suse_version} >= 1120 + sed -i -e 's#%{_jvmdir}/%{sdkdir}#%{sdkshare}#' %{name}-demo.files + # also move the jvmti content to the -devel + sed -i '/jvmti/d' %{name}-demo.files + %endif + # fdupes links the files from JDK to JRE, so it breaks a JRE # use it carefully :)) %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/ +# noarch sub packages in openSUSE >= 11.2 +%if 0%{?suse_version} >= 1120 +%fdupes -s $RPM_BUILD_ROOT/%{sdkshare} +%endif %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/demo %fdupes -s $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname} # bnc496378 - check the size of installed cacerts @@ -790,6 +827,7 @@ --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \ --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \ --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \ + --slave %{_bindir}/policytool policytool %{sdkbindir}/policytool \ --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \ --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \ --slave %{_bindir}/serialver serialver %{sdkbindir}/serialver \ @@ -838,6 +876,8 @@ %{_mandir}/man1/jstatd-%{sdkname}.1$ext \ --slave %{_mandir}/man1/native2ascii.1$ext native2ascii.1$ext \ %{_mandir}/man1/native2ascii-%{sdkname}.1$ext \ + --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \ + %{_mandir}/man1/policytool-%{name}.1$ext \ --slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \ %{_mandir}/man1/rmic-%{sdkname}.1$ext \ --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \ @@ -896,9 +936,13 @@ %defattr(-,root,root,-) %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE -%doc %{buildoutputdir}/j2sdk-image/jre/README.html %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README -%doc AUTHORS COPYING ChangeLog NEWS README +%doc openjdk/TRADEMARK +%doc AUTHORS +%doc COPYING +%doc ChangeLog +%doc NEWS +%doc README %dir %{_jvmdir}/%{sdkdir} %{_jvmdir}/%{jrelnk} %{_jvmjardir}/%{jrelnk} @@ -910,6 +954,11 @@ %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %if %{suse_version} >= 1120 %{_jvmdir}/%{jredir}/lib/security/nss.cfg +# links to the demo and sample dirs in noarch subpackages +%{_jvmdir}/%{sdkdir}/demo +%{_jvmdir}/%{sdkdir}/sample +%{_jvmdir}/%{sdkdir}/src.zip +%dir %{sdkshare} %endif %{_mandir}/man1/java-%{sdkname}.1* %{_mandir}/man1/keytool-%{sdkname}.1* @@ -928,21 +977,30 @@ %{_datadir}/pixmaps/javaws.png %{_datadir}/applications/javaws.desktop %{_datadir}/applications/policytool.desktop -%ifarch %{jit_arches} -# systemtap support -%{_datadir}/systemtap -%endif %files devel %defattr(-,root,root,-) +%doc %{buildoutputdir}/j2sdk-image/ASSEMBLY_EXCEPTION +%doc %{buildoutputdir}/j2sdk-image/LICENSE +#%doc %{buildoutputdir}/j2sdk-image/README.html +%doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README +%doc openjdk/TRADEMARK %dir %{_jvmdir}/%{sdkdir}/bin %dir %{_jvmdir}/%{sdkdir}/include %dir %{_jvmdir}/%{sdkdir}/lib +%ifarch %{jit_arches} +%{_datadir}/systemtap +%endif %{_jvmdir}/%{sdkdir}/bin/* %{_jvmdir}/%{sdkdir}/include/* %{_jvmdir}/%{sdkdir}/lib/* %{_jvmdir}/%{sdklnk} %{jvmjarlink} +# noarch sub packages in openSUSE >= 11.2 +%if 0%{?suse_version} >= 1120 +%dir %{_jvmdir}/%{sdkdir}/demo +%{_jvmdir}/%{sdkdir}/demo/jvmti +%endif # bnc#525097 %{_datadir}/applications/jconsole.desktop %{_mandir}/man1/appletviewer-%{sdkname}.1* @@ -979,7 +1037,12 @@ %files src %defattr(-,root,root,-) +# noarch sub packages in openSUSE >= 11.2 +%if 0%{?suse_version} >= 1120 +%{sdkshare}/src.zip +%else %{_jvmdir}/%{sdkdir}/src.zip +%endif #doc mauve_tests #doc mauve-%{mauvedate}/mauve_output @@ -989,6 +1052,6 @@ %files plugin %defattr(-,root,root,-) -%{_jvmdir}/%{sdkdir}/jre/lib/*/IcedTeaPlugin.so +%{_jvmdir}/%{sdkdir}/jre/lib/*/IcedTeaNPPlugin.so %changelog ++++++ generate-fedora-zip.sh ++++++ --- /var/tmp/diff_new_pack.CqvarE/_old 2010-03-05 15:58:26.000000000 +0100 +++ /var/tmp/diff_new_pack.CqvarE/_new 2010-03-05 15:58:26.000000000 +0100 @@ -79,11 +79,11 @@ openjdk/jdk/src/share/demo/java2d/J2DBench -find openjdk -type f -perm 0444 | xargs chmod 0644 +find openjdk -type f -perm 0444 | xargs chmod -f 0644 # Create new tarball with new name. pushd openjdk > /dev/null - tar cjf ../$(basename $1 .tar.bz2)-fedora.tar.bz2 * + tar cjf ../$(basename $1 .tar.gz)-fedora.tar.bz2 * popd > /dev/null # Remove old unzipped openjdk dir. ++++++ icedtea6-1.7-no-return-in-non-void.patch ++++++ Index: icedtea6-1.7/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc =================================================================== --- icedtea6-1.7.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-01-15 21:05:54.000000000 +0100 +++ icedtea6-1.7/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-03-04 09:38:42.077510759 +0100 @@ -729,6 +729,7 @@ } PLUGIN_DEBUG_0ARG("Queue processing stopped.\n"); + return NULL; } /****************************************** ++++++ icedtea6-1.6.2.tar.bz2 -> icedtea6-1.7.tar.bz2 ++++++ ++++ 291857 lines of diff (skipped) ++++++ openjdk-6-src-b17-enumeration-value.patch ++++++ Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp @@ -590,6 +590,7 @@ inline TosState as_TosState(BasicType ty case T_VOID : return vtos; case T_ARRAY : // fall through case T_OBJECT : return atos; + default : return ilgl; } return ilgl; } ++++++ openjdk-6-src-b17-initialized-after.patch ++++++ Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp @@ -232,18 +232,18 @@ class ReferenceProcessor : public CHeapO // constructor ReferenceProcessor(): _span((HeapWord*)NULL, (HeapWord*)NULL), - _discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL), - _discoveredFinalRefs(NULL), _discoveredPhantomRefs(NULL), _discovering_refs(false), _discovery_is_atomic(true), - _enqueuing_is_done(false), _discovery_is_mt(false), _discovered_list_needs_barrier(false), _bs(NULL), + _enqueuing_is_done(false), + _processing_is_mt(false), + _next_id(0), _is_alive_non_header(NULL), _num_q(0), - _processing_is_mt(false), - _next_id(0) + _discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL), + _discoveredFinalRefs(NULL), _discoveredPhantomRefs(NULL) {} ReferenceProcessor(MemRegion span, bool atomic_discovery, Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp @@ -343,8 +343,8 @@ class CMSKeepAliveClosure: public OopClo bool cpc): _collector(collector), _span(span), - _bit_map(bit_map), _mark_stack(mark_stack), + _bit_map(bit_map), _concurrent_precleaning(cpc) { assert(!_span.is_empty(), "Empty span could spell trouble"); } @@ -369,8 +369,8 @@ class CMSInnerParMarkAndPushClosure: pub OopTaskQueue* work_queue): _collector(collector), _span(span), - _bit_map(bit_map), - _work_queue(work_queue) { } + _work_queue(work_queue), + _bit_map(bit_map) { } virtual void do_oop(oop* p); virtual void do_oop(narrowOop* p); inline void do_oop_nv(oop* p) { CMSInnerParMarkAndPushClosure::do_oop_work(p); } Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp @@ -411,15 +411,15 @@ class Dependencies: public ResourceObj { public: DepStream(Dependencies* deps) - : _deps(deps), - _code(NULL), + : _code(NULL), + _deps(deps), _bytes(deps->content_bytes()) { initial_asserts(deps->size_in_bytes()); } DepStream(nmethod* code) - : _deps(NULL), - _code(code), + :_code(code), + _deps(NULL), _bytes(code->dependencies_begin()) { initial_asserts(code->dependencies_size()); Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp @@ -156,7 +156,7 @@ class FilterIntoCSClosure: public OopClo public: FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl, G1CollectedHeap* g1, OopClosure* oc) : - _dcto_cl(dcto_cl), _g1(g1), _oc(oc) + _g1(g1), _oc(oc), _dcto_cl(dcto_cl) {} inline void do_oop_nv(oop* p); inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); } @@ -193,7 +193,7 @@ public: FilterAndMarkInHeapRegionAndIntoCSClosure(G1CollectedHeap* g1, OopsInHeapRegionClosure* oc, ConcurrentMark* cm) - : _g1(g1), _oc(oc), _cm(cm) { } + : _g1(g1), _cm(cm), _oc(oc) { } inline void do_oop_nv(oop* p); inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); } Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp @@ -494,7 +494,7 @@ class SymbolHashMapEntry : public CHeapO void set_value(u2 value) { _value = value; } SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value) - : _hash(hash), _symbol(symbol), _value(value), _next(NULL) {} + : _hash(hash), _next(NULL), _symbol(symbol), _value(value) {} }; // End SymbolHashMapEntry class Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/generation.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/generation.hpp @@ -660,7 +660,8 @@ class OneContigSpaceCardGeneration: publ int level, GenRemSet* remset, ContiguousSpace* space) : CardGeneration(rs, initial_byte_size, level, remset), - _the_space(space), _min_heap_delta_bytes(min_heap_delta_bytes) + _min_heap_delta_bytes(min_heap_delta_bytes), + _the_space(space) {} inline bool is_in(const void* p) const; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp @@ -40,8 +40,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC { void set_point(HeapWord* p) { _point = p; } // Constructors - WaterMark(Space* s, HeapWord* p) : _space(s), _point(p) {}; - WaterMark() : _space(NULL), _point(NULL) {}; + WaterMark(Space* s, HeapWord* p) : _point(p), _space(s) {}; + WaterMark() : _point(NULL), _space(NULL) {}; }; inline bool operator==(const WaterMark& x, const WaterMark& y) { Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp @@ -70,11 +70,11 @@ class CollectorPolicy : public CHeapObj size_t _max_alignment; CollectorPolicy() : - _min_alignment(1), - _max_alignment(1), _initial_heap_byte_size(0), _max_heap_byte_size(0), - _min_heap_byte_size(0) + _min_heap_byte_size(0), + _min_alignment(1), + _max_alignment(1) {} public: Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp @@ -44,7 +44,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. - GenerationCounters() : _name_space(NULL), _current_size(NULL), _virtual_space(NULL) {} + GenerationCounters() : _current_size(NULL), _virtual_space(NULL), _name_space(NULL) {} public: GenerationCounters(const char* name, int ordinal, int spaces, Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/space.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/space.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/space.hpp @@ -324,7 +324,7 @@ public: DirtyCardToOopClosure(Space* sp, OopClosure* cl, CardTableModRefBS::PrecisionStyle precision, HeapWord* boundary) : - _sp(sp), _cl(cl), _precision(precision), _boundary(boundary), + _cl(cl), _sp(sp), _precision(precision), _boundary(boundary), _min_done(NULL) { NOT_PRODUCT(_last_bottom = NULL); NOT_PRODUCT(_last_explicit_min_done = NULL); Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp @@ -303,8 +303,8 @@ class VM_FindDeadlocks: public VM_Operat outputStream* _out; public: - VM_FindDeadlocks(bool concurrent_locks) : _concurrent_locks(concurrent_locks), _out(NULL), _deadlocks(NULL) {}; - VM_FindDeadlocks(outputStream* st) : _concurrent_locks(true), _out(st), _deadlocks(NULL) {}; + VM_FindDeadlocks(bool concurrent_locks) : _concurrent_locks(concurrent_locks), _deadlocks(NULL), _out(NULL) {}; + VM_FindDeadlocks(outputStream* st) : _concurrent_locks(true), _deadlocks(NULL), _out(st) {}; ~VM_FindDeadlocks(); DeadlockCycle* result() { return _deadlocks; }; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp @@ -296,8 +296,8 @@ public: // A plain safepoint advertises no memory effects (NULL): const TypePtr* adr_type = NULL) : MultiNode( edges ), - _jvms(jvms), _oop_map(NULL), + _jvms(jvms), _adr_type(adr_type) { init_class_id(Class_SafePoint); @@ -527,7 +527,7 @@ public: const int _bci; // Byte Code Index of call byte code CallJavaNode(const TypeFunc* tf , address addr, ciMethod* method, int bci) : CallNode(tf, addr, TypePtr::BOTTOM), - _method(method), _bci(bci), _optimized_virtual(false) + _optimized_virtual(false), _method(method), _bci(bci) { init_class_id(Class_CallJava); } @@ -802,8 +802,8 @@ protected: public: AbstractLockNode(const TypeFunc *tf) : CallNode(tf, NULL, TypeRawPtr::BOTTOM), - _coarsened(false), - _eliminate(false) + _eliminate(false), + _coarsened(false) { #ifndef PRODUCT _counter = NULL; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/type.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/type.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/type.hpp @@ -560,7 +560,7 @@ class TypePtr : public Type { public: enum PTR { TopPTR, AnyNull, Constant, Null, NotNull, BotPTR, lastPTR }; protected: - TypePtr( TYPES t, PTR ptr, int offset ) : Type(t), _ptr(ptr), _offset(offset) {} + TypePtr( TYPES t, PTR ptr, int offset ) : Type(t), _offset(offset), _ptr(ptr) {} virtual bool eq( const Type *t ) const; virtual int hash() const; // Type specific hashing static const PTR ptr_meet[lastPTR][lastPTR]; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp @@ -776,7 +776,7 @@ public: uint _block_num; - labelOper() : _block_num(0), _label(0) {} + labelOper() : _label(0), _block_num(0) {} labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {} Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp @@ -64,8 +64,8 @@ private: NamedCounter(const char *n, CounterTag tag = NoTag): _name(n), _count(0), - _next(NULL), - _tag(tag) {} + _tag(tag), + _next(NULL) { } const char * name() const { return _name; } int count() const { return _count; } Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/block.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/block.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/block.hpp @@ -47,7 +47,7 @@ protected: public: Arena *_arena; // Arena to allocate in - Block_Array(Arena *a) : _arena(a), _size(OptoBlockListSize) { + Block_Array(Arena *a) : _size(OptoBlockListSize), _arena(a) { debug_only(_limit=0); _blocks = NEW_ARENA_ARRAY( a, Block *, OptoBlockListSize ); for( int i = 0; i < OptoBlockListSize; i++ ) { @@ -575,7 +575,7 @@ class CFGEdge : public ResourceObj { CFGEdge(Block *from, Block *to, float freq, int from_pct, int to_pct) : _from(from), _to(to), _freq(freq), - _from_pct(from_pct), _to_pct(to_pct), _state(open) { + _state(open), _from_pct(from_pct), _to_pct(to_pct) { _infrequent = from_infrequent() || to_infrequent(); } @@ -623,11 +623,11 @@ class Trace : public ResourceObj { public: Trace(Block *b, Block **next_list, Block **prev_list) : - _first(b), - _last(b), + _id(b->_pre_order), _next_list(next_list), _prev_list(prev_list), - _id(b->_pre_order) { + _first(b), + _last(b) { set_next(b, NULL); set_prev(b, NULL); }; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp @@ -298,9 +298,9 @@ public: : _parent(0), _next(0), _child(0), _head(head), _tail(tail), _phase(phase), + _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0), _required_safept(NULL), - _allow_optimizations(true), - _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0) + _allow_optimizations(true) { } // Is 'l' a member of 'this'? Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp @@ -278,7 +278,7 @@ class BoolNode : public Node { virtual uint size_of() const; public: const BoolTest _test; - BoolNode( Node *cc, BoolTest::mask t): _test(t), Node(0,cc) { + BoolNode( Node *cc, BoolTest::mask t): Node(0,cc),_test(t) { init_class_id(Class_Bool); } // Convert an arbitrary int value to a Bool or other suitable predicate. Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp @@ -139,7 +139,7 @@ class ImplicitExceptionTable VALUE_OBJ_C implicit_null_entry *adr( uint idx ) const { return &_data[2*idx]; } ReallocMark _nesting; // assertion check for reallocations public: - ImplicitExceptionTable( ) : _data(0), _size(0), _len(0) { } + ImplicitExceptionTable( ) : _size(0), _len(0), _data(0) { } // (run-time) construction from nmethod ImplicitExceptionTable( const nmethod *nm ); ++++++ openjdk-6-src-b17-no-efect.patch ++++++ Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp @@ -344,8 +344,9 @@ inline bool is_object_aligned(intptr_t o //---------------------------------------------------------------------------------------------------- // Utility macros for compilers // used to silence compiler warnings +// suppress also statement has no effect -#define Unused_Variable(var) var +#define Unused_Variable(var) (var) = (var) //---------------------------------------------------------------------------------------------------- Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp @@ -42,7 +42,7 @@ class typeArrayKlass : public arrayKlass static klassOop create_klass(BasicType type, int scale, const char* name_str, TRAPS); static inline klassOop create_klass(BasicType type, int scale, TRAPS) { - return create_klass(type, scale, external_name(type), CHECK_NULL); + return create_klass(type, scale, external_name(type), THREAD); CHECK2_(NULL); } int oop_size(oop obj) const; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/exceptions.hpp @@ -178,6 +178,8 @@ class Exceptions { #define CHECK THREAD); if (HAS_PENDING_EXCEPTION) return ; (0 #define CHECK_(result) THREAD); if (HAS_PENDING_EXCEPTION) return result; (0 +//MV: same as a CHECK_(result), but for usage outside of func call, so it not have no effect statement (0) +#define CHECK2_(result) if (HAS_PENDING_EXCEPTION) return result #define CHECK_0 CHECK_(0) #define CHECK_NH CHECK_(Handle()) #define CHECK_NULL CHECK_(NULL) ++++++ openjdk-6-src-b17-no-multiline-comments.patch ++++++ Index: icedtea6-1.7/IcedTeaPlugin.cc =================================================================== --- icedtea6-1.7.orig/IcedTeaPlugin.cc +++ icedtea6-1.7/IcedTeaPlugin.cc @@ -594,12 +594,14 @@ char const* TYPES[10] = { "Object", PROCESS_PENDING_EVENTS_REF (reference); \ } \ *result = ParseValue (type, resultC->returnValue); +/* // \ // char* valueString = ValueString (type, *result); \ // printf ("RECEIVE_VALUE: %s result: %x = %s\n", \ // __func__, result, valueString); \ // free (valueString); \ // valueString = NULL; +*/ #define MESSAGE_RECEIVE_SIZE(reference, result) \ PRBool processed = PR_FALSE; \ @@ -620,9 +622,11 @@ char const* TYPES[10] = { "Object", *result = resultC->returnValue.ToInteger (&conversionResult); \ PLUGIN_CHECK ("parse integer", conversionResult); \ } +/* // \ // printf ("RECEIVE_SIZE: %s result: %x = %d\n", \ // __func__, result, *result); +*/ // strdup'd string must be freed by calling function. #define MESSAGE_RECEIVE_STRING(reference, char_type, result) \ @@ -644,9 +648,11 @@ char const* TYPES[10] = { "Object", *result = reinterpret_cast\ (strdup (resultC->returnValue.get ()));\ } +/* // \ // printf ("RECEIVE_STRING: %s result: %x = %s\n", \ // __func__, result, *result); +*/ // strdup'd string must be freed by calling function. #define MESSAGE_RECEIVE_STRING_UCS(reference, result) \ @@ -671,9 +677,11 @@ char const* TYPES[10] = { "Object", *result = static_cast (newstring); \ } +/* // \ // printf ("RECEIVE_STRING: %s result: %x = %s\n", \ // __func__, result, *result); +*/ #define MESSAGE_RECEIVE_BOOLEAN(reference, result) \ PRBool processed = PR_FALSE; \ @@ -690,13 +698,17 @@ char const* TYPES[10] = { "Object", *result = NULL; \ else \ *result = resultC->returnIdentifier; +/* // res = factory->current->ProcessNextEvent (PR_TRUE, \ // &processed); \ // PLUGIN_CHECK_RETURN (__func__, res); \ +*/ +/* // \ // printf ("RECEIVE_BOOLEAN: %s result: %x = %s\n", \ // __func__, result, *result ? "true" : "false"); +*/ #include #include Index: icedtea6-1.7/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp =================================================================== --- icedtea6-1.7.orig/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp +++ icedtea6-1.7/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp @@ -200,6 +200,7 @@ size_t os::Linux::default_guard_size(os: return (thr_type == java_thread ? 0 : page_size()); } +/* // Java thread: // // Low memory addresses @@ -232,6 +233,7 @@ size_t os::Linux::default_guard_size(os: // // ** P1 (aka bottom) and size ( P2 = P1 - size) are the address and stack size returned from // pthread_attr_getstack() +*/ static void current_stack_region(address* bottom, size_t* size) { if (os::Linux::is_initial_thread()) { Index: icedtea6-1.7/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp +++ icedtea6-1.7/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp @@ -22,6 +22,7 @@ * */ +/* // A frame represents a physical stack frame (an activation). Frames can be // C or Java frames, and the Java frames can be interpreted or compiled. // In contrast, vframes represent source-level activations, so that one physical frame @@ -85,6 +86,7 @@ // will truncate the unused space on succesive method calls. // // ------------------------------ C++ interpreter ---------------------------------------- +*/ public: enum { Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp @@ -25,6 +25,7 @@ # include "incls/_precompiled.incl" # include "incls/_codeBuffer.cpp.incl" +/* // The structure of a CodeSection: // // _start -> +----------------+ @@ -71,6 +72,7 @@ // When the code and relocations are copied to the code cache, // the empty parts of each section are removed, and everything // is copied into contiguous locations. +*/ typedef CodeBuffer::csize_t csize_t; // file-local definition Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp @@ -2189,6 +2189,7 @@ bool ciTypeFlow::clone_loop_heads(Loop* return rslt; } +/* // ------------------------------------------------------------------ // ciTypeFlow::clone_loop_head // @@ -2215,6 +2216,7 @@ bool ciTypeFlow::clone_loop_heads(Loop* // v v // exit // +*/ ciTypeFlow::Block* ciTypeFlow::clone_loop_head(Loop* lp, StateVector* temp_vector, JsrSet* temp_set) { Block* head = lp->head(); Block* tail = lp->tail(); Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/code/compiledIC.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/code/compiledIC.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/code/compiledIC.hpp @@ -22,6 +22,7 @@ * */ +/* //----------------------------------------------------------------------------- // The CompiledIC represents a compiled inline cache. // @@ -51,6 +52,7 @@ // The class automatically inserts transition stubs (using the InlineCacheBuffer) when an MT-unsafe // transition is made to a stub. // +*/ class CompiledIC; class CompiledICInfo { @@ -155,6 +157,7 @@ inline CompiledIC* CompiledIC_at(Relocat } +/* //----------------------------------------------------------------------------- // The CompiledStaticCall represents a call to a static method in the compiled // @@ -171,6 +174,7 @@ inline CompiledIC* CompiledIC_at(Relocat // Interpreted code: Calls to stub that set methodOop reference // // +*/ class CompiledStaticCall; class StaticCallInfo { Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp @@ -22,6 +22,7 @@ * */ +/* // // // Compute stack layouts for each instruction in method. @@ -84,6 +85,7 @@ // returns to). // // (Note this comment is borrowed form the original author of the algorithm) +*/ #include "incls/_precompiled.incl" #include "incls/_generateOopMap.cpp.incl" Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp @@ -224,6 +224,7 @@ class itableMethodEntry VALUE_OBJ_CLASS_ friend class klassItable; }; +/* // // Format of an itable // @@ -242,6 +243,7 @@ class itableMethodEntry VALUE_OBJ_CLASS_ // -- vtable for interface 2 --- // ... // +*/ class klassItable : public ResourceObj { private: instanceKlassHandle _klass; // my klass Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/callnode.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/callnode.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/callnode.cpp @@ -1078,6 +1078,7 @@ Node *AllocateArrayNode::make_ideal_leng //============================================================================= uint LockNode::size_of() const { return sizeof(*this); } +/* // Redundant lock elimination // // There are various patterns of locking where we release and @@ -1199,6 +1200,7 @@ uint LockNode::size_of() const { return // expansion of the Lock and Unlock macro nodes to make the operation a NOP // //============================================================================= +*/ // // Utility function to skip over uninteresting control nodes. Nodes skipped are: Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/graphKit.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/graphKit.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/graphKit.cpp @@ -1932,6 +1932,7 @@ Node* GraphKit::dstore_rounding(Node* n) : n; } +/* //============================================================================= // Generate a fast path/slow path idiom. Graph looks like: // [foo] indicates that 'foo' is a parameter @@ -1966,6 +1967,7 @@ Node* GraphKit::dstore_rounding(Node* n) //============================================================================= // Code is structured as a series of driver functions all called 'do_XXX' that // call a set of helper functions. Helper functions first, then drivers. +*/ //------------------------------null_check_oop--------------------------------- // Null check oop. Set null-path control into Region in slot 3. Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/idealKit.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/idealKit.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/idealKit.cpp @@ -49,11 +49,13 @@ IdealKit::IdealKit(PhaseGVN &gvn, Node* DEBUG_ONLY(_state = new (C->node_arena()) GrowableArray (C->node_arena(), init_size, 0, 0)); } +/* //-------------------------------if_then------------------------------------- // Create: if(left relop right) // / \ // iffalse iftrue // Push the iffalse cvstate onto the stack. The iftrue becomes the current cvstate. +*/ void IdealKit::if_then(Node* left, BoolTest::mask relop, Node* right, float prob, float cnt, bool push_new_state) { assert((state() & (BlockS|LoopS|IfThenS|ElseS)), "bad state for new If"); Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/loopopts.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/loopopts.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/loopopts.cpp @@ -1581,6 +1581,7 @@ Node* PhaseIdealLoop::short_circuit_if(I return con; } +/* //------------------------------ insert_if_before_proj ------------------------------------- // Insert a new if before an if projection (* - new node) // @@ -1603,6 +1604,7 @@ Node* PhaseIdealLoop::short_circuit_if(I // * new-proj proj // (returned) // +*/ ProjNode* PhaseIdealLoop::insert_if_before_proj(Node* left, bool Signed, BoolTest::mask relop, Node* right, ProjNode* proj) { IfNode* iff = proj->in(0)->as_If(); IdealLoopTree *loop = get_loop(proj); Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/output.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/output.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/output.cpp @@ -2640,6 +2640,7 @@ void Scheduling::ComputeRegisterAntidepe //------------------------------garbage_collect_pinch_nodes------------------------------- +/* // Garbage collect pinch nodes for reuse by other blocks. // // The block scheduler's insertion of anti-dependence @@ -2664,6 +2665,7 @@ void Scheduling::ComputeRegisterAntidepe // wired into the graph because the register is never // used or def'ed in the block. // +*/ void Scheduling::garbage_collect_pinch_nodes() { #ifndef PRODUCT if (_cfg->C->trace_opto_output()) tty->print("Reclaimed pinch nodes:"); Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/prims/unsafe.cpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/prims/unsafe.cpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/prims/unsafe.cpp @@ -37,6 +37,7 @@ #define UNSAFE_ENTRY(result_type, header) \ JVM_ENTRY(result_type, header) +/* // Can't use UNSAFE_LEAF because it has the signature of a straight // call into the runtime (just like JVM_LEAF, funny that) but it's // called like a Java Native and thus the wrapper built for it passes @@ -47,6 +48,7 @@ // wrapper and we get sick. //#define UNSAFE_LEAF(result_type, header) \ // JVM_LEAF(result_type, header) +*/ #define UNSAFE_END JVM_END ++++++ openjdk-6-src-b17-no-werror.patch ++++++ Index: icedtea6-1.7/openjdk/hotspot/make/linux/makefiles/gcc.make =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/make/linux/makefiles/gcc.make +++ icedtea6-1.7/openjdk/hotspot/make/linux/makefiles/gcc.make @@ -111,7 +111,8 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) +# gcc 4.5 produces a lot of errors expecially in autogenarated files, so turn -Weror off +CFLAGS_WARN/DEFAULT = $(ACCEPTABLE_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) ++++++ openjdk-6-src-b17-suggest-parentheses.patch ++++++ Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp @@ -957,22 +957,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: @@ -982,8 +982,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: @@ -1006,14 +1006,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.7/openjdk/hotspot/src/cpu/x86/vm/vm_version_x86_64.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/cpu/x86/vm/vm_version_x86_64.hpp +++ icedtea6-1.7/openjdk/hotspot/src/cpu/x86/vm/vm_version_x86_64.hpp @@ -265,14 +265,14 @@ protected: result |= CPU_CX8; if (_cpuid_info.std_cpuid1_edx.bits.cmov != 0) result |= CPU_CMOV; - if (_cpuid_info.std_cpuid1_edx.bits.fxsr != 0 || is_amd() && - _cpuid_info.ext_cpuid1_edx.bits.fxsr != 0) + if (_cpuid_info.std_cpuid1_edx.bits.fxsr != 0 || (is_amd() && + _cpuid_info.ext_cpuid1_edx.bits.fxsr != 0)) result |= CPU_FXSR; // HT flag is set for multi-core processors also. if (threads_per_core() > 1) result |= CPU_HT; - if (_cpuid_info.std_cpuid1_edx.bits.mmx != 0 || is_amd() && - _cpuid_info.ext_cpuid1_edx.bits.mmx != 0) + if (_cpuid_info.std_cpuid1_edx.bits.mmx != 0 || (is_amd() && + _cpuid_info.ext_cpuid1_edx.bits.mmx != 0)) result |= CPU_MMX; if (is_amd() && _cpuid_info.ext_cpuid1_edx.bits.tdnow != 0) result |= CPU_3DNOW; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp @@ -341,7 +341,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(); } } ++++++ openjdk-6-src-b17-unused-variable.patch ++++++ Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp @@ -123,6 +123,7 @@ class ConstantPoolCacheEntry VALUE_OBJ_C void set_bytecode_2(Bytecodes::Code code); void set_f1(oop f1) { oop existing_f1 = _f1; // read once + existing_f1 = existing_f1; // suppress compiler warning assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change"); oop_store(&_f1, f1); } Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp @@ -70,6 +70,7 @@ class AllocationStats VALUE_OBJ_CLASS_SP _splitBirths = 0; _splitDeaths = 0; _returnedBytes = 0; + dummy = dummy; //suppress compiler warning } AllocationStats() { Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp @@ -362,6 +362,7 @@ class Bytecode_loadconstant: public Byte assert(stdc == Bytecodes::_ldc || stdc == Bytecodes::_ldc_w || stdc == Bytecodes::_ldc2_w, "load constant"); + stdc = stdc; //suppress compiler warning } int index() const; Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/regalloc.hpp =================================================================== --- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/regalloc.hpp +++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/regalloc.hpp @@ -108,6 +108,7 @@ public: assert( n->_idx < _node_regs_max_index, "Exceeded _node_regs array"); OptoReg::Name first = _node_regs[n->_idx].first(); OptoReg::Name second = _node_regs[n->_idx].second(); + second = second; //suppress compiler warning assert( !OptoReg::is_valid(second) || second == first+1, "" ); assert(OptoReg::is_reg(first), "out of range"); return Matcher::_regEncode[first]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org