Hello community, here is the log from the commit of package java-1_6_0-openjdk.1356 for openSUSE:12.1:Update checked in at 2013-03-01 16:12:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/java-1_6_0-openjdk.1356 (Old) and /work/SRC/openSUSE:12.1:Update/.java-1_6_0-openjdk.1356.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_6_0-openjdk.1356", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.1:Update/.java-1_6_0-openjdk.1356.new/java-1_6_0-openjdk.changes 2013-03-01 16:12:41.000000000 +0100 @@ -0,0 +1,1142 @@ +------------------------------------------------------------------- +Wed Feb 20 13:48:40 UTC 2013 - mvyskocil@suse.com + +- update to 1.12.3 (bnc#804654) +* Security fixes + - S8006446: Restrict MBeanServer access (CVE-2013-1486) + - S8006777: Improve TLS handling of invalid messages + Lucky 13 (CVE-2013-0169) + - S8007688: Blacklist known bad certificate (issued by DigiCert) +* Backports + - S8007393: Possible race condition after JDK-6664509 + - S8007611: logging behavior in applet changed +* Bug fixes + - PR1319: Support GIF lib v5. + +------------------------------------------------------------------- +Tue Feb 12 10:16:01 UTC 2013 - mvyskocil@suse.com + +- update to 1.12.2 (bnc#801972) +* Backports + - S8004341: Two JCK tests fails with 7u11 b06 + - S8005615: Java Logger fails to load tomcat logger implementation (JULI) +* Bug fixes + - PR1297: cacao and jamvm parallel unpack failures + - PR1301: PR1171 causes builds of Zero to fail + +------------------------------------------------------------------- +Fri Feb 8 12:34:31 UTC 2013 - mvyskocil@suse.com + +- update to 1.12.1 (bnc#801972) +* Security fixes (on top of 1.12.0) + - S6563318, CVE-2013-0424: RMI data sanitization + - S6664509, CVE-2013-0425: Add logging context + - S6664528, CVE-2013-0426: Find log level matching its name or value given at construction time + - S6776941: CVE-2013-0427: Improve thread pool shutdown + - S7141694, CVE-2013-0429: Improving CORBA internals + - S7173145: Improve in-memory representation of splashscreens + - S7186945: Unpack200 improvement + - S7186946: Refine unpacker resource usage + - S7186948: Improve Swing data validation + - S7186952, CVE-2013-0432: Improve clipboard access + - S7186954: Improve connection performance + - S7186957: Improve Pack200 data validation + - S7192392, CVE-2013-0443: Better validation of client keys + - S7192393, CVE-2013-0440: Better Checking of order of TLS Messages + - S7192977, CVE-2013-0442: Issue in toolkit thread + - S7197546, CVE-2013-0428: (proxy) Reflect about creating reflective proxies + - S7200491: Tighten up JTable layout code + - S7200500: Launcher better input validation + - S7201064: Better dialogue checking + - S7201066, CVE-2013-0441: Change modifiers on unused fields + - S7201068, CVE-2013-0435: Better handling of UI elements + - S7201070: Serialization to conform to protocol + - S7201071, CVE-2013-0433: InetSocketAddress serialization issue + - S8000210: Improve JarFile code quality + - S8000537, CVE-2013-0450: Contextualize RequiredModelMBean class + - S8000540, CVE-2013-1475: Improve IIOP type reuse management + - S8000631, CVE-2013-1476: Restrict access to class constructor + - S8001235, CVE-2013-0434: Improve JAXP HTTP handling + - S8001242: Improve RMI HTTP conformance + - S8001307: Modify ACC_SUPER behavior + - S8001972, CVE-2013-1478: Improve image processing + - S8002325, CVE-2013-1480: Improve management of images +- openjdk-7-src-b147-awt-crasher.patch (bnc#792951) + +------------------------------------------------------------------- +Mon Feb 4 15:15:33 UTC 2013 - mvyskocil@suse.com + +- update to 1.12.0 +* Import of OpenJDK6 b27 (all changes already in security updates) +* Import of OpenJDK6 b26 + - S7071826: Avoid benign race condition in initialization of UUID + - S7123896: Unexpected behavior due to Solaris using separate IPv4 and IPv6 port spaces + - S7142509: Cipher.doFinal(ByteBuffer,ByteBuffer) fails to process when in.remaining() == 0 + - S7157903: JSSE client sockets are very slow + - S7174440: JDK6-open build breakage + - S7175845: JSSE client sockets are very slow + - S7176477: TEST: Remove testcase test/java/lang/SecurityManager/CheckPackageDefinition.java from jdk6-open + - S7184700: Backout changes with wrong id for 7157903 + - S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo +* Import of OpenJDK6 b25 + - S6790292: BOOTDIR of jdk6 u12 will not work with jdk7 builds + - S6967036: Need to fix links with // in Javadoc comments + - S7007299: FileFontStrike appears not to be threadsafe + - S7022473: JDK7 still runs /etc/prtconf to find memory size + - S7058133: Javah should use the freshly built classes instead of those from the BOOTDIR jdk + - S7107919: Remove hotspot assertion due to Solaris 8 kstat "unimplemented". + - S7123519: problems with certification path + - S7126889: Incorrect SSLEngine debug output + - S7127104: Build issue with prtconf and zones, also using := to avoid extra execs + - S7128474: Update source copyright years + - S7128505: Building on em64t system does not work + - S7149751: another krb5 test in openjdk6 without test infrastructure +* Backports + - S6706974: Add krb5 test infrastructure + - S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe + - S6761072: new krb5 tests fail on multiple platforms + - S6883983: JarVerifier dependency on sun.security.pkcs should be removed + - S4465490: Suspicious about double-check locking idiom being used in the code + - S6763340: memory leak in com.sun.corba.se.* classes + - S6873605: Missing finishedDispatch() call in ORBImpl causes test failures after 5u20 b04 + - S6980681: CORBA deadlock in Java SE believed to be related to CR 6238477 + - S7162902: Umbrella port of a number of corba bug fixes from JDK 6 to jdk7u/8 + - S6414899: P11Digest should support cloning + - S4898461: Support for ECB and CBC/PKCS5Padding + - S6604496: Support for CKM_AES_CTR (counter mode) + - S6682411: JCK test failed w/ ArrayIndexOutOfBoundException (-1) when decrypting with no data + - S6682417: JCK test failed w/ ProviderException when decrypted data is not multiple of blocks + - S6687725: Internal PKCS5Padding impl should throw IllegalBlockSizeException and not BadPaddingException + - S6812738: SSL stress test with GF leads to 32 bit max process size in less than 5 minutes with PCKS11 provider + - S6867345: Turkish regional options cause NPE in sun.security.x509.AlgorithmId.algOID + - S6924489: sun.security.pkcs11.wrapper.PKCS11Exception: CKR_OPERATION_NOT_INITIALIZED + - S7088989: Improve the performance for T4 by utilizing the newly provided crypto APIs +* Bug fixes + - PR902: PulseAudioClip getMicrosecondsLength() returns length in milliseconds, not microseconds + - PR1050: Stream objects not garbage collected + - PR1113: Add tapset tests to distribution. + - PR1117: IcedTea6 prebuilds far too many classes on bootstrap + - PR1121: Old installs still suffer from GCC PR41686 + - PR1119: Only add classes to rt-source-files.txt if the class (or one or more of its methods/fields) + are actually missing from the boot JDK + - PR1114: Provide option to turn off downloading of tarballs (--disable-downloading) + - PR1176: Synchronise CACAO rules between IcedTea6/7/8 where possible + - RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive + - G422525: Apply pax markings before using a freshly built JVM. + - PR986: IcedTea fails to build with IcedTea6 CACAO due to low max heap size +* CACAO + - PR1120: Unified version for icedtea6/7 + - CA166, CA167: check-langtools fixes for icedtea6 + - Implemented sun.misc.Perf.highResCounter + - CACAO now identifies by its own Mercurial revision + - Some memory barrier maintenance + - Ability to run when compiled as Thumb on armv5 (no Thumb JIT though) + - Stop creating pseudo files for OpenJDK (libjsig.so, Xusage.txt) + - Clang fix for the i386 backend + - CONTRIBUTE: Reference code submission process wiki instructions. + - INSTALL.CACAO: Update, so following the instruction actually works. + - Make doxygen work + - CA172, PR1266, G453612: ARM hardfloat support + - src/scripts/java.in: Look for cacao executable in install path, not in PATH. + - src/vm/jit/alpha/asmpart.S: Fix copyright header. + - src/vm/jit/alpha/asmpart.S: Properly set up GP in asm_abstractmethoderror + - Use @abs_top_builddir@ for support scripts +* JamVM + - ARMv6 armhf: Changes for Raspbian (Raspberry Pi) + - PPC: Don't use lwsync if it isn't supported + - X86: Generate machine-dependent stubs for i386 + - When suspending, ignore detached threads that have died, this prevents + a user caused deadlock when an external thread has been attached to the VM + via JNI and it has exited without detaching + - Add missing REF_TO_OBJs for references passed from JNI, this enable JamVM + to run Qt-Jambi + - PR1155: Do not put version number in libjvm.so SONAME +* SystemTap + - Addition of garbage collection probes +* drop bouncycastle patch and add a shell hackery in %install + +------------------------------------------------------------------- +Fri Oct 19 09:43:00 UTC 2012 - mvyskocil@suse.com + +- update to 1.11.5 (bnc#785433) +* Security fixes + - S6631398, CVE-2012-3216: FilePermission improved path checking + - S7093490: adjust package access in rmiregistry + - S7143535, CVE-2012-5068: ScriptEngine corrected permissions + - S7167656, CVE-2012-5077: Multiple Seeders are being created + - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types + - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector + - S7172522, CVE-2012-5072: Improve DomainCombiner checking + - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC + - S7189103, CVE-2012-5069: Executors needs to maintain state + - S7189490: More improvements to DomainCombiner checking + - S7189567, CVE-2012-5085: java net obselete protocol + - S7192975, CVE-2012-5071: Conditional usage check is wrong + - S7195194, CVE-2012-5084: Better data validation for Swing + - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved + - S7195919, CVE-2012-5079: (sl) ServiceLoader can throw CCE without needing to create instance + - S7198296, CVE-2012-5089: Refactor classloader usage + - S7158800: Improve storage of symbol tables + - S7158801: Improve VM CompileOnly option + - S7158804: Improve config file parsing + - S7176337: Additional changes needed for 7158801 fix + - S7198606, CVE-2012-4416: Improve VM optimization +* Backports + - S7175845: "jar uf" changes file permissions unexpectedly + - S7177216: native2ascii changes file permissions of input file + - S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo +* Bug fixes + - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default + +------------------------------------------------------------------- +Mon Sep 3 11:59:29 UTC 2012 - mvyskocil@suse.cz + +- update to 1.11.4 (bnc#777499) +* Security fixes + - S7162476, CVE-2012-1682: XMLDecoder security issue via ClassFinder + - S7163201, CVE-2012-0547: Simplify toolkit internals references ++++ 945 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update/.java-1_6_0-openjdk.1356.new/java-1_6_0-openjdk.changes New: ---- check-build.sh fontconfig.SuSE.properties generate-fedora-zip.sh icedtea6-1.12.3.tar.gz icedtea6-1.12.3.tar.gz.sig java-1.6.0-openjdk-accessible-toolkit.patch java-1.6.0-openjdk-java-access-bridge-idlj.patch java-1.6.0-openjdk-java-access-bridge-security.patch java-1.6.0-openjdk-java-access-bridge-tck.patch java-1.6.0-openjdk-optflags.patch java-1_6_0-openjdk-rpmlintrc java-1_6_0-openjdk-suse-desktop-files.patch java-1_6_0-openjdk.changes java-1_6_0-openjdk.spec java-access-bridge-1.23.0.tar.bz2 jaxp144_04.zip jdk6-jaf-b20.zip jdk6-jaxws2_1_6-2011_06_13.zip mauve-2008-10-22.tar.bz2 mauve_tests openjdk-6-src-b09-gcc4-warningfixes.patch openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch openjdk-6-src-b14-no-return-in-nonvoid-function.patch openjdk-6-src-b14-undefined-operation.patch openjdk-6-src-b17-no-efect.patch openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch openjdk-6-src-b20-array-subscript-has-type-char.patch openjdk-6-src-b20-defined-but-not-used.patch openjdk-6-src-b20-gcj-workaround.patch openjdk-6-src-b20-initialized-after.patch openjdk-6-src-b20-may-be-used-uninitialized.patch openjdk-6-src-b20-no-multiline-comments.patch openjdk-6-src-b20-no-werror.patch openjdk-6-src-b20-stringcompare.patch openjdk-6-src-b20-suggest-parentheses.patch openjdk-6-src-b20-unused-variable.patch openjdk-6-src-b24-zero-increase-stack-size.patch openjdk-6-src-b27-26_oct_2012-fedora.tar.gz openjdk-7-src-b147-awt-crasher.patch openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch openjdk-ecj-6-src-b22-no-werror.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ ++++ 1124 lines (skipped) ++++++ check-build.sh ++++++ #!/bin/bash # The JVM needs LOTS of virtual memory when compiling the big stuff: if [ `ulimit -v` -le 2048000 ] ; then echo "build does not work on `hostname`: not enough memory" exit 1 fi exit 0 ++++++ fontconfig.SuSE.properties ++++++ # # Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Sun designates this # particular file as subject to the "Classpath" exception as provided # by Sun in the LICENSE file that accompanied this code. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # version 2 for more details (a copy is included in the LICENSE file that # accompanied this code). # # You should have received a copy of the GNU General Public License version # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, # CA 95054 USA or visit www.sun.com if you need additional information or # have any questions. # # Uses SUSE 10.2 fonts and file paths. version=1 # Component Font Mappings dialog.plain.latin-1=DejaVu Sans dialog.plain.japanese-x0208=Sazanami Gothic dialog.plain.korean=UnDotum dialog.bold.latin-1=DejaVu Sans Bold dialog.bold.japanese-x0208=Sazanami Gothic dialog.bold.korean=UnDotum Bold dialog.italic.latin-1=DejaVu Sans Oblique dialog.italic.japanese-x0208=Sazanami Gothic dialog.italic.korean=UnDotum dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique dialog.bolditalic.japanese-x0208=Sazanami Gothic dialog.bolditalic.korean=UnDotum Bold sansserif.plain.latin-1=DejaVu Sans sansserif.plain.japanese-x0208=Sazanami Gothic sansserif.plain.korean=UnDotum sansserif.bold.latin-1=DejaVu Sans Bold sansserif.bold.japanese-x0208=Sazanami Gothic sansserif.bold.korean=UnDotum Bold sansserif.italic.latin-1=DejaVu Sans Oblique sansserif.italic.japanese-x0208=Sazanami Gothic sansserif.italic.korean=UnDotum sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique sansserif.bolditalic.japanese-x0208=Sazanami Gothic sansserif.bolditalic.korean=UnDotum Bold serif.plain.latin-1=DejaVu Serif serif.plain.japanese-x0208=Sazanami Mincho serif.plain.korean=UnBatang serif.bold.latin-1=DejaVu Serif Bold serif.bold.japanese-x0208=Sazanami Mincho serif.bold.korean=UnBatang Bold serif.italic.latin-1=DejaVu Serif Oblique serif.italic.japanese-x0208=Sazanami Mincho serif.italic.korean=UnBatang serif.bolditalic.latin-1=DejaVu Serif Bold Oblique serif.bolditalic.japanese-x0208=Sazanami Mincho serif.bolditalic.korean=UnBatang Bold monospaced.plain.latin-1=DejaVu Sans Mono monospaced.plain.japanese-x0208=Sazanami Mincho monospaced.plain.korean=UnDotum monospaced.bold.latin-1=DejaVu Sans Mono Bold monospaced.bold.japanese-x0208=Sazanami Mincho monospaced.bold.korean=UnDotum Bold monospaced.italic.latin-1=DejaVu Sans Mono Oblique monospaced.italic.japanese-x0208=Sazanami Mincho monospaced.italic.korean=UnDotum monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique monospaced.bolditalic.japanese-x0208=Sazanami Mincho monospaced.bolditalic.korean=UnDotum Bold dialoginput.plain.latin-1=DejaVu Sans Mono dialoginput.plain.japanese-x0208=Sazanami Gothic dialoginput.plain.korean=UnDotum dialoginput.bold.latin-1=DejaVu Sans Mono Bold dialoginput.bold.japanese-x0208=Sazanami Gothic dialoginput.bold.korean=UnDotum Bold dialoginput.italic.latin-1=DejaVu Sans Mono Oblique dialoginput.italic.japanese-x0208=Sazanami Gothic dialoginput.italic.korean=UnDotum dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique dialoginput.bolditalic.japanese-x0208=Sazanami Gothic dialoginput.bolditalic.korean=UnDotum Bold allfonts.chinese-big5=AR PL Mingti2L Big5 allfonts.chinese-gb18030=AR PL SungtiL GB # Search Sequences sequence.allfonts=latin-1 sequence.allfonts.Big5=chinese-big5,latin-1 sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 sequence.allfonts.EUC-KR=korean,latin-1 sequence.allfonts.GB18030=chinese-gb18030,latin-1 sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean # Font File Names filename.DejaVu_Sans=/usr/share/fonts/truetype/DejaVuSans.ttf filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/DejaVuSans-Bold.ttf filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/DejaVuSans-Oblique.ttf filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/DejaVuSansMono.ttf filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/DejaVuSansMono-Bold.ttf filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSans-BoldOblique.ttf filename.DejaVu_Serif=/usr/share/fonts/truetype/DejaVuSerif.ttf filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/DejaVuSerif-Bold.ttf filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/DejaVuSerif-Italic.ttf filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/DejaVuSerif-BoldItalic.ttf filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami-gothic.ttf filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami-mincho.ttf filename.AR_PL_SungtiL_GB=/usr/share/fonts/truetype/gbsn00lp.ttf filename.AR_PL_Mingti2L_Big5=/usr/share/fonts/truetype/bsmi00lp.ttf filename.UnDotum=/usr/share/fonts/truetype/UnDotum.ttf filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf # AWT X11 font paths awtfontpath.japanese-x0201=/usr/share/fonts/truetype awtfontpath.japanese-x0208=/usr/share/fonts/truetype awtfontpath.japanese-iso10646-1=/usr/share/fonts/truetype awtfontpath.korean=/usr/share/fonts/truetype awtfontpath.latin-1=/usr/share/fonts/truetype ++++++ generate-fedora-zip.sh ++++++ #!/bin/sh # Untar openjdk source tarball. mkdir openjdk tar xzf $1 -C openjdk # PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) # Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x) # PR146/S6713083 # Remove binaries rm -f \ openjdk/jdk/test/sun/management/windows/revokeall.exe \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher rm -f \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so rm -f \ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ # Remove test sources with questionable license headers. rm -f \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \ openjdk/jdk/test/java/util/Locale/LocaleTest.java \ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java # Remove J2DBench sources, some of which have questionable license # headers. rm -rf \ openjdk/jdk/src/share/demo/java2d/J2DBench # Create new tarball with new name. pushd openjdk > /dev/null tar czf ../$(basename $1 .tar.gz)-fedora.tar.gz * popd > /dev/null # Remove old unzipped openjdk dir. rm -rf openjdk ++++++ java-1.6.0-openjdk-accessible-toolkit.patch ++++++ diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java --- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500 +++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500 @@ -871,7 +871,11 @@ return null; } }); - loadAssistiveTechnologies(); + try { + loadAssistiveTechnologies(); + } catch ( AWTError error) { + // ignore silently + } } finally { // Make sure to always re-enable the JIT. java.lang.Compiler.enable(); ++++++ java-1.6.0-openjdk-java-access-bridge-idlj.patch ++++++ --- oldjava-access-bridge-1.23.0/idlgen/Makefile.am 2008-06-03 02:47:29.000000000 -0400 +++ java-access-bridge-1.23.0/idlgen/Makefile.am 2008-07-31 15:13:26.000000000 -0400 @@ -3,7 +3,7 @@ JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES) CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class) JAR=jar -IDLJ_FLAGS=-emitAll $(IDLJ_IDLDIRS) +IDLJ_FLAGS=-J-client -emitAll $(IDLJ_IDLDIRS) BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl) BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl) --- oldjava-access-bridge-1.23.0/idlgen/Makefile.in 2008-06-23 23:34:59.000000000 -0400 +++ java-access-bridge-1.23.0/idlgen/Makefile.in 2008-07-31 15:13:45.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -140,7 +140,7 @@ SUBDIRS = org JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES) CLASSES = $(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class) -IDLJ_FLAGS = -emitAll $(IDLJ_IDLDIRS) +IDLJ_FLAGS = -J-client -emitAll $(IDLJ_IDLDIRS) BONOBO_ACT_IDLFILES = $(wildcard $(BONOBO_ACT_IDLDIR)/*.idl) BONOBO_IDLFILES = $(wildcard $(BONOBO_IDLDIR)/*.idl) AT_SPI_IDLFILES = $(wildcard $(AT_SPI_IDLDIR)/*.idl) @@ -253,8 +253,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -279,8 +279,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -290,13 +290,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique ++++++ java-1.6.0-openjdk-java-access-bridge-security.patch ++++++ Index: openjdk/jdk/src/share/lib/security/java.security =================================================================== --- openjdk/jdk/src/share/lib/security/java.security.orig +++ openjdk/jdk/src/share/lib/security/java.security @@ -131,7 +131,9 @@ package.access=sun.,\ com.sun.xml.internal.,\ com.sun.imageio.,\ com.sun.istack.internal.,\ - com.sun.jmx. + com.sun.jmx.,\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. # # List of comma-separated packages that start with or equal this string @@ -147,7 +149,9 @@ package.definition=sun.,\ com.sun.xml.internal.,\ com.sun.imageio.,\ com.sun.istack.internal.,\ - com.sun.jmx. + com.sun.jmx.,\ + org.GNOME.Accessibility.,\ + org.GNOME.Bonobo. # # Determines whether this properties file can be appended to ++++++ java-1.6.0-openjdk-java-access-bridge-tck.patch ++++++ --- java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java.orig 2008-05-22 11:27:00.000000000 -0400 +++ java-access-bridge-1.22.0/bridge/org/GNOME/Accessibility/JavaBridge.java 2008-05-22 11:28:02.000000000 -0400 @@ -34,6 +34,9 @@ import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleText; import javax.accessibility.AccessibleEditableText; +import java.security.PrivilegedAction; +import java.security.AccessController; + public class JavaBridge { @@ -332,7 +335,11 @@ System.err.println ("Java Accessibility Bridge for GNOME loaded.\n"); // Not sure what kind of arguments should be sent to ORB - String vm_rev = System.getProperty("java.version"); + String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() { + public java.lang.Object run() { + return System.getProperty("java.version"); + } + }); if (vm_rev.compareTo("1.4.0") < 0) { System.err.println("WARNING: Java Accessibility Bridge " + ++++++ java-1.6.0-openjdk-optflags.patch ++++++ --- 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) + IT_FIND_TOOL([MAKE], [make]) IT_FIND_TOOL([GZIP], [gzip]) IT_FIND_TOOL([ANT], [ant]) ++++++ java-1_6_0-openjdk-rpmlintrc ++++++ # This is correct, the devel means a Java compiler addFilter("devel-dependency java-1_6_0-openjdk-devel") # those patches are applied in %build phase after unpacking of openjdk # this is a false positive addFilter("patch-not-applied Patch1") addFilter("patch-not-applied Patch2") addFilter("patch-not-applied Patch3") addFilter("patch-not-applied Patch4") addFilter("patch-not-applied Patch104") addFilter("patch-not-applied Patch105") addFilter("patch-not-applied Patch106") addFilter("patch-not-applied Patch107") addFilter("patch-not-applied Patch108") addFilter("patch-not-applied Patch109") # no need to fix this warning in demo package addFilter("shared-lib-calls-exit .*demo") # those files are intended to be modified addFilter("non-etc-or-var-file-marked-as-conffile .*/security.*") # in most of the cases it does not make any sense # and openjdk spec is big, ugly and full of comments help me # with merging with fc specs ;-) addFilter("macro-in-comment") # This is indented - bnc#530046 addFilter("unstripped-binary-or-object .*libjvm.so") ++++++ java-1_6_0-openjdk-suse-desktop-files.patch ++++++ Index: icedtea6-1.11.1/jconsole.desktop.in =================================================================== --- icedtea6-1.11.1.orig/jconsole.desktop.in +++ icedtea6-1.11.1/jconsole.desktop.in @@ -1,10 +1,11 @@ [Desktop Entry] Name=OpenJDK Monitoring & Management Console +GenericName=OpenJDK Monitoring & Management Console Comment=Monitor and manage OpenJDK applications Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole Icon=java Terminal=false Type=Application StartupWMClass=sun-tools-jconsole-JConsole -Categories=Development;Monitor;Java; +Categories=Development;Profiling; Version=1.0 Index: icedtea6-1.11.1/policytool.desktop.in =================================================================== --- icedtea6-1.11.1.orig/policytool.desktop.in +++ icedtea6-1.11.1/policytool.desktop.in @@ -1,10 +1,11 @@ [Desktop Entry] Name=OpenJDK Policy Tool +GenericName=OpenJDK Policy Tool Comment=Manage OpenJDK policy files Exec=@ABS_JAVA_HOME_DIR@/bin/policytool Icon=java Terminal=false Type=Application StartupWMClass=sun-security-tools-PolicyTool -Categories=Development;Java; +Categories=Utility;Security; Version=1.0 ++++++ mauve_tests ++++++ ++++ 2571 lines (skipped) ++++++ openjdk-6-src-b09-gcc4-warningfixes.patch ++++++ --- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05 +++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05 @@ -566,23 +566,23 @@ if (!JNU_IsNull(env, fontDescriptorName)) { nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL); } else { nativename = ""; } fdata->flist[i].xlfd = malloc(strlen(nativename) + strlen(defaultXLFD)); jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10, nativename, size * 10); - if (nativename != NULL && nativename != "") + if (*nativename) JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); /* * set charset_name */ charsetName = (*env)->GetObjectField(env, fontDescriptor, fontDescriptorIDs.charsetName); fdata->flist[i].charset_name = (char *) --- openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:38:55 1.1 +++ openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:40:14 @@ -221,6 +221,7 @@ * implies an error in the exec. */ free(nargv); errorExit(errno, BAD_EXEC_MSG); + return 0; // make gcc happy } ++++++ openjdk-6-src-b14-no-return-in-nonvoid-function-ix86.patch ++++++ --- ./openjdk/hotspot/src/cpu/x86/vm/x86_32.ad 2008-11-22 00:11:18.000000000 +0000 +++ ./openjdk/hotspot/src/cpu/x86/vm/x86_32.ad.new 2009-01-19 10:06:47.376623479 +0000 @@ -1061,6 +1061,7 @@ Unimplemented(); + return NULL; } #ifndef PRODUCT ++++++ openjdk-6-src-b14-no-return-in-nonvoid-function.patch ++++++ --- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-01-14 09:26:13.088856122 +0000 +++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-01-14 09:46:41.132855902 +0000 @@ -142,6 +142,7 @@ #endif /* MITSHM */ #endif /* !HEADLESS */ + return JNI_TRUE; } @@ -464,6 +465,7 @@ return JNI_TRUE; #endif /* !HEADLESS */ + return JNI_TRUE; } --- ./openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2008-11-22 00:11:18.000000000 +0000 +++ ./openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.new 2009-01-14 10:59:57.400855524 +0000 @@ -493,6 +493,7 @@ err.report_and_die(); ShouldNotReachHere(); + return 0; } void os::Linux::init_thread_fpu_state(void) { --- ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp 2008-11-22 00:11:18.000000000 +0000 +++ ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp.new 2009-01-14 11:00:56.052855681 +0000 @@ -594,6 +594,7 @@ err.report_and_die(); ShouldNotReachHere(); + return 0; } void os::Linux::init_thread_fpu_state(void) { --- ./openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2009-01-13 08:46:35.000000000 +0000 +++ ./openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.new 2009-01-14 11:02:21.805690939 +0000 @@ -221,6 +221,7 @@ sprintf(buf, fmt, sig); fatal(buf); + return 0; } void os::Linux::init_thread_fpu_state(void) --- ./contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp 2009-01-13 08:46:27.000000000 +0000 +++ ./contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp.new 2009-01-14 11:02:40.288925505 +0000 @@ -154,6 +154,7 @@ sprintf(buf, fmt, sig); fatal(buf); + return 0; } void os::Linux::init_thread_fpu_state(void) ++++++ openjdk-6-src-b14-undefined-operation.patch ++++++ --- ./openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp 2008-11-22 00:11:18.000000000 +0000 +++ ./openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp.new 2009-01-19 07:38:31.832949048 +0000 @@ -1937,7 +1937,7 @@ off.load_item(); src.load_item(); - LIR_Opr reg = reg = rlock_result(x, x->basic_type()); + LIR_Opr reg = rlock_result(x, x->basic_type()); if (x->is_volatile() && os::is_MP()) __ membar_acquire(); get_Object_unsafe(reg, src.result(), off.result(), type, x->is_volatile()); ++++++ 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-return-in-nonvoid-function-ppc.patch ++++++ unchanged: Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp @@ -935,6 +935,7 @@ void BytecodeInterpreter::layout_interpr address CppInterpreter::return_entry(TosState state, int length) { ShouldNotCallThis(); + return NULL; // make gcc happy } address CppInterpreter::deopt_entry(TosState state, int length) { @@ -955,6 +956,7 @@ bool CppInterpreter::contains(address pc #else return false; // make frame::print_value_on work #endif // !PRODUCT + return false; //make gcc happy } // Result handlers and convertors Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp @@ -88,6 +88,7 @@ void frame::patch_pc(Thread* thread, add bool frame::safe_for_sender(JavaThread *thread) { ShouldNotCallThis(); + return false; // make gcc happy } void frame::pd_gc_epilog() { @@ -95,6 +96,7 @@ void frame::pd_gc_epilog() { bool frame::is_interpreted_frame_valid(JavaThread *thread) const { ShouldNotCallThis(); + return false; // make gcc happy } BasicType frame::interpreter_frame_result(oop* oop_result, @@ -159,6 +161,7 @@ int frame::frame_size() const { #else return 0; // make javaVFrame::print_value work #endif // PRODUCT + return 0; // make gcc happy } intptr_t* frame::interpreter_frame_tos_at(jint offset) const { Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp @@ -71,6 +71,7 @@ inline intptr_t* frame::sender_sp() cons inline intptr_t* frame::link() const { ShouldNotCallThis(); + return NULL; // make gcc happy } #ifdef CC_INTERP @@ -133,14 +134,17 @@ inline void frame::set_saved_oop_result( inline oop frame::saved_oop_result(RegisterMap* map) const { ShouldNotCallThis(); + return NULL; // make gcc happy } inline bool frame::is_older(intptr_t* id) const { ShouldNotCallThis(); + return false; // make gcc happy } inline intptr_t* frame::entry_frame_argument_at(int offset) const { ShouldNotCallThis(); + return NULL; // make gcc happy } inline intptr_t* frame::unextended_sp() const { Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp @@ -41,9 +41,11 @@ void InlineCacheBuffer::assemble_ic_buff address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) { // NB ic_stub_code_size() must return the size of the code we generate ShouldNotCallThis(); + return NULL; // make gcc happy } oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) { // NB ic_stub_code_size() must return the size of the code we generate ShouldNotCallThis(); + return NULL; // make gcc happy } Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp @@ -37,10 +37,12 @@ address InterpreterGenerator::generate_m return NULL; Unimplemented(); + return NULL; } address InterpreterGenerator::generate_abstract_entry() { return ShouldNotCallThisEntry(); + return NULL; } int AbstractInterpreter::size_activation(methodOop method, Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp @@ -42,15 +42,18 @@ class NativeInstruction VALUE_OBJ_CLASS_ public: bool is_jump() { ShouldNotCallThis(); + return false; // make gcc happy } bool is_safepoint_poll() { ShouldNotCallThis(); + return false; // make gcc happy } }; inline NativeInstruction* nativeInstruction_at(address address) { ShouldNotCallThis(); + return NULL; // make gcc happy } class NativeCall : public NativeInstruction { @@ -61,18 +64,22 @@ class NativeCall : public NativeInstruct address instruction_address() const { ShouldNotCallThis(); + return NULL; // make gcc happy } address next_instruction_address() const { ShouldNotCallThis(); + return NULL; // make gcc happy } address return_address() const { ShouldNotCallThis(); + return NULL; // make gcc happy } address destination() const { ShouldNotCallThis(); + return NULL; // make gcc happy } void set_destination_mt_safe(address dest) { @@ -89,25 +96,30 @@ class NativeCall : public NativeInstruct static bool is_call_before(address return_address) { ShouldNotCallThis(); + return false; // make gcc happy } }; inline NativeCall* nativeCall_before(address return_address) { ShouldNotCallThis(); + return NULL; // make gcc happy } inline NativeCall* nativeCall_at(address address) { ShouldNotCallThis(); + return NULL; // make gcc happy } class NativeMovConstReg : public NativeInstruction { public: address next_instruction_address() const { ShouldNotCallThis(); + return NULL; // make gcc happy } intptr_t data() const { ShouldNotCallThis(); + return NULL; // make gcc happy } void set_data(intptr_t x) { @@ -117,12 +129,14 @@ class NativeMovConstReg : public NativeI inline NativeMovConstReg* nativeMovConstReg_at(address address) { ShouldNotCallThis(); + return NULL; // make gcc happy } class NativeMovRegMem : public NativeInstruction { public: int offset() const { ShouldNotCallThis(); + return 0; // make gcc happy } void set_offset(intptr_t x) { @@ -136,6 +150,7 @@ class NativeMovRegMem : public NativeIns inline NativeMovRegMem* nativeMovRegMem_at(address address) { ShouldNotCallThis(); + return NULL; // make gcc happy } class NativeJump : public NativeInstruction { @@ -146,6 +161,7 @@ class NativeJump : public NativeInstruct address jump_destination() const { ShouldNotCallThis(); + return NULL; // make gcc happy } void set_jump_destination(address dest) { @@ -163,12 +179,14 @@ class NativeJump : public NativeInstruct inline NativeJump* nativeJump_at(address address) { ShouldNotCallThis(); + return NULL; // make gcc happy } class NativeGeneralJump : public NativeInstruction { public: address jump_destination() const { ShouldNotCallThis(); + return NULL; // make gcc happy } static void insert_unconditional(address code_pos, address entry) { @@ -182,4 +200,5 @@ class NativeGeneralJump : public NativeI inline NativeGeneralJump* nativeGeneralJump_at(address address) { ShouldNotCallThis(); + return NULL; // make gcc happy } Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp @@ -32,8 +32,10 @@ const int ConcreteRegisterImpl::max_fpr const char* RegisterImpl::name() const { ShouldNotCallThis(); + return ""; // make gcc happy } const char* FloatRegisterImpl::name() const { ShouldNotCallThis(); + return ""; // make gcc happy } Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp @@ -32,6 +32,7 @@ void Relocation::pd_set_data_value(addre address Relocation::pd_call_destination(address orig_addr) { ShouldNotCallThis(); + return NULL; // make gcc happy } void Relocation::pd_set_call_destination(address x) { @@ -40,6 +41,7 @@ void Relocation::pd_set_call_destination address Relocation::pd_get_address_from_code() { ShouldNotCallThis(); + return NULL; // make gcc happy } address* Relocation::pd_address_in_code() { @@ -49,6 +51,7 @@ address* Relocation::pd_address_in_code( int Relocation::pd_breakpoint_size() { ShouldNotCallThis(); + return 0; // make gcc happy } void Relocation::pd_swap_in_breakpoint(address x, Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp @@ -69,6 +69,7 @@ nmethod *SharedRuntime::generate_native_ #else ShouldNotCallThis(); #endif // SHARK + return NULL; // make gcc happy } int Deoptimization::last_frame_adjust(int callee_parameters, @@ -78,6 +79,7 @@ int Deoptimization::last_frame_adjust(in uint SharedRuntime::out_preserve_stack_slots() { ShouldNotCallThis(); + return 0; // make gcc happy } static RuntimeStub* generate_empty_runtime_stub(const char* name) { @@ -112,4 +114,5 @@ int SharedRuntime::c_calling_convention( VMRegPair *regs, int total_args_passed) { ShouldNotCallThis(); + return 0; // make gcc happy } Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp @@ -28,16 +28,20 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) { ShouldNotCallThis(); + return NULL; // make gcc happy } VtableStub* VtableStubs::create_itable_stub(int vtable_index) { ShouldNotCallThis(); + return NULL; // make gcc happy } int VtableStub::pd_code_size_limit(bool is_vtable_stub) { ShouldNotCallThis(); + return 0; // make gcc happy } int VtableStub::pd_code_alignment() { ShouldNotCallThis(); + return 0; // make gcc happy } Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -33,6 +33,7 @@ address os::current_stack_pointer() { frame os::get_sender_for_C_frame(frame* fr) { ShouldNotCallThis(); + return *fr; // make gcc happy } frame os::current_frame() { @@ -62,6 +63,7 @@ char* os::non_memory_address_word() { // This is the value for x86; works pretty well for PPC too. return (char *) -1; #endif // SPARC + return (char *) -1; // make gcc happy } void os::initialize_thread() { @@ -70,16 +72,19 @@ void os::initialize_thread() { address os::Linux::ucontext_get_pc(ucontext_t* uc) { ShouldNotCallThis(); + return NULL; // make gcc happy } ExtendedPC os::fetch_frame_from_context(void* ucVoid, intptr_t** ret_sp, intptr_t** ret_fp) { ShouldNotCallThis(); + return NULL; // make gcc happy } frame os::fetch_frame_from_context(void* ucVoid) { ShouldNotCallThis(); + return *(frame*)ucVoid; // make gcc happy } #ifdef HOTSPOT_ASM @@ -242,6 +248,7 @@ void os::Linux::init_thread_fpu_state(vo int os::Linux::get_fpu_control_word() { ShouldNotCallThis(); + return 0; // make gcc happy } void os::Linux::set_fpu_control_word(int fpu) { @@ -264,6 +271,7 @@ bool os::is_allocatable(size_t bytes) { return addr != NULL; #endif // _LP64 + return false; // make gcc happy } /////////////////////////////////////////////////////////////////////////////// @@ -386,6 +394,7 @@ void os::print_context(outputStream* st, extern "C" { int SpinPause() { + return 0; // make gcc happy } int SafeFetch32(int *adr, int errValue) { @@ -475,6 +484,7 @@ extern "C" { long long unsigned int oldval, long long unsigned int newval) { ShouldNotCallThis(); + return 0; // make gcc happy } }; #endif // !_LP64 Index: icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp +++ icedtea6-1.8.1/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp @@ -95,6 +95,7 @@ void* ucontext, bool isInJava) { ShouldNotCallThis(); + return false; } // These routines are only used on cpu architectures that --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:21:54 1.1 +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:22:02 @@ -28,6 +28,7 @@ int MethodHandles::adapter_conversion_ops_supported_mask() { ShouldNotCallThis(); + return 0; } void MethodHandles::generate_method_handle_stub(MacroAssembler* masm, --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:57:44 1.1 +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:58:51 @@ -57,6 +57,7 @@ RegisterOrConstant MacroAssembler::delayed_value_impl( intptr_t* delayed_value_addr, Register tmpl, int offset) { ShouldNotCallThis(); + return RegisterOrConstant(tmpl); } void MacroAssembler::store_oop(jobject obj) { --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:21 1.1 +++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:38 @@ -34,5 +34,6 @@ Register tmp, int offset) { ShouldNotCallThis(); + return RegisterOrConstant(tmp); } }; ++++++ openjdk-6-src-b20-array-subscript-has-type-char.patch ++++++ Index: icedtea6-1.10/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; - while( ((c = s[k]) != '\0') && (k < MAXID-1) ) { // Get characters till nul + 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 } //------------------------------hashptr-------------------------------------- ++++++ openjdk-6-src-b20-defined-but-not-used.patch ++++++ Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp @@ -42,32 +42,6 @@ char *toUpper(const char *str) { return result; } -// Utilities to characterize effect statements -static bool is_def(int usedef) { - switch(usedef) { - case Component::DEF: - case Component::USE_DEF: return true; break; - } - return false; -} - -static bool is_use(int usedef) { - switch(usedef) { - case Component::USE: - case Component::USE_DEF: - case Component::USE_KILL: return true; break; - } - return false; -} - -static bool is_kill(int usedef) { - switch(usedef) { - case Component::KILL: - case Component::USE_KILL: return true; break; - } - return false; -} - //---------------------------ChainList Methods------------------------------- ChainList::ChainList() { } Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dfa.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp @@ -29,10 +29,6 @@ static bool debug_output = false; static bool debug_output1 = false; // top level chain rules -//---------------------------Access to internals of class State---------------- -static const char *sLeft = "_kids[0]"; -static const char *sRight = "_kids[1]"; - //---------------------------DFA productions----------------------------------- static const char *dfa_production = "DFA_PRODUCTION"; static const char *dfa_production_set_valid = "DFA_PRODUCTION__SET_VALID"; ++++++ openjdk-6-src-b20-gcj-workaround.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java +++ icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java @@ -1,28 +1,3 @@ -/* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - package com.sun.source.tree; /** ++++++ openjdk-6-src-b20-initialized-after.patch ++++++ Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp =================================================================== --- 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), - _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), _max_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.10/openjdk/hotspot/src/share/vm/code/dependencies.hpp =================================================================== --- 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) - : _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.10/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp =================================================================== --- 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) : - _dcto_cl(dcto_cl), _g1(g1), _oc(oc) + _g1(g1), _oc(oc), _dcto_cl(dcto_cl) {} template <class T> void do_oop_nv(T* p); virtual void do_oop(oop* p) { do_oop_nv(p); } @@ -187,7 +187,7 @@ public: FilterAndMarkInHeapRegionAndIntoCSClosure(G1CollectedHeap* g1, OopsInHeapRegionClosure* oc, ConcurrentMark* cm) - : _g1(g1), _oc(oc), _cm(cm) { } + : _g1(g1), _cm(cm), _oc(oc) { } template <class T> void do_oop_nv(T* p); virtual void do_oop(oop* p) { do_oop_nv(p); } Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp =================================================================== --- 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) - : _hash(hash), _symbol(symbol), _value(value), _next(NULL) {} + : _hash(hash), _next(NULL), _symbol(symbol), _value(value) {} }; // End SymbolHashMapEntry class Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/memory/generation.hpp =================================================================== --- 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), - _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.10/openjdk/hotspot/src/share/vm/memory/watermark.hpp =================================================================== --- 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 - 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.10/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp =================================================================== --- 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() : - _min_alignment(1), - _max_alignment(1), _initial_heap_byte_size(0), _max_heap_byte_size(0), _min_heap_byte_size(0), + _min_alignment(1), + _max_alignment(1), _size_policy(NULL), _should_clear_all_soft_refs(false), _all_soft_refs_clear(false) Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp =================================================================== --- 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. - 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.10/openjdk/hotspot/src/share/vm/memory/space.hpp =================================================================== --- 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) : - _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.10/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp =================================================================== --- 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: - 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.10/openjdk/hotspot/src/share/vm/opto/callnode.hpp =================================================================== --- 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 ), - _jvms(jvms), _oop_map(NULL), + _jvms(jvms), _adr_type(adr_type) { init_class_id(Class_SafePoint); @@ -858,8 +858,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.10/openjdk/hotspot/src/share/vm/opto/type.hpp =================================================================== --- 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: - 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.10/openjdk/hotspot/src/share/vm/opto/machnode.hpp =================================================================== --- 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; - 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.10/openjdk/hotspot/src/share/vm/opto/runtime.hpp =================================================================== --- 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), - _next(NULL), - _tag(tag) {} + _tag(tag), + _next(NULL) { } const char * name() const { return _name; } int count() const { return _count; } Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/opto/block.hpp =================================================================== --- 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 - 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++ ) { @@ -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), - _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(); } @@ -638,11 +638,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.10/openjdk/hotspot/src/share/vm/opto/loopnode.hpp =================================================================== --- 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), + _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.10/openjdk/hotspot/src/share/vm/opto/subnode.hpp =================================================================== --- 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; - 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.10/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp =================================================================== --- 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: - ImplicitExceptionTable( ) : _data(0), _size(0), _len(0) { } + ImplicitExceptionTable( ) : _size(0), _len(0), _data(0) { } // (run-time) construction from nmethod ImplicitExceptionTable( const nmethod *nm ); Index: icedtea6-1.10/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() : _globalNames(cmpstr,hashstr, Form::arena), - _globalDefs(cmpstr,hashstr, Form::arena), - _preproc_table(cmpstr,hashstr, Form::arena), _idealIndex(cmpstr,hashstr, Form::arena), + _globalDefs(cmpstr,hashstr, Form::arena), + _cisc_spill_operand(NULL), + _chainRules(cmpstr,hashstr, Form::arena), _internalOps(cmpstr,hashstr, Form::arena), _internalMatch(cmpstr,hashstr, Form::arena), - _chainRules(cmpstr,hashstr, Form::arena), - _cisc_spill_operand(NULL) { + _preproc_table(cmpstr,hashstr, Form::arena) { // Initialize the opcode to MatchList table with NULLs for( int i=0; i<_last_opcode; ++i ) { Index: icedtea6-1.10/openjdk/hotspot/src/share/vm/adlc/forms.hpp =================================================================== --- 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) - : _next(NULL), _linenum(line), _ftype(formType) { }; + : _ftype(formType), _next(NULL), _linenum(line) { }; ~Form() {}; virtual bool ideal_only() const { Index: icedtea6-1.10/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 ADLParser::ADLParser(FileBuff& buffer, ArchDesc& archDesc) - : _buf(buffer), _AD(archDesc), - _globalNames(archDesc.globalNames()) { + : _globalNames(archDesc.globalNames()), + _buf(buffer), _AD(archDesc) { _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.10/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() { } Arena::Arena( Arena *a ) -: _chunk(a->_chunk), _hwm(a->_hwm), _max(a->_max), _first(a->_first) { +: _first(a->_first), _chunk(a->_chunk), _hwm(a->_hwm), _max(a->_max) { set_size_in_bytes(a->size_in_bytes()); } Index: icedtea6-1.10/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 // doubling in size costs no more than a constant factor in speed. -Dict::Dict(CmpKey initcmp, Hash inithash) : _hash(inithash), _cmp(initcmp), _arena(NULL) { +Dict::Dict(CmpKey initcmp, Hash inithash) : _arena(NULL), _hash(inithash), _cmp(initcmp) { init(); } -Dict::Dict(CmpKey initcmp, Hash inithash, Arena *arena) : _hash(inithash), _cmp(initcmp), _arena(arena) { +Dict::Dict(CmpKey initcmp, Hash inithash, Arena *arena) : _arena(arena), _hash(inithash), _cmp(initcmp) { init(); } Index: icedtea6-1.10/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--------------------------------------- // Create a new parsing buffer -FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) { +FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _AD(archDesc), _fp(fptr) { _err = fseek(_fp->_fp, 0, SEEK_END); // Seek to end of file if (_err) { file_error(SEMERR, 0, "File seek error reading input file"); @@ -93,7 +93,7 @@ char *FileBuff::get_line(void) { // Create a new region in a FileBuff. FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln, int off, int len) -: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) { +: _bfr(bufr), _offset(off), _length(len), _sol(soln), _line(ln) { _next = NULL; // No chained regions } Index: icedtea6-1.10/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), _idealtype(idealtype), - _register_encode(encode), _concrete(concrete), + _register_encode(encode), _register_num(0) { // Chunk and register mask are determined by the register number @@ -219,7 +219,7 @@ void RegDef::output(FILE *fp) { //------------------------------RegClass--------------------------------------- // Construct a register class into which registers will be inserted -RegClass::RegClass(const char *classid) : _stack_or_reg(false), _classid(classid), _regDef(cmpstr,hashstr, Form::arena) { +RegClass::RegClass(const char *classid) : _classid(classid), _regDef(cmpstr,hashstr, Form::arena), _stack_or_reg(false) { } // record a register in this class @@ -358,12 +358,12 @@ void FrameForm::output(FILE *fp) { PipelineForm::PipelineForm() : _reslist () , _resdict (cmpstr, hashstr, Form::arena) - , _classdict (cmpstr, hashstr, Form::arena) , _rescount (0) , _maxcycleused (0) , _stages () , _stagecnt (0) , _classlist () + , _classdict (cmpstr, hashstr, Form::arena) , _classcnt (0) , _noplist () , _nopcnt (0) @@ -581,7 +581,7 @@ void Peephole::output(FILE *fp) { } //------------------------------PeepMatch-------------------------------------- -PeepMatch::PeepMatch(char *rule) : _max_position(0), _rule(rule) { +PeepMatch::PeepMatch(char *rule) : _rule(rule), _max_position(0) { } PeepMatch::~PeepMatch() { } @@ -639,8 +639,8 @@ void PeepMatch::output(FILE *fp) { //------------------------------PeepConstraint--------------------------------- PeepConstraint::PeepConstraint(int left_inst, char* left_op, char* relation, int right_inst, char* right_op) - : _left_inst(left_inst), _left_op(left_op), _relation(relation), - _right_inst(right_inst), _right_op(right_op), _next(NULL) {} + : _next(NULL), _left_inst(left_inst), _left_op(left_op), _relation(relation), + _right_inst(right_inst), _right_op(right_op) {} PeepConstraint::~PeepConstraint() { } ++++++ openjdk-6-src-b20-may-be-used-uninitialized.patch ++++++ 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 +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp @@ -3196,12 +3196,12 @@ Interface *ADLParser::mem_interface_pars //------------------------------cond_interface_parse--------------------------- Interface *ADLParser::cond_interface_parse(void) { - char *equal; - char *not_equal; - char *less; - char *greater_equal; - char *less_equal; - char *greater; + char *equal = NULL; + char *not_equal = NULL; + char *less = NULL; + char *greater_equal = NULL; + char *less_equal = NULL; + char *greater = NULL; const char *equal_format = "eq"; const char *not_equal_format = "ne"; const char *less_format = "lt"; ++++++ openjdk-6-src-b20-no-multiline-comments.patch ++++++ Index: icedtea6-1.9.1/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp =================================================================== --- icedtea6-1.9.1.orig/contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp +++ icedtea6-1.9.1/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.9.1/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/cpu/x86/vm/frame_x86.hpp +++ icedtea6-1.9.1/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.9.1/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp +++ icedtea6-1.9.1/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.9.1/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp @@ -2196,6 +2196,7 @@ bool ciTypeFlow::clone_loop_heads(Loop* return rslt; } +/* // ------------------------------------------------------------------ // ciTypeFlow::clone_loop_head // @@ -2222,6 +2223,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.9.1/openjdk/hotspot/src/share/vm/code/compiledIC.hpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/compiledIC.hpp +++ icedtea6-1.9.1/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.9.1/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp +++ icedtea6-1.9.1/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.9.1/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/klassVtable.hpp @@ -227,6 +227,7 @@ class itableMethodEntry VALUE_OBJ_CLASS_ friend class klassItable; }; +/* // // Format of an itable // @@ -245,6 +246,7 @@ class itableMethodEntry VALUE_OBJ_CLASS_ // -- vtable for interface 2 --- // ... // +*/ class klassItable : public ResourceObj { private: instanceKlassHandle _klass; // my klass Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/callnode.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.cpp @@ -1210,6 +1210,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 @@ -1331,6 +1332,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.9.1/openjdk/hotspot/src/share/vm/opto/graphKit.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/graphKit.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/graphKit.cpp @@ -1987,6 +1987,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 @@ -2021,6 +2022,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.9.1/openjdk/hotspot/src/share/vm/opto/idealKit.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/idealKit.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/idealKit.cpp @@ -52,11 +52,13 @@ IdealKit::IdealKit(PhaseGVN &gvn, Node* } } +/* //-------------------------------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.9.1/openjdk/hotspot/src/share/vm/opto/loopopts.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/loopopts.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopopts.cpp @@ -1586,6 +1586,7 @@ Node* PhaseIdealLoop::short_circuit_if(I return con; } +/* //------------------------------ insert_if_before_proj ------------------------------------- // Insert a new if before an if projection (* - new node) // @@ -1608,6 +1609,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.9.1/openjdk/hotspot/src/share/vm/opto/output.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/output.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/output.cpp @@ -2683,6 +2683,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 @@ -2707,6 +2708,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.9.1/openjdk/hotspot/src/share/vm/prims/unsafe.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/prims/unsafe.cpp +++ icedtea6-1.9.1/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 Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dfa.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dfa.cpp @@ -383,14 +383,14 @@ void ArchDesc::buildDFA(FILE* fp) { _attributes.output(fp); fprintf(fp, "\n"); fprintf(fp, "//------------------------- Macros -----------------------------------------\n"); - // #define DFA_PRODUCTION(result, rule, cost)\ - // _cost[ (result) ] = cost; _rule[ (result) ] = rule; +/* // #define DFA_PRODUCTION(result, rule, cost)\ + // _cost[ (result) ] = cost; _rule[ (result) ] = rule; */ fprintf(fp, "#define %s(result, rule, cost)\\\n", dfa_production); fprintf(fp, " _cost[ (result) ] = cost; _rule[ (result) ] = rule;\n"); fprintf(fp, "\n"); - // #define DFA_PRODUCTION__SET_VALID(result, rule, cost)\ - // DFA_PRODUCTION( (result), (rule), (cost) ); STATE__SET_VALID( (result) ); +/* // #define DFA_PRODUCTION__SET_VALID(result, rule, cost)\ + // DFA_PRODUCTION( (result), (rule), (cost) ); STATE__SET_VALID( (result) );*/ fprintf(fp, "#define %s(result, rule, cost)\\\n", dfa_production_set_valid); fprintf(fp, " %s( (result), (rule), (cost) ); STATE__SET_VALID( (result) );\n", dfa_production); fprintf(fp, "\n"); ++++++ openjdk-6-src-b20-no-werror.patch ++++++ Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make =================================================================== --- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/gcc.make +++ icedtea6-1.9.7/openjdk/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 @@ -130,7 +130,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/$@)) Index: icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk =================================================================== --- icedtea6-1.9.7.orig/openjdk/jdk/make/common/Defs-linux.gmk +++ icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk @@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed # -ifeq ($(COMPILER_WARNINGS_FATAL),true) - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) +# GCC_WARNINGS += -Wall +#endif # # Misc compiler options Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make =================================================================== --- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/adlc.make +++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make @@ -62,7 +62,8 @@ CPPFLAGS += -DASSERT # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors -CFLAGS_WARN = -Werror +# XXX: Who could fix all those stupid errors on gcc 4.5? +#CFLAGS_WARN = -Wall CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ Index: icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk =================================================================== --- icedtea6-1.9.7.orig/openjdk/corba/make/common/Defs-linux.gmk +++ icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk @@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed # -ifeq ($(COMPILER_WARNINGS_FATAL),true) - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) +# GCC_WARNINGS += -Wall +#endif # # Misc compiler options Index: icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make =================================================================== --- icedtea6-1.9.7.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make +++ icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make @@ -111,10 +111,10 @@ 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) +CFLAGS_WARN/DEFAULT = $(ADDITIONAL_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) ++++++ openjdk-6-src-b20-stringcompare.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c @@ -574,7 +574,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10, nativename, size * 10); - if (nativename != NULL && nativename != "") + if (nativename != NULL && strcmp(nativename, "")) JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); /* ++++++ openjdk-6-src-b20-suggest-parentheses.patch ++++++ 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 +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp @@ -4278,8 +4278,8 @@ int ADLParser::get_int(void) { skipws(); // Skip whitespace before identifier start = end = _ptr; // Start points at first character c = *end; // Grab character to test - while ((c >= '0') && (c <= '9') - || ((c == '-') && (end == start))) { + while (((c >= '0') && (c <= '9')) + || (((c == '-') && (end == start)))) { end++; // Increment end pointer c = *end; // Grab character to test } ++++++ openjdk-6-src-b20-unused-variable.patch ++++++ Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp @@ -126,6 +126,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.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp @@ -70,6 +70,7 @@ class AllocationStats VALUE_OBJ_CLASS_SP _splitBirths = split_birth? 1 : 0; _splitDeaths = 0; _returnedBytes = 0; + dummy = dummy; //suppress compiler warning } AllocationStats() { Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp @@ -375,6 +375,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.9.1/openjdk/hotspot/src/share/vm/opto/regalloc.hpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/regalloc.hpp +++ icedtea6-1.9.1/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]; 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 +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp @@ -807,7 +807,6 @@ void ADLParser::reg_parse(void) { //------------------------------encode_parse----------------------------------- void ADLParser::encode_parse(void) { EncodeForm *encBlock; // Information about instruction/operand encoding - char *desc = NULL; // String representation of encode rule _AD.getForm(&encBlock); if ( encBlock == NULL) { @@ -2094,7 +2093,6 @@ void ADLParser::pipe_class_parse(Pipelin //------------------------------peep_parse------------------------------------- void ADLParser::peep_parse(void) { Peephole *peep; // Pointer to current peephole rule form - char *desc = NULL; // String representation of rule skipws(); // Skip leading whitespace @@ -2658,10 +2656,7 @@ void ADLParser::peep_constraint_parse(Pe // void ADLParser::peep_replace_parse(Peephole &peep) { int lparen = 0; // keep track of parenthesis nesting depth - int rparen = 0; // keep track of parenthesis nesting depth - int icount = 0; // count of instructions in rule for naming char *str = NULL; - char *token = NULL; skipws(); // Check for open paren @@ -2753,7 +2748,6 @@ Predicate *ADLParser::pred_parse(void) { char *rule = NULL; // String representation of predicate skipws(); // Skip leading whitespace - int line = linenum(); if ( (rule = get_paren_expr("pred expression", true)) == NULL ) { parse_err(SYNERR, "incorrect or missing expression for 'predicate'\n"); return NULL; @@ -3016,7 +3010,6 @@ Opcode * ADLParser::opcode_parse(Instruc char *secondary = NULL; char *tertiary = NULL; - char *val = NULL; Opcode *opcode = NULL; // Get value of the instruction's opcode @@ -3086,7 +3079,6 @@ Opcode * ADLParser::opcode_parse(Instruc //------------------------------interface_parse-------------------------------- Interface *ADLParser::interface_parse(void) { char *iface_name = NULL; // Name of interface class being used - char *iface_code = NULL; // Describe components of this class // Get interface class name skipws(); // Skip whitespace @@ -4646,7 +4638,6 @@ bool ADLParser::handle_preproc_token() { // line count. // Maybe handle certain preprocessor constructs: #ifdef, #ifndef, #else, #endif void ADLParser::skipws_common(bool do_preproc) { - char *start = _ptr; char *next = _ptr + 1; if (*_ptr == '\0') { Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp @@ -294,7 +294,6 @@ void ArchDesc::inspectOperands() { // Find result type for match. const char *result = op->reduce_result(); - bool has_root = false; // Construct a MatchList for this entry buildMatchList(op->_matrule, result, rootOp, pred, cost); @@ -394,7 +393,7 @@ const char *ArchDesc::reduceRight(char //------------------------------check_optype----------------------------------- void ArchDesc::check_optype(MatchRule *mrule) { - MatchRule *rule = mrule; + // MatchRule *rule = mrule; // !!!!! // // Cycle through the list of match rules Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp =================================================================== --- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp +++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp @@ -249,8 +249,6 @@ void FileBuffRegion::print( ostream& os if( !len ) return; // All done; exit // Here we require at least 2 lines - int off1 = _length - len + skip; // Length of line 1 - int off2 = off1 + _sol; // Offset to start of line 2 char *s2 = _bfr->get_line(); // Start of line 2 char *s3 = strchr( s2, '\n' )+1; // Start of line 3 (unread) if( len <= (s3-s2) ) { // It all fits on the next line @@ -259,7 +257,6 @@ void FileBuffRegion::print( ostream& os } // Here we require at least 3 lines - int off3 = off2 + (int)(s3-s2); // Offset to start of line 3 s3 = _bfr->get_line(); // Start of line 3 (read) const char *s4 = strchr( s3, '\n' )+1;// Start of line 4 (unread) if( len < (s4-s3) ) { // It all fits on the next 2 lines ++++++ openjdk-6-src-b24-zero-increase-stack-size.patch ++++++ --- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400 +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400 @@ -32,11 +32,11 @@ // define_pd_global(bool, DontYieldALot, false); -define_pd_global(intx, ThreadStackSize, 1536); +define_pd_global(intx, ThreadStackSize, 1664); #ifdef _LP64 -define_pd_global(intx, VMThreadStackSize, 1024); +define_pd_global(intx, VMThreadStackSize, 1664); #else -define_pd_global(intx, VMThreadStackSize, 512); +define_pd_global(intx, VMThreadStackSize, 1152); #endif // _LP64 define_pd_global(intx, SurvivorRatio, 8); define_pd_global(intx, CompilerThreadStackSize, 0); --- openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400 +++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400 @@ -83,9 +83,9 @@ # 64-bit builds require a larger thread stack size. ifeq ($(ARCH_DATA_MODEL), 32) - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152 else - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 endif JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) diff -up openjdk/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk --- openjdk/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100 +++ openjdk/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100 @@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS = # 64-bit builds require a larger thread stack size. ifeq ($(ARCH_DATA_MODEL), 32) - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152 else - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 endif JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) ++++++ openjdk-7-src-b147-awt-crasher.patch ++++++

From http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-December/021050.h... # HG changeset patch # User aph # Date 1354629728 0 # Node ID ea20c9388d90fd9fda085c59ceae25ea9d686ec6 # Parent 4aad3e6f68d2463f4fee63c93153394be6489c00 8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c Summary: Code does not check for JNU_GetEnv returning NULL. Reviewed-by: anthony

diff -r 4aad3e6f68d2 -r ea20c9388d90 openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c --- a/openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Tue Dec 04 17:17:45 2012 +0400 +++ b/openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Tue Dec 04 14:02:08 2012 +0000 @@ -1260,13 +1260,15 @@ JavaVM* jvm = NULL; static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) { + JNIEnv * env; if (jvm != NULL) { - JNIEnv * env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); - return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", - ptr_to_jlong(dpy), ptr_to_jlong(event)).i; - } else { - return 0; + env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); + if (env) { + return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", + ptr_to_jlong(dpy), ptr_to_jlong(event)).i; + } } + return 0; } /* ++++++ openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/bin/jexec.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c @@ -221,6 +221,9 @@ int main(int argc, const char * argv[]) * implies an error in the exec. */ free(nargv); errorExit(errno, BAD_EXEC_MSG); + + /* Just supress compiler warning */ + return 0; } Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c @@ -138,10 +138,12 @@ jboolean XShared_initIDs(JNIEnv *env, jb } } - return JNI_TRUE; #endif /* MITSHM */ #endif /* !HEADLESS */ + + /* Supress compiler warning */ + return JNI_TRUE; } @@ -463,8 +465,10 @@ jboolean XShared_initSurface(JNIEnv *env return JNI_FALSE; } - return JNI_TRUE; #endif /* !HEADLESS */ + + /* Suppress compiler warning */ + return JNI_TRUE; } Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -494,6 +494,9 @@ JVM_handle_linux_signal(int sig, err.report_and_die(); ShouldNotReachHere(); + + /*Supress compiler warnings*/ + return -1; } void os::Linux::init_thread_fpu_state(void) { Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad @@ -1133,6 +1133,7 @@ uint MachSpillCopyNode::implementation( Unimplemented(); + return -1; //avoid compiler warning } #ifndef PRODUCT ++++++ openjdk-ecj-6-src-b22-no-werror.patch ++++++ Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make @@ -60,8 +60,8 @@ CPPFLAGS += -DASSERT # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors -CFLAGS_WARN = -Werror -CFLAGS += $(CFLAGS_WARN) +#CFLAGS_WARN = -Werror +#CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ adlparse.o \ Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make @@ -135,7 +135,7 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) +CFLAGS_WARN/DEFAULT = $(ACCEPTABLE_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make @@ -116,7 +116,7 @@ endif WARNINGS_ARE_ERRORS = -Werror # 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) +CFLAGS_WARN/DEFAULT = $(ADDITIONAL_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) Index: icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk +++ icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk @@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed # -ifeq ($(COMPILER_WARNINGS_FATAL),true) - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) +# GCC_WARNINGS += -Werror +#endif # # Misc compiler options Index: icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk +++ icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk @@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed # -ifeq ($(COMPILER_WARNINGS_FATAL),true) - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) +# GCC_WARNINGS += -Werror +#endif # # Misc compiler options -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org