From xranby at icedtea.classpath.org Tue Jun 1 02:39:18 2010 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Tue, 01 Jun 2010 09:39:18 +0000 Subject: /hg/icedtea6: Use full path to jar application to avoid relying ... Message-ID: changeset 7674917fa451 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7674917fa451 author: Xerxes R?nby date: Tue Jun 01 11:38:30 2010 +0200 Use full path to jar application to avoid relying on the one on the path. 2010-06-01 Xerxes R?nby * Makefile.am: (extra-lib/about.jar): Remove redundant conditional that we don't need any more. (rewrite-rhino.stamp): Use full path to jar application to avoid relying on the one on the path. diffstat: 2 files changed, 11 insertions(+), 7 deletions(-) ChangeLog | 9 +++++++++ Makefile.am | 9 ++------- diffs (42 lines): diff -r cf45c29fbe48 -r 7674917fa451 ChangeLog --- a/ChangeLog Fri May 28 17:46:51 2010 +0100 +++ b/ChangeLog Tue Jun 01 11:38:30 2010 +0200 @@ -1,3 +1,12 @@ 2010-05-28 Andrew John Hughes + + * Makefile.am: + (extra-lib/about.jar): Remove redundant + conditional that we don't need any more. + (rewrite-rhino.stamp): Use full path to + jar application to avoid relying on the one + on the path. + 2010-05-28 Andrew John Hughes * Makefile.am: diff -r cf45c29fbe48 -r 7674917fa451 Makefile.am --- a/Makefile.am Fri May 28 17:46:51 2010 +0100 +++ b/Makefile.am Tue Jun 01 11:38:30 2010 +0200 @@ -1618,12 +1618,7 @@ clean-extra: rm -f extra-source-files.txt extra-lib/about.jar: stamps/extra-class-files.stamp - if ! test -d $(ICEDTEA_BOOT_DIR) ; \ - then \ - $(JAR) cf $@ -C extra-lib net ; \ - else \ - $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \ - fi + $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; # PulseAudio based mixer # (pulse-java) @@ -1701,7 +1696,7 @@ stamps/rewrite-rhino.stamp: stamps/rewri stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) if WITH_RHINO mkdir -p rhino/rhino.{old,new} && \ - (cd rhino/rhino.old ; jar xf $(RHINO_JAR)) && \ + (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \ $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ com.redhat.rewriter.ClassRewriter \ $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \ From ahughes at redhat.com Tue Jun 1 04:30:24 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 1 Jun 2010 12:30:24 +0100 Subject: [IcedTea7] Bootstrap using GCJ-4.4 ? In-Reply-To: <20100531084641.GA26823@avionic-design.de> References: <20100531084641.GA26823@avionic-design.de> Message-ID: On 31 May 2010 09:46, Thierry Reding wrote: >> > -create-import-jdk-stubs: >> > ? ?[mkdir] Created dir: >> > /tmp/buildd/openjdk-7-7b84/build/openjdk-boot/build/linux-amd64/langtools/build/genstubs >> > ?[genstubs] Generating 81 stub files to >> > /tmp/buildd/openjdk-7-7b84/build/openjdk-boot/build/linux-amd64/langtools/build/genstubs >> > >> > BUILD FAILED >> > java.lang.NoClassDefFoundError: GenStubs >> > ? at java.lang.Class.initializeClass(libgcj.so.10) >> > ? at GenStubs$Ant.execute(Unknown Source) >> > [...] >> > Caused by: java.lang.ClassNotFoundException: >> > javax.tools.JavaFileManager$Location >> > [...] >> > ? at java.lang.Class.initializeClass(libgcj.so.10) >> > ? ...15 more >> > >> > You can get my full build log here : [1]. >> > >> >> There are some issues with HEAD I need to look at, that's why there >> hasn't been a new release yet. ?Have you tried 1.12? > > I've been able to trace this back to langtools' build.xml. The attached patch > fixes the build for me. > > Thierry > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.10 (GNU/Linux) > > iEYEARECAAYFAkwDd3EACgkQZ+BJyKLjJp+MegCeOpch0c6EtfUwY8i8stQi1cuT > 72wAn36crtpa+AjCL0fMYtDsnlJW/yxJ > =OGgt > -----END PGP SIGNATURE----- > > This looks like the right fix. I think the issue here is that the full classpath is passed through to the genstubs task for when it forks: However, we have to disable forking due to an issue with this and gcj. So the classpath specified in the genstubs task is use: I've committed a patch to IcedTea's forest to use the same classpath in the second case and will try and get this pushed upstream as well. The whole thing is complicated by Ant and by the way it is running differently on every platform. I don't see the error here, presumably because it's picking up the classes from the system install of OpenJDK or something (but I don't know for certain). Why we have to use this and not Makefiles I have no idea; it doesn't seem to make anything easier and makes diagnosing issues much harder. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Tue Jun 1 04:59:37 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Jun 2010 11:59:37 +0000 Subject: /hg/icedtea: 4 new changesets Message-ID: changeset 52e42458b501 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=52e42458b501 author: Deepak Bhole date: Wed Feb 24 16:59:24 2010 -0500 Fix security permissions related to get/set property, based on specifications * plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.* properties that some applets expect. * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement allowed property get/set based on specifications. changeset 7f7959c2cfa5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7f7959c2cfa5 author: Andrew John Hughes date: Wed Feb 24 23:30:18 2010 +0000 Ensure THANKYOU is distributed in the tarball. Remove duplicate AUTHORS file. 2010-02-24 Andrew John Hughes * Makefile.am: Add THANKYOU to EXTRA_DIST. * pulseaudio/AUTHORS: Removed; duplicates top-level file. changeset 83a0a5889a52 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=83a0a5889a52 author: Xerxes R?nby date: Fri Feb 26 15:53:18 2010 +0100 Undefine Shark debug code for NDEBUG builds 2010-02-26 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp (SharkCompiler::generate_native_code): Undefine debug code for NDEBUG builds changeset 76f02702e374 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=76f02702e374 author: Andrew John Hughes date: Tue Jun 01 12:59:18 2010 +0100 Update langtools changeset/checksum to include genstubs classpath fix. 2010-06-01 Andrew John Hughes * Makefile.am: Update langtools changeset ID and sha256 sum to bring in fix to no-fork genstubs classpath: http://hg.openjdk.java.net/icedtea/jdk7/langtools/rev/681f1f51926f diffstat: 6 files changed, 114 insertions(+), 19 deletions(-) ChangeLog | 27 +++ Makefile.am | 7 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 88 ++++++++++-- plugin/icedteanp/java/sun/applet/PluginMain.java | 4 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 pulseaudio/AUTHORS | 5 diffs (228 lines): diff -r 0b38b757f001 -r 76f02702e374 ChangeLog --- a/ChangeLog Fri May 28 17:48:11 2010 +0100 +++ b/ChangeLog Tue Jun 01 12:59:18 2010 +0100 @@ -1,3 +1,30 @@ 2010-05-28 Andrew John Hughes + + * Makefile.am: Update langtools + changeset ID and sha256 sum to bring in + fix to no-fork genstubs classpath: + http://hg.openjdk.java.net/icedtea/jdk7/langtools/rev/681f1f51926f + +2010-02-26 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp + (SharkCompiler::generate_native_code): Undefine debug code for + NDEBUG builds + +2010-02-24 Andrew John Hughes + + * Makefile.am: Add THANKYOU to + EXTRA_DIST. + * pulseaudio/AUTHORS: Removed; duplicates + top-level file. + +2010-02-24 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.* + properties that some applets expect. + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement + allowed property get/set based on specifications. + 2010-05-28 Andrew John Hughes * Makefile.am: diff -r 0b38b757f001 -r 76f02702e374 Makefile.am --- a/Makefile.am Fri May 28 17:48:11 2010 +0100 +++ b/Makefile.am Tue Jun 01 12:59:18 2010 +0100 @@ -7,7 +7,7 @@ JAXP_CHANGESET = 826bafcb6c4a JAXP_CHANGESET = 826bafcb6c4a JAXWS_CHANGESET = 1661166c82dc JDK_CHANGESET = 3d1a836736bf -LANGTOOLS_CHANGESET = a0499f48ec96 +LANGTOOLS_CHANGESET = 681f1f51926f OPENJDK_CHANGESET = 195fcceefddc CORBA_SHA256SUM = 870e2eac993a4eef48197ed7309cab176b56a994add1de215a026599052627cb @@ -15,7 +15,7 @@ JAXP_SHA256SUM = 42d004e51a1f01d146ad230 JAXP_SHA256SUM = 42d004e51a1f01d146ad230ce48996ddf8da3719fe571a41653f431d6b2e8a7b JAXWS_SHA256SUM = 4523909cd46fd61b5c6670bf932099d5899236a37a4058e7b2bcb855e503a0e4 JDK_SHA256SUM = 637372a089a1d50dc85d098e8b897d01e001730dd0ed94a6d347243272dedeeb -LANGTOOLS_SHA256SUM = 96f6be5d89195353f55ef775e0dec9bd9a5da7f869aba6ed428e4a2cac806991 +LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d948a07204904f6ce60e363bd0516e22f1cae830aba84f8 OPENJDK_SHA256SUM = 93c536e6bc4e962050a00321e88e694fc4e0000e2ad887b8de22830bfda2649f CACAO_VERSION = 0.99.4 @@ -736,7 +736,8 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr scripts/jni_create_stap.c \ scripts/jni_desc \ rewriter/agpl-3.0.txt \ - $(REWRITER_SRCS) + $(REWRITER_SRCS) \ + THANKYOU # Top-Level Targets # ================= diff -r 0b38b757f001 -r 76f02702e374 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Fri May 28 17:48:11 2010 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Tue Jun 01 12:59:18 2010 +0100 @@ -27,6 +27,7 @@ import java.security.AccessController; import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; +import java.util.PropertyPermission; import javax.swing.JWindow; @@ -288,7 +289,7 @@ class JNLPSecurityManager extends Securi //Change this SocketPermission's action to connect and accept //(and resolve). This is to avoid asking for connect permission //on every address resolve. - Permission tmpPerm; + Permission tmpPerm = null; if (perm instanceof SocketPermission) { tmpPerm = new SocketPermission(perm.getName(), SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION); @@ -332,16 +333,81 @@ class JNLPSecurityManager extends Securi } } - } else - tmpPerm = perm; - - //askPermission will only prompt the user on SocketPermission - //meaning we're denying all other SecurityExceptions that may arise. - if (askPermission(tmpPerm)) { - addPermission(tmpPerm); - //return quietly. + } else if (perm instanceof PropertyPermission) { + + if (JNLPRuntime.isDebug()) + System.err.println("Requesting property: " + perm.toString()); + + // We go by the rules here: + // http://java.sun.com/docs/books/tutorial/deployment/doingMoreWithRIA/properties.html + + // Since this is security sensitive, take a conservative approach: + // Allow only what is specifically allowed, and deny everything else + + // First, allow what everyone is allowed to read + if (perm.getActions().equals("read")) { + if ( perm.getName().equals("java.class.version") || + perm.getName().equals("java.vendor") || + perm.getName().equals("java.vendor.url") || + perm.getName().equals("java.version") || + perm.getName().equals("os.name") || + perm.getName().equals("os.arch") || + perm.getName().equals("os.version") || + perm.getName().equals("file.separator") || + perm.getName().equals("path.separator") || + perm.getName().equals("line.separator") || + perm.getName().startsWith("javaplugin.") + ) { + return; + } + } + + // Next, allow what only JNLP apps can do + if (getApplication().getJNLPFile().isApplication()) { + if ( perm.getName().equals("awt.useSystemAAFontSettings") || + perm.getName().equals("http.agent") || + perm.getName().equals("http.keepAlive") || + perm.getName().equals("java.awt.syncLWRequests") || + perm.getName().equals("java.awt.Window.locationByPlatform") || + perm.getName().equals("javaws.cfg.jauthenticator") || + perm.getName().equals("javax.swing.defaultlf") || + perm.getName().equals("sun.awt.noerasebackground") || + perm.getName().equals("sun.awt.erasebackgroundonresize") || + perm.getName().equals("sun.java2d.d3d") || + perm.getName().equals("sun.java2d.dpiaware") || + perm.getName().equals("sun.java2d.noddraw") || + perm.getName().equals("sun.java2d.opengl") || + perm.getName().equals("swing.boldMetal") || + perm.getName().equals("swing.metalTheme") || + perm.getName().equals("swing.noxp") || + perm.getName().equals("swing.useSystemFontSettings") + ) { + return; // JNLP apps can read and write to these + } + } + + // Next, allow access to customizable properties + if (perm.getName().startsWith("jnlp.") || + perm.getName().startsWith("javaws.")) { + return; + } + + // Everything else is denied + throw se; + } else { - throw se; + tmpPerm = perm; + } + + if (tmpPerm != null) { + //askPermission will only prompt the user on SocketPermission + //meaning we're denying all other SecurityExceptions that may arise. + if (askPermission(tmpPerm)) { + addPermission(tmpPerm); + //return quietly. + } else { + throw se; + } } } } @@ -352,7 +418,7 @@ class JNLPSecurityManager extends Securi throw ex; } } - + /** * Asks the user whether or not to grant permission. * @param perm the permission to be granted diff -r 0b38b757f001 -r 76f02702e374 plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Fri May 28 17:48:11 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Tue Jun 01 12:59:18 2010 +0100 @@ -189,6 +189,10 @@ public class PluginMain avProps.put("file.separator.applet", "true"); avProps.put("path.separator.applet", "true"); avProps.put("line.separator.applet", "true"); + + avProps.put("javaplugin.nodotversion", "160_17"); + avProps.put("javaplugin.version", "1.6.0_17"); + avProps.put("javaplugin.vm.options", ""); // Read in the System properties. If something is going to be // over-written, warn about it. diff -r 0b38b757f001 -r 76f02702e374 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Fri May 28 17:48:11 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Jun 01 12:59:18 2010 +0100 @@ -250,6 +250,7 @@ void SharkCompiler::generate_native_code if (SharkPrintAsmOf != NULL) { #if SHARK_LLVM_VERSION >= 27 +#ifndef NDEBUG if (!fnmatch(SharkPrintAsmOf, name, 0)) { llvm::SetCurrentDebugType(X86_ONLY("x86-emitter") NOT_X86("jit")); llvm::DebugFlag = true; @@ -258,6 +259,7 @@ void SharkCompiler::generate_native_code llvm::SetCurrentDebugType(""); llvm::DebugFlag = false; } +#endif #else // NB you need to patch LLVM with http://tinyurl.com/yf3baln for this std::vector args; diff -r 0b38b757f001 -r 76f02702e374 pulseaudio/AUTHORS --- a/pulseaudio/AUTHORS Fri May 28 17:48:11 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -Authors - -Ioana Iivan (iivan at redhat.com) - -Omair Majid (omajid at redhat.com) \ No newline at end of file From andrew at icedtea.classpath.org Tue Jun 1 07:24:39 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Jun 2010 14:24:39 +0000 Subject: /hg/icedtea: Remove fake tools.jar used in bootstrap JDK. Message-ID: changeset 007d1cc7ea12 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=007d1cc7ea12 author: Andrew John Hughes date: Tue Jun 01 15:24:24 2010 +0100 Remove fake tools.jar used in bootstrap JDK. 2010-06-01 Andrew John Hughes Drop fake tools.jar in bootstrap JDK. * Makefile.am: (.PHONY): Remove clean-tools-jar. (bootstrap-directory-stage1.stamp): Remove tools.jar symlink; can be avoided by patching HotSpot as part of patch below. (bootstrap/jdk1.7.0/lib/tools.jar): Removed. (clean-tools-jar): Likewise. (plugs.stamp): Remove dependency on tools.jar. (clean-plugs): Remove dependency on clean-tools-jar. * patches/boot/icedtea-hotspot-default.patch: Remove references to tools.jar, setting SA_CLASSPATH to rt.jar instead of tools.jar. diffstat: 3 files changed, 23 insertions(+), 46 deletions(-) ChangeLog | 16 ++++++++++++++ Makefile.am | 31 ++++------------------------ patches/boot/icedtea-hotspot-default.patch | 22 +------------------ diffs (123 lines): diff -r 76f02702e374 -r 007d1cc7ea12 ChangeLog --- a/ChangeLog Tue Jun 01 12:59:18 2010 +0100 +++ b/ChangeLog Tue Jun 01 15:24:24 2010 +0100 @@ -1,3 +1,19 @@ 2010-06-01 Andrew John Hughes + + Drop fake tools.jar in bootstrap JDK. + * Makefile.am: + (.PHONY): Remove clean-tools-jar. + (bootstrap-directory-stage1.stamp): Remove + tools.jar symlink; can be avoided by patching + HotSpot as part of patch below. + (bootstrap/jdk1.7.0/lib/tools.jar): Removed. + (clean-tools-jar): Likewise. + (plugs.stamp): Remove dependency on tools.jar. + (clean-plugs): Remove dependency on clean-tools-jar. + * patches/boot/icedtea-hotspot-default.patch: + Remove references to tools.jar, setting SA_CLASSPATH + to rt.jar instead of tools.jar. + 2010-06-01 Andrew John Hughes * Makefile.am: Update langtools diff -r 76f02702e374 -r 007d1cc7ea12 Makefile.am --- a/Makefile.am Tue Jun 01 12:59:18 2010 +0100 +++ b/Makefile.am Tue Jun 01 15:24:24 2010 +0100 @@ -775,9 +775,9 @@ install: clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \ - clean-tools-jar clean-visualvm clean-nbplatform \ - clean-rt clean-plugin hotspot hotspot-helper clean-extra clean-jtreg \ - clean-jtreg-reports clean-netx clean-drops + clean-visualvm clean-nbplatform clean-rt clean-plugin hotspot \ + hotspot-helper clean-extra clean-jtreg clean-jtreg-reports clean-netx \ + clean-drops env: @echo 'unset JAVA_HOME' @@ -1722,10 +1722,6 @@ stamps/bootstrap-directory-stage1.stamp: ln -sf ./$(JRE_ARCH_DIR) \ bootstrap/boot/jre/lib/$(INSTALL_ARCH_DIR); \ fi -# For HotSpot - mkdir -p $(abs_top_builddir)/bootstrap/boot/lib && \ - ln -sf $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar \ - $(abs_top_builddir)/bootstrap/boot/lib/tools.jar mkdir -p bootstrap/boot/include && \ for i in $(SYSTEM_JDK_DIR)/include/*; do \ test -r $$i | continue; \ @@ -2711,34 +2707,17 @@ clean-rt: rm -f stamps/rt-class-files.stamp stamps/rt.stamp rm -f rt-source-files.txt -# tools.jar -bootstrap/jdk1.7.0/lib/tools.jar: stamps/rt.stamp - mkdir -p bootstrap/boot/lib - ln -sf $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar \ - $(abs_top_builddir)/bootstrap/boot/lib/tools.jar - mkdir -p bootstrap/jdk1.7.0/lib - ln -sf $(abs_top_builddir)/bootstrap/boot/lib/tools.jar \ - $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar - -clean-tools-jar: - rm -f bootstrap/jdk1.7.0/lib/tools.jar - rm -f bootstrap/boot/lib/tools.jar - if test -d bootstrap/boot/lib ; then \ - rm -f $(abs_top_builddir)/bootstrap/boot/lib/tools.jar; \ - fi - # rt-closed.jar. bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt.stamp mkdir -p bootstrap/jdk1.7.0/jre/lib ln -sf ${abs_top_builddir}/bootstrap/boot/jre/lib/rt.jar \ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar -stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ - bootstrap/jdk1.7.0/lib/tools.jar +stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar mkdir -p stamps touch $@ -clean-plugs: clean-tools-jar clean-rt +clean-plugs: clean-rt rm -f stamps/plugs.stamp rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar rm -rf bootstrap/jdk1.7.0 diff -r 76f02702e374 -r 007d1cc7ea12 patches/boot/icedtea-hotspot-default.patch --- a/patches/boot/icedtea-hotspot-default.patch Tue Jun 01 12:59:18 2010 +0100 +++ b/patches/boot/icedtea-hotspot-default.patch Tue Jun 01 15:24:24 2010 +0100 @@ -40,30 +40,12 @@ diff -Nru ../openjdk.orig/openjdk-boot/h diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make --- ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-10-30 15:58:31.000000000 +0000 +++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-10-30 17:44:58.000000000 +0000 -@@ -38,7 +38,9 @@ +@@ -38,7 +38,7 @@ GENERATED = $(TOPDIR)/../generated # tools.jar is needed by the JDI - SA binding -SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar -+SA_TOOLS_JAR = $(BOOT_JAVA_HOME)/lib/tools.jar -+SA_RT_JAR = $(BOOT_JAVA_HOME)/jre/lib/rt.jar -+SA_CLASSPATH = $(SA_TOOLS_JAR):$(SA_RT_JAR) ++SA_CLASSPATH = $(BOOT_JAVA_HOME)/jre/lib/rt.jar # gnumake 3.78.1 does not accept the *s that # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them -@@ -65,8 +67,13 @@ - echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ - exit 1; \ - fi -- $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \ -- echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\ -+ $(QUIETLY) if [ ! -f $(SA_TOOLS_JAR) ] ; then \ -+ echo "Missing $(SA_TOOLS_JAR) file. Use 1.6.0 or later version of JDK";\ -+ echo ""; \ -+ exit 1; \ -+ fi -+ $(QUIETLY) if [ ! -f $(SA_RT_JAR) ] ; then \ -+ echo "Missing $(SA_RT_JAR) file. Use 1.6.0 or later version of JDK";\ - echo ""; \ - exit 1; \ - fi From andrew at icedtea.classpath.org Tue Jun 1 07:35:52 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Jun 2010 14:35:52 +0000 Subject: /hg/icedtea: Move jaxws getDTDType() patch to bootstrap subdirec... Message-ID: changeset efb52113d74b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=efb52113d74b author: Andrew John Hughes date: Tue Jun 01 15:35:38 2010 +0100 Move jaxws getDTDType() patch to bootstrap subdirectory. 2010-06-01 Andrew John Hughes * patches/icedtea-jaxws-getdtdtype.patch: Moved to... * Makefile.am: Move jaxws patch to bootstrap subdirectory. * patches/boot/jaxws-getdtdtype.patch: ...here. diffstat: 4 files changed, 37 insertions(+), 28 deletions(-) ChangeLog | 9 +++++++++ Makefile.am | 2 +- patches/boot/jaxws-getdtdtype.patch | 27 +++++++++++++++++++++++++++ patches/icedtea-jaxws-getdtdtype.patch | 27 --------------------------- diffs (90 lines): diff -r 007d1cc7ea12 -r efb52113d74b ChangeLog --- a/ChangeLog Tue Jun 01 15:24:24 2010 +0100 +++ b/ChangeLog Tue Jun 01 15:35:38 2010 +0100 @@ -1,3 +1,12 @@ 2010-06-01 Andrew John Hughes + + * patches/icedtea-jaxws-getdtdtype.patch: + Moved to... + * Makefile.am: + Move jaxws patch to bootstrap subdirectory. + * patches/boot/jaxws-getdtdtype.patch: + ...here. + 2010-06-01 Andrew John Hughes Drop fake tools.jar in bootstrap JDK. diff -r 007d1cc7ea12 -r efb52113d74b Makefile.am --- a/Makefile.am Tue Jun 01 15:24:24 2010 +0100 +++ b/Makefile.am Tue Jun 01 15:35:38 2010 +0100 @@ -444,7 +444,7 @@ endif # Patches for JAXWS -JAXWS_PATCHES = patches/icedtea-jaxws-getdtdtype.patch +JAXWS_PATCHES = patches/boot/jaxws-getdtdtype.patch # OpenJDK build environment. if ZERO_BUILD diff -r 007d1cc7ea12 -r efb52113d74b patches/boot/jaxws-getdtdtype.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/jaxws-getdtdtype.patch Tue Jun 01 15:35:38 2010 +0100 @@ -0,0 +1,27 @@ +--- drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 ++++ drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000 +@@ -276,7 +276,7 @@ + qName = localName; + else + qName = prefix + ':' + localName; +- String type = staxAttr.getDTDType(); ++ String type = staxAttr.getDTDType().toString(); + String value = staxAttr.getValue(); + + attrs.addAttribute(uri, localName, qName, type, value); +--- drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000 ++++ drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000 +@@ -108,11 +108,10 @@ + * the String "CDATA" + * @return the type as a String, default is "CDATA" + */ +- public String getDTDType() { +- return _attributeType; ++ public QName getDTDType() { ++ return new QName(_attributeType); + } + +- + /** + * A flag indicating whether this attribute was actually + * specified in the start-tag of its element, or was defaulted from the schema. diff -r 007d1cc7ea12 -r efb52113d74b patches/icedtea-jaxws-getdtdtype.patch --- a/patches/icedtea-jaxws-getdtdtype.patch Tue Jun 01 15:24:24 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ ---- drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000 -+++ drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000 -@@ -276,7 +276,7 @@ - qName = localName; - else - qName = prefix + ':' + localName; -- String type = staxAttr.getDTDType(); -+ String type = staxAttr.getDTDType().toString(); - String value = staxAttr.getValue(); - - attrs.addAttribute(uri, localName, qName, type, value); ---- drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000 -+++ drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000 -@@ -108,11 +108,10 @@ - * the String "CDATA" - * @return the type as a String, default is "CDATA" - */ -- public String getDTDType() { -- return _attributeType; -+ public QName getDTDType() { -+ return new QName(_attributeType); - } - -- - /** - * A flag indicating whether this attribute was actually - * specified in the start-tag of its element, or was defaulted from the schema. From andrew at icedtea.classpath.org Tue Jun 1 08:13:26 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Jun 2010 15:13:26 +0000 Subject: /hg/icedtea: 6 new changesets Message-ID: changeset 898c5cdf9448 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=898c5cdf9448 author: Andrew John Hughes date: Tue Jun 01 15:43:47 2010 +0100 Make jtreg depend on completed stage 2, not just icedtea.stamp 2010-03-01 Andrew John Hughes * Makefile.am: (stamps/jtreg.stamp): Depend on stamps/icedtea-stage2.stamp changeset 104a9313e4d8 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=104a9313e4d8 author: Andrew John Hughes date: Tue Jun 01 15:47:49 2010 +0100 Use rt.jar for CACAO builds rather than the contents of lib/rt. 2010-03-01 Andrew John Hughes * Makefile.am: (stamps/cacao.stamp): Depend on rt.stamp and use updated rt.jar to build against rather than the contents of lib/rt, so that --with-openjdk builds work. changeset 3c79ac98c366 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3c79ac98c366 author: Xerxes R?nby date: Thu Mar 04 13:34:40 2010 +0100 Fix Shark sharkCompiler mattr memory corruption bug. 2010-03-04 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp (sharkCompiler::sharkCompiler): Move mattr define to make its memory valid in the scope where it are used by the args vector. changeset bb1c7e372811 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bb1c7e372811 author: Andrew John Hughes date: Tue Jun 01 15:56:25 2010 +0100 PR441: Fix hotspot target on --disable-bootstrapping. 2010-03-04 Andrew John Hughes PR 441: * Makefile.am: Don't unset ICEDTEA_BUILD_TARGET if unused. (hotspot): Support the configuration where BOOTSTRAPPING is not set. Pass ICEDTEA_BUILD_TARGET=hotspot to make rather than having an additional hotspot-helper target. Don't remove bootstrap-directory-symlink-ecj.stamp as this just forces the bootstrap classes to be rebuilt. (hotspot- helper): Removed. changeset ee7e745aa094 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee7e745aa094 author: Matthias Klose date: Tue Jun 01 16:04:53 2010 +0100 Support DISTRIBUTION_BOOT_PATCHES extension to ICEDTEA_BOOT_PATCHES. 2010-03-08 Matthias Klose * Makefile.am: (ICEDTEA_BOOT_PATCHES): Add DISTRIBUTION_BOOT_PATCHES. changeset d9f8a98810eb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d9f8a98810eb author: Andrew John Hughes date: Tue Jun 01 16:12:06 2010 +0100 Generalise ZERO_ARCHFLAG to ARCHFLAG and use in PulseAudio native build. 2010-03-08 Andrew John Hughes * Makefile.am: (IT_CFLAGS): General CFLAGS for all IcedTea C builds, which includes ARCHFLAG. (ICEDTEA_ENV): Set ZERO_ARCHFLAG from ARCHFLAG. (stamps /native-ecj.stamp): Use IT_CFLAGS. ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Use IT_CFLAGS. * acinclude.m4: (IT_SET_ARCH_SETTINGS): Renamed from SET_ARCH_DIRS. Use host_cpu rather than host. Add sections for sparc and s390x. Set ARCHFLAG to m64 for x86_64, sparc64, powerpc64 and s390x, m31 for s390 and m32 for i?86, powerpc and sparc. (ENABLE_ZERO_BUILD): Remove setting of ZERO_ARCHFLAG, generalised to ARCHFLAG. * configure.ac: Call renamed IT_SET_ARCH_SETTINGS. diffstat: 5 files changed, 114 insertions(+), 44 deletions(-) ChangeLog | 54 ++++++++++++++++++ Makefile.am | 40 ++++++++----- acinclude.m4 | 60 +++++++++++--------- configure.ac | 2 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2 diffs (333 lines): diff -r efb52113d74b -r d9f8a98810eb ChangeLog --- a/ChangeLog Tue Jun 01 15:35:38 2010 +0100 +++ b/ChangeLog Tue Jun 01 16:12:06 2010 +0100 @@ -1,3 +1,57 @@ 2010-06-01 Andrew John Hughes + + * Makefile.am: + (IT_CFLAGS): General CFLAGS for all IcedTea + C builds, which includes ARCHFLAG. + (ICEDTEA_ENV): Set ZERO_ARCHFLAG from ARCHFLAG. + (stamps/native-ecj.stamp): Use IT_CFLAGS. + ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Use IT_CFLAGS. + * acinclude.m4: + (IT_SET_ARCH_SETTINGS): Renamed from SET_ARCH_DIRS. + Use host_cpu rather than host. Add sections for + sparc and s390x. Set ARCHFLAG to m64 for x86_64, + sparc64, powerpc64 and s390x, m31 for s390 and m32 + for i?86, powerpc and sparc. + (ENABLE_ZERO_BUILD): Remove setting of ZERO_ARCHFLAG, + generalised to ARCHFLAG. + * configure.ac: Call renamed IT_SET_ARCH_SETTINGS. + +2010-03-08 Matthias Klose + + * Makefile.am: + (ICEDTEA_BOOT_PATCHES): Add DISTRIBUTION_BOOT_PATCHES. + +2010-03-04 Andrew John Hughes + + * Makefile.am: + Don't unset ICEDTEA_BUILD_TARGET if unused. + (hotspot): Support the configuration where BOOTSTRAPPING + is not set. Pass ICEDTEA_BUILD_TARGET=hotspot to make rather + than having an additional hotspot-helper target. + Don't remove bootstrap-directory-symlink-ecj.stamp + as this just forces the bootstrap classes to be rebuilt. + (hotspot-helper): Removed. + +2010-03-04 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp + (sharkCompiler::sharkCompiler): Move mattr define to make its memory + valid in the scope where it are used by the args vector. + +2010-03-01 Andrew John Hughes + + * Makefile.am: + (stamps/cacao.stamp): Depend on rt.stamp + and use updated rt.jar to build against rather + than the contents of lib/rt, so that --with-openjdk + builds work. + +2010-03-01 Andrew John Hughes + + * Makefile.am: + (stamps/jtreg.stamp): Depend on + stamps/icedtea-stage2.stamp + 2010-06-01 Andrew John Hughes * patches/icedtea-jaxws-getdtdtype.patch: diff -r efb52113d74b -r d9f8a98810eb Makefile.am --- a/Makefile.am Tue Jun 01 15:35:38 2010 +0100 +++ b/Makefile.am Tue Jun 01 16:12:06 2010 +0100 @@ -145,6 +145,9 @@ IT_JAVAC_SETTINGS=-g -encoding utf-8 $(J IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE) IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) +# Flags +IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) + # Conditional defintions if USE_HG @@ -230,7 +233,6 @@ if WITH_CACAO ICEDTEA_BUILD_TARGET=jdk_only ICEDTEA_DEBUG_BUILD_TARGET=jdk_fastdebug_only else - ICEDTEA_BUILD_TARGET= ICEDTEA_DEBUG_BUILD_TARGET=debug_build endif @@ -442,6 +444,8 @@ ICEDTEA_BOOT_PATCHES += patches/boot/ecj ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch endif +ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES) + # Patches for JAXWS JAXWS_PATCHES = patches/boot/jaxws-getdtdtype.patch @@ -493,7 +497,7 @@ ICEDTEA_ENV = \ ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \ ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \ ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \ - ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \ + ZERO_ARCHFLAG="$(ARCHFLAG)" \ LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \ LIBFFI_LIBS="$(LIBFFI_LIBS)" \ LLVM_CFLAGS="$(LLVM_CFLAGS)" \ @@ -1688,7 +1692,7 @@ stamps/native-ecj.stamp: stamps/native-ecj.stamp: mkdir -p stamps if BUILD_NATIVE_ECJ - ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ + ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} endif touch $@ @@ -1997,21 +2001,25 @@ stamps/icedtea-boot.stamp: stamps/bootst touch $@ hotspot: - rm -f stamps/bootstrap-directory-symlink-stage1.stamp +if BOOTSTRAPPING rm -f stamps/icedtea-boot.stamp rm -f stamps/icedtea-stage1.stamp - $(ARCH_PREFIX) $(MAKE) hotspot-helper + $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage1 mkdir -p \ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server - @echo "Hotspot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image - -hotspot-helper: stamps/bootstrap-directory-symlink-stage1.stamp \ - stamps/plugs.stamp stamps/ports.stamp stamps/patch-boot.stamp - $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV_BOOT) \ - -C openjdk-boot hotspot + @echo "HotSpot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image +else + rm -f stamps/icedtea.stamp + rm -f stamps/icedtea-stage2.stamp + $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2 + mkdir -p \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server + cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server + @echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image +endif clean-icedtea-boot: if [ -e $(abs_top_builddir)/openjdk-boot ]; then \ @@ -2247,7 +2255,7 @@ stamps/pulse-java-headers.stamp: stamps/ touch $@ $(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp - $(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \ + $(CC) $(IT_CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \ -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $< $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS) @@ -2375,7 +2383,7 @@ clean-visualvm: # CACAO -stamps/cacao.stamp: stamps/rt-class-files.stamp +stamps/cacao.stamp: stamps/rt.stamp if BUILD_CACAO if !USE_SYSTEM_CACAO cd cacao/cacao && \ @@ -2386,7 +2394,7 @@ if !USE_SYSTEM_CACAO --prefix=$(abs_top_builddir)/cacao/install \ --with-java-runtime-library=openjdk \ --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ - --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \ + --with-java-runtime-library-classes=$(ICEDTEA_RT) \ --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client @@ -2574,7 +2582,7 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST # jtreg -stamps/jtreg.stamp: stamps/icedtea.stamp +stamps/jtreg.stamp: stamps/icedtea-stage2.stamp rm -rf test/jtreg/classes mkdir -p test/jtreg/classes $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \ diff -r efb52113d74b -r d9f8a98810eb acinclude.m4 --- a/acinclude.m4 Tue Jun 01 15:35:38 2010 +0100 +++ b/acinclude.m4 Tue Jun 01 16:12:06 2010 +0100 @@ -1,59 +1,79 @@ - AC_DEFUN([SET_ARCH_DIRS], + AC_DEFUN([IT_SET_ARCH_SETTINGS], [ - case "${host}" in - x86_64-*-*) + case "${host_cpu}" in + x86_64) BUILD_ARCH_DIR=amd64 INSTALL_ARCH_DIR=amd64 JRE_ARCH_DIR=amd64 + ARCHFLAG="-m64" ;; - i?86-*-*) + i?86) BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 JRE_ARCH_DIR=i386 ARCH_PREFIX=${LINUX32} + ARCHFLAG="-m32" ;; - alpha*-*-*) + alpha*) BUILD_ARCH_DIR=alpha INSTALL_ARCH_DIR=alpha JRE_ARCH_DIR=alpha ;; - arm*-*-*) + arm*) BUILD_ARCH_DIR=arm INSTALL_ARCH_DIR=arm JRE_ARCH_DIR=arm ;; - mips-*-*) + mips) BUILD_ARCH_DIR=mips INSTALL_ARCH_DIR=mips JRE_ARCH_DIR=mips ;; - mipsel-*-*) + mipsel) BUILD_ARCH_DIR=mipsel INSTALL_ARCH_DIR=mipsel JRE_ARCH_DIR=mipsel ;; - powerpc-*-*) + powerpc) BUILD_ARCH_DIR=ppc INSTALL_ARCH_DIR=ppc JRE_ARCH_DIR=ppc ARCH_PREFIX=${LINUX32} - ;; - powerpc64-*-*) + ARCHFLAG="-m32" + ;; + powerpc64) BUILD_ARCH_DIR=ppc64 INSTALL_ARCH_DIR=ppc64 JRE_ARCH_DIR=ppc64 + ARCHFLAG="-m64" ;; - sparc64-*-*) + sparc) + BUILD_ARCH_DIR=sparc + INSTALL_ARCH_DIR=sparc + JRE_ARCH_DIR=sparc + CROSS_TARGET_ARCH=sparc + ARCH_PREFIX=${LINUX32} + ARCHFLAG="-m32" + ;; + sparc64) BUILD_ARCH_DIR=sparcv9 INSTALL_ARCH_DIR=sparcv9 JRE_ARCH_DIR=sparc64 + ARCHFLAG="-m64" ;; - s390-*-*) + s390) BUILD_ARCH_DIR=s390 INSTALL_ARCH_DIR=s390 JRE_ARCH_DIR=s390 ARCH_PREFIX=${LINUX32} + ARCHFLAG="-m31" ;; + s390x) + BUILD_ARCH_DIR=s390x + INSTALL_ARCH_DIR=s390x + JRE_ARCH_DIR=s390x + CROSS_TARGET_ARCH=s390x + ARCHFLAG="-m64" *) BUILD_ARCH_DIR=`uname -m` INSTALL_ARCH_DIR=$BUILD_ARCH_DIR @@ -64,6 +84,7 @@ AC_SUBST(INSTALL_ARCH_DIR) AC_SUBST(JRE_ARCH_DIR) AC_SUBST(ARCH_PREFIX) + AC_SUBST(ARCHFLAG) ]) AC_DEFUN([SET_OS_DIRS], @@ -750,23 +771,10 @@ AC_DEFUN([ENABLE_ZERO_BUILD], *) ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z` esac - dnl multilib machines need telling which mode to build for - case "${ZERO_LIBARCH}" in - i386|ppc|sparc) - ZERO_ARCHFLAG="-m32" - ;; - s390) - ZERO_ARCHFLAG="-m31" - ;; - amd64|ppc64|s390x|sparc64) - ZERO_ARCHFLAG="-m64" - ;; - esac AC_SUBST(ZERO_LIBARCH) AC_SUBST(ZERO_BITSPERWORD) AC_SUBST(ZERO_ENDIANNESS) AC_SUBST(ZERO_ARCHDEF) - AC_SUBST(ZERO_ARCHFLAG) AC_CONFIG_FILES([jvm.cfg]) AC_CONFIG_FILES([ergo.c]) ]) diff -r efb52113d74b -r d9f8a98810eb configure.ac --- a/configure.ac Tue Jun 01 15:35:38 2010 +0100 +++ b/configure.ac Tue Jun 01 16:12:06 2010 +0100 @@ -135,7 +135,7 @@ IT_GET_PKGVERSION IT_GET_PKGVERSION IT_GET_LSB_DATA -SET_ARCH_DIRS +IT_SET_ARCH_SETTINGS SET_OS_DIRS IT_CHECK_NUMBER_OF_PARALLEL_JOBS diff -r efb52113d74b -r d9f8a98810eb ports/hotspot/src/share/vm/shark/sharkCompiler.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Jun 01 15:35:38 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Jun 01 16:12:06 2010 +0100 @@ -71,8 +71,8 @@ SharkCompiler::SharkCompiler() args.push_back(""); // program name args.push_back(cpu.c_str()); + std::string mattr("-mattr="); if(gotCpuFeatures){ - std::string mattr("-mattr="); for(StringMap::iterator I = Features.begin(), E = Features.end(); I != E; ++I){ if(I->second){ From asu at redhat.com Tue Jun 1 08:18:44 2010 From: asu at redhat.com (Andrew Su) Date: Tue, 1 Jun 2010 11:18:44 -0400 (EDT) Subject: request for confirmation (Bug 451) Message-ID: <453178122.787841275405524158.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, In regards to Bug 451 (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=451) where symlinks are being created when compiling but they don't point to anything. Reason that this is happening, It seems that using the --with-openjdk option with configure it doesn't check and doesn't set the path for xalan's jar files. Similarly for xerces jar file. I've also tried something else too, using the --with-xalan2-jar parameter doesn't allow me to set the path where the jar is regardless of whether I'm configuring with --with-openjdk or not. The diff of the config.log when I used --with-xalan2-jar only showed difference in the line that contains all the options passed in, and the path for xalan2 and remains unmodified. --Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: 451.patch Type: text/x-patch Size: 2195 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100601/f7e2a419/451.patch From bugzilla-daemon at icedtea.classpath.org Tue Jun 1 09:15:19 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Jun 2010 16:15:19 +0000 Subject: [Bug 451] Incomplete links are created during build process without reporting errors Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=451 ------- Comment #4 from asu at redhat.com 2010-06-01 16:15 ------- Confirmed that the symlinks are being created. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From thierry.reding at avionic-design.de Tue Jun 1 09:39:38 2010 From: thierry.reding at avionic-design.de (Thierry Reding) Date: Tue, 1 Jun 2010 18:39:38 +0200 Subject: Cross-compiling IcedTea7 Message-ID: <20100601163938.GA27371@avionic-design.de> Hi, I've been trying to get IcedTea 7 to cross-compile, without much success. So I went and gave OpenJDK a try and had some more luck. My plan now is to try and take some of the insight from that and give IcedTea another try. One of the problems with IcedTea is that it runs two iterations of the build, the bootstrap stage as well as the final stage. Am I correct in assuming that when cross-compiling the bootstrap stage should actually be built for the architecture of the build host, and the final stage should then use that bootstrap to build OpenJDK for the target architecture (or host architecture in autoconf speak)? Currently both stages are built for one architecture, which obviously will not work for a cross-compile. One general question is how much of the changes that actually modify code in OpenJDK can go upstream and what needs to go into IcedTea patches. Preparing patches against an OpenJDK tree and applying them in the IcedTea build also turns out not to be an optimal workflow. What is the usual practice? Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100601/1d9657c9/attachment.bin From andrew at icedtea.classpath.org Tue Jun 1 09:47:22 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Jun 2010 16:47:22 +0000 Subject: /hg/release/icedtea6-1.7: Message protocol overhaul to fix race ... Message-ID: changeset 92e2665861fb in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=92e2665861fb author: Deepak Bhole date: Tue Mar 09 15:54:50 2010 -0500 Message protocol overhaul to fix race conditions - Added unique reference identifiers to Java -> C++ requests so that the correct responses are serviced (fixes some bad race conditions when multiple applets are running). - Fix race conditions that caused some of the set tests to intermittently fail. diffstat: 13 files changed, 264 insertions(+), 170 deletions(-) ChangeLog | 80 ++++++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 25 +- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 86 ++++----- plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 26 -- plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java | 18 - plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 95 +++++++--- plugin/icedteanp/java/sun/applet/PluginCallRequest.java | 22 +- plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java | 14 - plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 20 -- plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 22 -- plugin/icedteanp/java/sun/applet/PluginStreamHandler.java | 4 plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java | 19 -- plugin/tests/LiveConnect/common.js | 3 diffs (truncated from 1006 to 500 lines): diff -r 261595447146 -r 92e2665861fb ChangeLog --- a/ChangeLog Wed Apr 28 17:18:35 2010 +0100 +++ b/ChangeLog Tue Mar 09 15:54:50 2010 -0500 @@ -1,3 +1,83 @@ 2010-04-28 Andrew John Hughes + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (consume_message): Handle the new reference field and send it back when + sending proxy and cookie info. + (get_proxy_info): Update response format for proxy information to make it + consistent with new Gecko API. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (newMessageOnBus): Account for the new reference field and send it back + with the response. + (sendWindow): Same. + (eval): Same. + (call): Same. + (sendString): Same. + (setMember): Same. Also, move responding code from _setMember to setMember + for consistency and to solve a rather bad race condition that affected + reliability. + (sendMember): Account for the new reference field and send it back + with the response. + (queue_processor): Move array index slots based on new positions with + reference ids. + (_setMember): Move response code back to setMember. + * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java + (GetMemberPluginCallRequest): Change method signature to receive a + reference identifier. + (parse): Update to handle new reference identifiers. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java + (GetWindowPluginCallRequest): Change method signature to receive a + reference identifier. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Added new + statis private requestIdentityCounter variable that provides unique + reference numbers. + (createPanel): Send a dummy (0) reference number with initialization msg. + (getRequestIdentifier): New method. Returns a unique reference number + and then increments requestIdentityCounter in a thread-safe manner. + (getWindow): Send reference id to getPluginCallRequest. + (getMember): Same. + (setMember): Same. + (setSlot): Same. + (getSlot): Same. + (eval): Same. + (removeMember): Same. + (call): Same. + (requestPluginCookieInfo): Same. + (requestPluginProxyInfo): Same. + (JavaScriptFinalize): Same. + (javascriptToString): Same. + * plugin/icedteanp/java/sun/applet/PluginCallRequest.java: Track reference + numbers instead of the 'return string' marker. + (serviceable): Change from abstract to implemented method, returns weather + or not the given message is servicable by this request based on unique + reference numbers. + * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java + (getPluginCallRequest): Pass reference numbers to concrete class + constructors. + * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java + (PluginCookieInfoRequest): Receive new reference number and pass it to + parent. + (parseString): Update to handle new reference numbers in message. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java + (PluginProxyInfoRequest): Receive new reference number and pass it to + parent. + (parseReturn): Update to handle new reference numbers in message. Also, + parse based on new format returned by the C++ side. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java + (handleMessage): Pass reference to finishCallRequest(). + * plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java + (VoidPluginCallRequest): Update to handle new reference numbers in + message. + * plugin/tests/LiveConnect/common.js + (testAll): Check eval tests checkbox before calling doTest(); + 2010-04-28 Andrew John Hughes PR icedtea/476 diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Apr 28 17:18:35 2010 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Mar 09 15:54:50 2010 -0500 @@ -1222,15 +1222,15 @@ void consume_message(gchar* message) { else if (g_str_has_prefix (message, "plugin ")) { // internal plugin related message - gchar** parts = g_strsplit (message, " ", 3); + gchar** parts = g_strsplit (message, " ", 5); if (g_str_has_prefix(parts[1], "PluginProxyInfo")) { gchar* proxy; uint32_t len; - gchar* decoded_url = (gchar*) calloc(strlen(parts[2]) + 1, sizeof(gchar)); - IcedTeaPluginUtilities::decodeURL(parts[2], &decoded_url); - PLUGIN_DEBUG_4ARG("parts[0]=%s, parts[1]=%s, parts[2]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[2], decoded_url); + gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar)); + IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url); + PLUGIN_DEBUG_5ARG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url); gchar* proxy_info; @@ -1238,7 +1238,7 @@ void consume_message(gchar* message) { proxy = (char*) malloc(sizeof(char)*2048); #endif - proxy_info = g_strconcat ("plugin PluginProxyInfo ", NULL); + proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL); if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR) { proxy_info = g_strconcat (proxy_info, proxy, NULL); @@ -1259,10 +1259,10 @@ void consume_message(gchar* message) { } else if (g_str_has_prefix(parts[1], "PluginCookieInfo")) { - gchar* decoded_url = (gchar*) calloc(strlen(parts[2])+1, sizeof(gchar)); - IcedTeaPluginUtilities::decodeURL(parts[2], &decoded_url); + gchar* decoded_url = (gchar*) calloc(strlen(parts[4])+1, sizeof(gchar)); + IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url); - gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo ", parts[2], " ", NULL); + gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo reference ", parts[3], " ", NULL); gchar* cookie_string; uint32_t len; if (get_cookie_info(decoded_url, &cookie_string, &len) == NPERR_NO_ERROR) @@ -1358,7 +1358,14 @@ get_proxy_info(const char* siteAddr, cha nsDependentCString ipAddr; record->GetNextAddrAsString(ipAddr); - snprintf(*proxy, sizeof(char)*1024, "%s://%s:%d", ptype.get(), ipAddr.get(), pport); + if (!strcmp(ptype.get(), "http")) + { + snprintf(*proxy, sizeof(char)*1024, "%s %s:%d", "PROXY", ipAddr.get(), pport); + } else + { + snprintf(*proxy, sizeof(char)*1024, "%s %s:%d", "SOCKS", ipAddr.get(), pport); + } + *len = strlen(*proxy); PLUGIN_DEBUG_2ARG("Proxy info for %s: %s\n", siteAddr, *proxy); diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Apr 28 17:18:35 2010 +0100 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Tue Mar 09 15:54:50 2010 -0500 @@ -103,7 +103,7 @@ PluginRequestProcessor::newMessageOnBus( IcedTeaPluginUtilities::printStringVector("PluginRequestProcessor::newMessageOnBus:", message_parts); type = message_parts->at(0); - command = message_parts->at(2); + command = message_parts->at(4); if (type == "instance") { @@ -122,7 +122,7 @@ PluginRequestProcessor::newMessageOnBus( command == "Eval") { - // Update queue synchronously + // Update queue synchronously pthread_mutex_lock(&message_queue_mutex); message_queue->push_back(message_parts); pthread_mutex_unlock(&message_queue_mutex); @@ -152,6 +152,7 @@ PluginRequestProcessor::sendWindow(std:: { std::string type; std::string command; + int reference; std::string response = std::string(); std::string window_ptr_str = std::string(); NPVariant* variant = new NPVariant(); @@ -160,7 +161,8 @@ PluginRequestProcessor::sendWindow(std:: type = message_parts->at(0); id = atoi(message_parts->at(1).c_str()); - command = message_parts->at(2); + reference = atoi(message_parts->at(3).c_str()); + command = message_parts->at(4); NPP instance; get_instance_from_id(id, instance); @@ -173,7 +175,7 @@ PluginRequestProcessor::sendWindow(std:: IcedTeaPluginUtilities::JSIDToString(variant, &window_ptr_str); // We need the context 0 for backwards compatibility with the Java side - IcedTeaPluginUtilities::constructMessagePrefix(0, &response); + IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptGetWindow "; response += window_ptr_str; @@ -201,14 +203,16 @@ PluginRequestProcessor::eval(std::vector NPP instance; std::string script; NPVariant result; + int reference; std::string response = std::string(); std::string return_type = std::string(); int id; - window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(message_parts->at(3)); + reference = atoi(message_parts->at(3).c_str()); + window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(message_parts->at(5)); instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(window_ptr); - java_result = request_processor.getString(message_parts->at(4)); + java_result = request_processor.getString(message_parts->at(6)); CHECK_JAVA_RESULT(java_result); script.append(*(java_result->return_string)); @@ -240,7 +244,7 @@ PluginRequestProcessor::eval(std::vector std::string result_variant_jniid = std::string(); createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); - IcedTeaPluginUtilities::constructMessagePrefix(0, &response); + IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptEval "; response += result_variant_jniid; @@ -262,6 +266,7 @@ PluginRequestProcessor::call(std::vector NPP instance; std::string window_ptr_str; NPVariant* window_ptr; + int reference; std::string window_function_name; std::vector args = std::vector(); std::vector arg_ids = std::vector(); @@ -270,20 +275,22 @@ PluginRequestProcessor::call(std::vector JavaRequestProcessor java_request = JavaRequestProcessor(); JavaResultData* java_result; + reference = atoi(message_parts->at(3).c_str()); + // window - window_ptr_str = message_parts->at(3); + window_ptr_str = message_parts->at(5); window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(window_ptr_str); // instance instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(window_ptr); // function name - java_result = java_request.getString(message_parts->at(4)); + java_result = java_request.getString(message_parts->at(6)); CHECK_JAVA_RESULT(java_result); window_function_name.append(*(java_result->return_string)); // arguments - for (int i=5; i < message_parts->size(); i++) + for (int i=7; i < message_parts->size(); i++) { arg_ids.push_back(message_parts->at(i)); } @@ -342,7 +349,7 @@ PluginRequestProcessor::call(std::vector result_variant_jniid = "0"; } - IcedTeaPluginUtilities::constructMessagePrefix(0, &response); + IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptCall "; response += result_variant_jniid; @@ -364,9 +371,11 @@ PluginRequestProcessor::sendString(std:: NPVariant* variant; JavaRequestProcessor java_request = JavaRequestProcessor(); JavaResultData* java_result; + int reference; std::string response = std::string(); - variant_ptr = message_parts->at(3); + reference = atoi(message_parts->at(3).c_str()); + variant_ptr = message_parts->at(5); variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(variant_ptr); AsyncCallThreadData thread_data = AsyncCallThreadData(); @@ -393,7 +402,7 @@ PluginRequestProcessor::sendString(std:: #endif // We need the context 0 for backwards compatibility with the Java side - IcedTeaPluginUtilities::constructMessagePrefix(0, &response); + IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptToString "; response += thread_data.result; @@ -418,6 +427,8 @@ PluginRequestProcessor::setMember(std::v { std::string propertyNameID; std::string value = std::string(); + std::string response = std::string(); + int reference; NPP instance; NPVariant* member; @@ -428,24 +439,26 @@ PluginRequestProcessor::setMember(std::v IcedTeaPluginUtilities::printStringVector("PluginRequestProcessor::_setMember - ", message_parts); - member = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(3))); - propertyNameID = message_parts->at(4); + reference = atoi(message_parts->at(3).c_str()); - if (message_parts->at(5) == "literalreturn") + member = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(5))); + propertyNameID = message_parts->at(6); + + if (message_parts->at(7) == "literalreturn") { - value.append(message_parts->at(5)); + value.append(message_parts->at(7)); value.append(" "); - value.append(message_parts->at(6)); + value.append(message_parts->at(8)); } else { - value.append(message_parts->at(5)); + value.append(message_parts->at(7)); } instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(member); - if (message_parts->at(2) == "SetSlot") + if (message_parts->at(4) == "SetSlot") { - property_identifier = browser_functions.getintidentifier(atoi(message_parts->at(4).c_str())); + property_identifier = browser_functions.getintidentifier(atoi(message_parts->at(6).c_str())); } else { java_result = java_request.getString(propertyNameID); @@ -485,6 +498,10 @@ PluginRequestProcessor::setMember(std::v } #endif + IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); + response.append(" JavaScriptSetMember "); + plugin_to_java_bus->post(response.c_str()); + cleanup: delete message_parts; @@ -514,6 +531,7 @@ PluginRequestProcessor::sendMember(std:: JavaResultData* java_result; NPVariant* parent_ptr; + //int reference; std::string member_id = std::string(); std::string jsObjectClassID = std::string(); std::string jsObjectConstructorID = std::string(); @@ -523,18 +541,20 @@ PluginRequestProcessor::sendMember(std:: int method_id; int instance_id; - long reference; + int reference; // debug printout of parent thread data IcedTeaPluginUtilities::printStringVector("PluginRequestProcessor::getMember:", message_parts); + reference = atoi(message_parts->at(3).c_str()); + // store info in local variables for easy access instance_id = atoi(message_parts->at(1).c_str()); - parent_ptr = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(3))); - member_id += message_parts->at(4); + parent_ptr = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(5))); + member_id += message_parts->at(6); /** Request data from Java if necessary **/ - if (message_parts->at(2) == "GetSlot") + if (message_parts->at(4) == "GetSlot") { member_identifier = browser_functions.getintidentifier(atoi(member_id.c_str())); } else @@ -551,10 +571,6 @@ PluginRequestProcessor::sendMember(std:: member_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str()); } - - /** Make an internal request for the main thread to handle, to get the member pointer **/ - - reference = internal_req_ref_counter++; AsyncCallThreadData thread_data = AsyncCallThreadData(); thread_data.result_ready = false; @@ -583,8 +599,6 @@ PluginRequestProcessor::sendMember(std:: #endif PLUGIN_DEBUG_1ARG("Member PTR after internal request: %s\n", thread_data.result.c_str()); - - internal_req_ref_counter--; java_result = java_request.findClass(0, "netscape.javascript.JSObject"); @@ -631,7 +645,7 @@ PluginRequestProcessor::sendMember(std:: } - IcedTeaPluginUtilities::constructMessagePrefix(0, &response); + IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); if (message_parts->at(2) == "GetSlot") { response.append(" JavaScriptGetMember "); @@ -674,7 +688,7 @@ queue_processor(void* data) if (message_parts) { - command = message_parts->at(2); + command = message_parts->at(4); if (command == "GetMember") { @@ -739,7 +753,6 @@ _setMember(void* data) _setMember(void* data) { std::string* value; - std::string response = std::string(); NPP instance; NPVariant value_variant = NPVariant(); @@ -758,12 +771,7 @@ _setMember(void* data) ((AsyncCallThreadData*) data)->call_successful = browser_functions.setproperty(instance, member, *property, &value_variant); - IcedTeaPluginUtilities::constructMessagePrefix(0, &response); - response.append(" JavaScriptSetMember "); - plugin_to_java_bus->post(response.c_str()); - ((AsyncCallThreadData*) data)->result_ready = true; - } void diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java --- a/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java Wed Apr 28 17:18:35 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java Tue Mar 09 15:54:50 2010 -0500 @@ -41,35 +41,21 @@ public class GetMemberPluginCallRequest public class GetMemberPluginCallRequest extends PluginCallRequest { Object object = null; - public GetMemberPluginCallRequest(String message, String returnString) { - super(message, returnString); - PluginDebug.debug ("GetMEMBerPLUGINCAlL " + message + " " + returnString); + public GetMemberPluginCallRequest(String message, Long reference) { + super(message, reference); + PluginDebug.debug ("GetMemberPluginCall " + message); } public void parseReturn(String message) { - PluginDebug.debug ("GetMEMBerparseReturn GOT: " + message); + PluginDebug.debug ("GetMemberParseReturn GOT: " + message); String[] args = message.split(" "); // FIXME: Is it even possible to distinguish between null and void // here? - if (args[1] != "null" && args[1] != "void") - object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[1])); + if (args[3] != "null" && args[3] != "void") + object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[3])); setDone(true); } - /** - * Returns whether the given message is serviceable by this object - * - * @param message The message to service - * @return boolean indicating if message is serviceable - */ - public boolean serviceable(String message) { - return message.contains("JavaScriptCall") || - message.contains("JavaScriptEval") || - message.contains("JavaScriptGetMember") || - message.contains("JavaScriptGetSlot") || - message.contains("JavaScriptToString"); - } - public Object getObject() { return this.object; } diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java --- a/plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java Wed Apr 28 17:18:35 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java Tue Mar 09 15:54:50 2010 -0500 @@ -46,27 +46,17 @@ public class GetWindowPluginCallRequest // FIXME: look into int vs long JavaScript internal values. long internal; - public GetWindowPluginCallRequest(String message, String returnString) { - super(message, returnString); + public GetWindowPluginCallRequest(String message, Long reference) { + super(message, reference); } public void parseReturn(String message) { - PluginDebug.debug ("GetWINDOWparseReturn GOT: " + message); + PluginDebug.debug ("GetWindowParseReturn GOT: " + message); String[] args = message.split(" "); // FIXME: add thread ID to messages to support multiple From bugzilla-daemon at icedtea.classpath.org Tue Jun 1 13:00:31 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Jun 2010 20:00:31 +0000 Subject: [Bug 359] Firefox crashed on Bandwidth Speed Test plugin Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=359 ------- Comment #4 from asu at redhat.com 2010-06-01 20:00 ------- The gadget did not load for me using either of openjdk and proprietary java ***OpenJDK*** java version "1.6.0_17" OpenJDK Runtime Environment (IcedTea6 1.7.1) (fedora-37.b17.fc13-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) ***Proprietary Java*** java version "1.6.0_18" Java(TM) SE Runtime Environment (build 1.6.0_18-b07) Java HotSpot(TM) 64-Bit Server VM (build 16.0-b13, mixed mode) Tested on firefox 3.6.3 In both case nothing shows up in the gadget box after adding it. The browsers did not crash either. Is this still causing problems -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 1 14:08:17 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Jun 2010 21:08:17 +0000 Subject: [Bug 359] Firefox crashed on Bandwidth Speed Test plugin Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=359 ------- Comment #5 from asu at redhat.com 2010-06-01 21:08 ------- The links to the speed tester "http://wattaman.evonet.ro/speed-test-mare/" works for me. However the ones for google gadget does not load anything. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Tue Jun 1 14:35:10 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Jun 2010 21:35:10 +0000 Subject: /hg/icedtea: 6 new changesets Message-ID: changeset eb4fd48b97cf in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eb4fd48b97cf author: Deepak Bhole date: Tue Jun 01 17:28:35 2010 +0100 Message protocol overhaul to fix race conditions - Added unique reference identifiers to Java -> C++ requests so that the correct responses are serviced (fixes some bad race conditions when multiple applets are running). - Fix race conditions that caused some of the set tests to intermittently fail. 2010-03-09 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (consume_message): Handle the new reference field and send it back when sending proxy and cookie info. (get_proxy_info): Update response format for proxy information to make it consistent with new Gecko API. * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (newMessageOnBus): Account for the new reference field and send it back with the response. (sendWindow): Same. (eval): Same. (call): Same. (sendString): Same. (setMember): Same. Also, move responding code from _setMember to setMember for consistency and to solve a rather bad race condition that affected reliability. (sendMember): Account for the new reference field and send it back with the response. (queue_processor): Move array index slots based on new positions with reference ids. (_setMember): Move response code back to setMember. * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java (GetMemberPluginCallRequest): Change method signature to receive a reference identifier. (parse): Update to handle new reference identifiers. (serviceable): Removed method. serviceable() is now implemented in the parent class and uses unique reference identifiers. * plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java (GetWindowPluginCallRequest): Change method signature to receive a reference identifier. (serviceable): Removed method. serviceable() is now implemented in the parent class and uses unique reference identifiers. * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Added new statis private requestIdentityCounter variable that provides unique reference numbers. (createPanel): Send a dummy (0) reference number with initialization msg. (getRequestIdentifier): New method. Returns a unique reference number and then increments requestIdentityCounter in a thread-safe manner. (getWindow): Send reference id to getPluginCallRequest. (getMember): Same. (setMember): Same. (setSlot): Same. (getSlot): Same. (eval): Same. (removeMember): Same. (call): Same. (requestPluginCookieInfo): Same. (requestPluginProxyInfo): Same. (JavaScriptFinalize): Same. (javascriptToString): Same. * plugin/icedteanp/java/sun/applet/PluginCallRequest.java: Track reference numbers instead of the 'return string' marker. (serviceable): Change from abstract to implemented method, returns weather or not the given message is servicable by this request based on unique reference numbers. * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java (getPluginCallRequest): Pass reference numbers to concrete class constructors. * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java (PluginCookieInfoRequest): Receive new reference number and pass it to parent. (parseString): Update to handle new reference numbers in message. (serviceable): Removed method. serviceable() is now implemented in the parent class and uses unique reference identifiers. * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java (PluginProxyInfoRequest): Receive new reference number and pass it to parent. (parseReturn): Update to handle new reference numbers in message. Also, parse based on new format returned by the C++ side. (serviceable): Removed method. serviceable() is now implemented in the parent class and uses unique reference identifiers. * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java (handleMessage): Pass reference to finishCallRequest(). * plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java (VoidPluginCallRequest): Update to handle new reference numbers in message. * plugin/tests/LiveConnect/common.js (testAll): Check eval tests checkbox before calling doTest(); changeset 693114a512ea in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=693114a512ea author: Gary Benson date: Tue Jun 01 17:44:01 2010 +0100 Whitespace changes 2010-03-11 Gary Benson * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Whitespace changes. changeset 7195e112b39f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7195e112b39f author: Gary Benson date: Thu Mar 11 16:35:10 2010 -0500 Fix bugs preventing Shark building itself 2010-03-11 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp (SharkCompiler::compile_method): Catch typeflow failures more generally. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::scan_for_traps): New trap. (SharkTopLevelBlock::do_call): Add assertion to check the above. (SharkTopLevelBlock::static_subtype_check): Deal with unloaded object_klass. changeset 53d08a835f60 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=53d08a835f60 author: Andrew John Hughes date: Tue Jun 01 18:04:46 2010 +0100 Synchronise NetX support with IcedTea6. 2010-03-12 Andrew John Hughes * Makefile.am: (NETX_EXTRA_DIR): Path to extra NetX resource files. (ICEDTEA_BOOTSTRAP_CLASSES): Explicitly compile BasicDirectoryModel due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003 (stamps/icedtea.stamp): Use NETX_RESOURCE_DIR for about.jnlp. (stamps/icedtea-debug.stamp): Likewise. (stamps/netx.stamp): Copy the resources to the build directory. (stamps/extra- class-files.stamp): Use NETX_EXTRA_DIR. (rt-source- files.txt): Don't search rt directory in build tree. Support ICEDTEA_BOOTSTRAP_CLASSES. (netx): New alias. changeset 85e376bde322 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=85e376bde322 author: Deepak Bhole date: Mon Mar 15 13:35:18 2010 -0400 Liveconnect message processing design changes. - Redesigned message consumption/processing model to allow arbitrary number of applets to load without increasing MAX_WORKERS count. - Implemented priority queuing to allow blocking threads to get responses first. - Made message consumption non-blocking and fixed thread-safety issues therein 2010-03-13 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (requestPluginCookieInfo): Register cookie info as a priority message. (requestPluginProxyInfo): Register proxy info as a priority message. * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Re- designed message consumption to implement priority queuing and parallel initialization limits so that an arbitrary number of applets can load without blocking one another, all in a thread-safe manner. (registerPriorityWait): New method. Registers a string that is considered a "priority" string, which gets delegated to dedicated worker threads. (unRegisterPriorityWait): Unregisters a string so that it is no longer a priority. (PluginMessageConsumer): Do not create any workers when starting. (consume): Remove method. Consumption is now done in a separate dedicated thread to prevent blocking. (getPriorityStrIfPriority): New method. If the given message is priority, return why (i.e the 'priority string'it matched). (isInInit): New method. Returns if the plugin is currently initializing an applet. (addToInitWorkers): New method. Adds given worker to list of workers currently initializting applets. (okayToProcess): New method. Returns whether or not it is okay to process the given applet. (notifyWorkerIsFree): New method. Notifies this class that a worker has just become free. (queue): Queues the given message for consumption. (ConsumerThread): New protected inner (thread) class. Responsible for consuming messages in the queue, and regueuing them if consumption if not possible. (getFreeWorker): Changed to be non-blocking, and return either a priority worker or a normal worker depending on what is requested. * plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java (PluginMessageHandlerWorker): Set new priority and consumer variables. (busy): Make thread-safe by waiting on same property that free() waits on. (free): Make thread-safe by waiting on same property that busy() waits on. (isPriority): New method. Returns of worker is a priority worker. (isFree): Made thread-safe, and accounts for priority. * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java (startProcessing): Call consumer.queue() instead of consumer.consume(). (postMessage): Remove unused method. changeset 8a1a5c294219 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8a1a5c294219 author: Andrew John Hughes date: Tue Jun 01 22:35:00 2010 +0100 NetX/plugin build sync (2/3): Synchronise with IcedTea6. 2010-03-15 Andrew John Hughes NetX/plugin build sync (2/3): * patches/icedtea-liveconnect-dist.patch, * patches/icedtea-liveconnect.patch, * patches/icedtea-netx.patch, * patches/icedtea-webstart-umask.patch, * patches/icedtea-webstart.patch: Moved to extensions subdirectory. * Makefile.am: (PLUGIN_PATCH): Removed. (ICEDTEA_PATCHES): Add conditional plugin patches in same manner as all other conditional patches. Fix paths of NetX patches and LiveConnect patches. (stamps/plugin- tests.stamp): Depend on stamps/plugin.stamp, not rt- closed.jar. Surround by ENABLE_PLUGIN rather than using a (now broken) test on lib/rt/netscape. * acinclude.m4: Add missing ;;. * patches/extensions/liveconnect-dist.patch: Was patches /icedtea-liveconnect-dist.patch. * patches/extensions/liveconnect.patch: Was patches/icedtea- liveconnect.patch. * patches/extensions/netx-dist.patch: Renamed from patches /icedtea-netx.patch. * patches/extensions/netx-umask.patch: Renamed from patches /icedtea-webstart-umask.patch. * patches/extensions/netx.patch: Renamed from patches/icedtea- webstart.patch. diffstat: 30 files changed, 1261 insertions(+), 892 deletions(-) ChangeLog | 182 ++++++ Makefile.am | 91 +-- acinclude.m4 | 1 patches/extensions/liveconnect-dist.patch | 76 ++ patches/extensions/liveconnect.patch | 89 +++ patches/extensions/netx-dist.patch | 86 +++ patches/extensions/netx-umask.patch | 169 ++++++ patches/extensions/netx.patch | 130 ++++ patches/icedtea-liveconnect-dist.patch | 76 -- patches/icedtea-liveconnect.patch | 89 --- patches/icedtea-netx.patch | 86 --- patches/icedtea-webstart-umask.patch | 169 ------ patches/icedtea-webstart.patch | 130 ---- plugin/icedteanp/IcedTeaNPPlugin.cc | 25 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 86 +-- plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 26 plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java | 18 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 103 ++- plugin/icedteanp/java/sun/applet/PluginCallRequest.java | 22 plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java | 14 plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 20 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 267 ++++++++-- plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 38 + plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 22 plugin/icedteanp/java/sun/applet/PluginStreamHandler.java | 31 - plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java | 19 plugin/tests/LiveConnect/common.js | 3 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 60 +- ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 4 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 21 diffs (truncated from 3069 to 500 lines): diff -r d9f8a98810eb -r 8a1a5c294219 ChangeLog --- a/ChangeLog Tue Jun 01 16:12:06 2010 +0100 +++ b/ChangeLog Tue Jun 01 22:35:00 2010 +0100 @@ -1,3 +1,185 @@ 2010-03-08 Andrew John Hughes + + NetX/plugin build sync (2/3): + * patches/icedtea-liveconnect-dist.patch, + * patches/icedtea-liveconnect.patch, + * patches/icedtea-netx.patch, + * patches/icedtea-webstart-umask.patch, + * patches/icedtea-webstart.patch: + Moved to extensions subdirectory. + * Makefile.am: + (PLUGIN_PATCH): Removed. + (ICEDTEA_PATCHES): Add conditional plugin patches in + same manner as all other conditional patches. Fix + paths of NetX patches and LiveConnect patches. + (stamps/plugin-tests.stamp): Depend on stamps/plugin.stamp, + not rt-closed.jar. Surround by ENABLE_PLUGIN rather than + using a (now broken) test on lib/rt/netscape. + * acinclude.m4: Add missing ;;. + * patches/extensions/liveconnect-dist.patch: + Was patches/icedtea-liveconnect-dist.patch. + * patches/extensions/liveconnect.patch: + Was patches/icedtea-liveconnect.patch. + * patches/extensions/netx-dist.patch: + Renamed from patches/icedtea-netx.patch. + * patches/extensions/netx-umask.patch: + Renamed from patches/icedtea-webstart-umask.patch. + * patches/extensions/netx.patch: + Renamed from patches/icedtea-webstart.patch. ++ +2010-03-13 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (requestPluginCookieInfo): Register cookie info as a priority message. + (requestPluginProxyInfo): Register proxy info as a priority message. + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Re-designed + message consumption to implement priority queuing and parallel + initialization limits so that an arbitrary number of applets can load + without blocking one another, all in a thread-safe manner. + (registerPriorityWait): New method. Registers a string that is + considered a "priority" string, which gets delegated to dedicated worker + threads. + (unRegisterPriorityWait): Unregisters a string so that it is no longer + a priority. + (PluginMessageConsumer): Do not create any workers when starting. + (consume): Remove method. Consumption is now done in a separate dedicated + thread to prevent blocking. + (getPriorityStrIfPriority): New method. If the given message is priority, + return why (i.e the 'priority string'it matched). + (isInInit): New method. Returns if the plugin is currently initializing an + applet. + (addToInitWorkers): New method. Adds given worker to list of workers + currently initializting applets. + (okayToProcess): New method. Returns whether or not it is okay to process + the given applet. + (notifyWorkerIsFree): New method. Notifies this class that a worker has + just become free. + (queue): Queues the given message for consumption. + (ConsumerThread): New protected inner (thread) class. Responsible for + consuming messages in the queue, and regueuing them if consumption if not + possible. + (getFreeWorker): Changed to be non-blocking, and return either a priority + worker or a normal worker depending on what is requested. + * plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java + (PluginMessageHandlerWorker): Set new priority and consumer variables. + (busy): Make thread-safe by waiting on same property that free() waits on. + (free): Make thread-safe by waiting on same property that busy() waits on. + (isPriority): New method. Returns of worker is a priority worker. + (isFree): Made thread-safe, and accounts for priority. + * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java + (startProcessing): Call consumer.queue() instead of consumer.consume(). + (postMessage): Remove unused method. + +2010-03-12 Andrew John Hughes + + * Makefile.am: + (NETX_EXTRA_DIR): Path to extra NetX resource files. + (ICEDTEA_BOOTSTRAP_CLASSES): Explicitly compile BasicDirectoryModel + due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003 + (stamps/icedtea.stamp): Use NETX_RESOURCE_DIR for about.jnlp. + (stamps/icedtea-debug.stamp): Likewise. + (stamps/netx.stamp): Copy the resources to the build directory. + (stamps/extra-class-files.stamp): Use NETX_EXTRA_DIR. + (rt-source-files.txt): Don't search rt directory in build tree. + Support ICEDTEA_BOOTSTRAP_CLASSES. + (netx): New alias. + +2010-03-11 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp + (SharkCompiler::compile_method): Catch typeflow failures more + generally. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::scan_for_traps): New trap. + (SharkTopLevelBlock::do_call): Add assertion to check the above. + (SharkTopLevelBlock::static_subtype_check): Deal with unloaded + object_klass. + +2010-03-11 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: + Whitespace changes. + +2010-03-09 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (consume_message): Handle the new reference field and send it back when + sending proxy and cookie info. + (get_proxy_info): Update response format for proxy information to make it + consistent with new Gecko API. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (newMessageOnBus): Account for the new reference field and send it back + with the response. + (sendWindow): Same. + (eval): Same. + (call): Same. + (sendString): Same. + (setMember): Same. Also, move responding code from _setMember to setMember + for consistency and to solve a rather bad race condition that affected + reliability. + (sendMember): Account for the new reference field and send it back + with the response. + (queue_processor): Move array index slots based on new positions with + reference ids. + (_setMember): Move response code back to setMember. + * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java + (GetMemberPluginCallRequest): Change method signature to receive a + reference identifier. + (parse): Update to handle new reference identifiers. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java + (GetWindowPluginCallRequest): Change method signature to receive a + reference identifier. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Added new + statis private requestIdentityCounter variable that provides unique + reference numbers. + (createPanel): Send a dummy (0) reference number with initialization msg. + (getRequestIdentifier): New method. Returns a unique reference number + and then increments requestIdentityCounter in a thread-safe manner. + (getWindow): Send reference id to getPluginCallRequest. + (getMember): Same. + (setMember): Same. + (setSlot): Same. + (getSlot): Same. + (eval): Same. + (removeMember): Same. + (call): Same. + (requestPluginCookieInfo): Same. + (requestPluginProxyInfo): Same. + (JavaScriptFinalize): Same. + (javascriptToString): Same. + * plugin/icedteanp/java/sun/applet/PluginCallRequest.java: Track reference + numbers instead of the 'return string' marker. + (serviceable): Change from abstract to implemented method, returns weather + or not the given message is servicable by this request based on unique + reference numbers. + * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java + (getPluginCallRequest): Pass reference numbers to concrete class + constructors. + * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java + (PluginCookieInfoRequest): Receive new reference number and pass it to + parent. + (parseString): Update to handle new reference numbers in message. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java + (PluginProxyInfoRequest): Receive new reference number and pass it to + parent. + (parseReturn): Update to handle new reference numbers in message. Also, + parse based on new format returned by the C++ side. + (serviceable): Removed method. serviceable() is now implemented in the + parent class and uses unique reference identifiers. + * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java + (handleMessage): Pass reference to finishCallRequest(). + * plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java + (VoidPluginCallRequest): Update to handle new reference numbers in + message. + * plugin/tests/LiveConnect/common.js + (testAll): Check eval tests checkbox before calling doTest(); + 2010-03-08 Andrew John Hughes * Makefile.am: diff -r d9f8a98810eb -r 8a1a5c294219 Makefile.am --- a/Makefile.am Tue Jun 01 16:12:06 2010 +0100 +++ b/Makefile.am Tue Jun 01 22:35:00 2010 +0100 @@ -95,6 +95,7 @@ JAXWS = $(BUILD_OUTPUT_DIR)/jaxws/drop/j NETX_SRCDIR = $(abs_top_srcdir)/netx NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources +NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources if DTDTYPE_QNAME NEED_JAXWS_SRC = true @@ -126,7 +127,6 @@ ICEDTEA_BOOTSTRAP_DIRS = \ $(SHARE)/javax/script \ $(SHARE)/javax/security/auth/kerberos \ $(SHARE)/javax/security/sasl \ - $(SHARE)/javax/swing/plaf/basic \ $(SHARE)/sun/awt/ \ $(SHARE)/sun/rmi/rmic \ $(SHARE)/sun/tools/java \ @@ -135,6 +135,9 @@ ICEDTEA_BOOTSTRAP_DIRS = \ ICEDTEA_BOOTSTRAP_RESOURCES = \ $(LANGTOOLS)/com/sun/tools/javac/resources + +ICEDTEA_BOOTSTRAP_CLASSES = \ + $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java endif @@ -181,9 +184,8 @@ if ENABLE_NPPLUGIN if ENABLE_NPPLUGIN PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp PLUGIN_BUILD_DIR=$(abs_top_builddir)/plugin.build/icedteanp -ICEDTEANPPLUGIN_TARGET = stamps/icedtea-npplugin +ICEDTEANPPLUGIN_TARGET = stamps/icedtea-npplugin.stamp ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin -PLUGIN_PATCH = patches/icedtea-liveconnect.patch LIVECONNECT_DIR = sun/applet netscape JNLP_ABOUT_TARGET = extra-lib/about.jar LIVECONNECT_CLASSES = $(abs_top_builddir)/liveconnect @@ -195,7 +197,6 @@ PLUGIN_BUILD_DIR=$(abs_top_builddir)/plu PLUGIN_BUILD_DIR=$(abs_top_builddir)/plugin.build/icedtea ICEDTEAPLUGIN_TARGET = $(PLUGIN_BUILD_DIR)/IcedTeaPlugin.so ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin -PLUGIN_PATCH = patches/icedtea-liveconnect.patch LIVECONNECT_DIR = sun/applet netscape JNLP_ABOUT_TARGET = extra-lib/about.jar LIVECONNECT_CLASSES = $(abs_top_builddir)/liveconnect @@ -267,9 +268,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-copy-plugs.patch \ patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ patches/icedtea-ssl.patch \ - $(PLUGIN_PATCH) \ - patches/icedtea-webstart.patch \ - patches/icedtea-webstart-umask.patch \ patches/icedtea-rmi_amd64.patch \ patches/icedtea-tools.patch \ patches/icedtea-demos.patch \ @@ -317,12 +315,14 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ patches/icedtea-demo-swingapplet.patch \ patches/icedtea-jvmtiEnv.patch \ - patches/icedtea-netx.patch \ patches/icedtea-disable-intree-ec.patch \ patches/icedtea-sources.patch \ patches/no-precompiled.patch \ patches/parisc.patch \ - patches/sh4-support.patch + patches/sh4-support.patch \ + patches/extensions/netx.patch \ + patches/extensions/netx-dist.patch \ + patches/extensions/netx-umask.patch # Conditional patches @@ -374,10 +374,12 @@ endif endif if ENABLE_PLUGIN -ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch +ICEDTEA_PATCHES += patches/extensions/liveconnect.patch \ + patches/extensions/liveconnect-dist.patch else if ENABLE_NPPLUGIN -ICEDTEA_PATCHES += patches/icedtea-liveconnect-dist.patch +ICEDTEA_PATCHES += patches/extensions/liveconnect.patch \ + patches/extensions/liveconnect-dist.patch endif endif @@ -1793,8 +1795,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \ - stamps/netx-dist.stamp stamps/liveconnect-dist.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + stamps/netx-dist.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -1827,11 +1828,9 @@ if ENABLE_PULSE_JAVA $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext endif if JNLP_ABOUT_NEEDED - cp $(NETX_RESOURCE_DIR)/about.jnlp \ - extra-lib/about.jar \ + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib - cp $(NETX_RESOURCE_DIR)/about.jnlp \ - extra-lib/about.jar \ + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib endif if ZERO_BUILD @@ -1911,11 +1910,9 @@ if ENABLE_PULSE_JAVA $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext endif if JNLP_ABOUT_NEEDED - cp $(NETX_RESOURCE_DIR)/default.jnlp \ - extra-lib/about.jar \ + cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib - cp $(NETX_RESOURCE_DIR)/default.jnlp \ - extra-lib/about.jar \ + cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib endif if ZERO_BUILD @@ -2070,8 +2067,8 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT $(MOZILLA_LIBS)\ -shared -o $@ -stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so - touch stamps/icedtea-npplugin +stamps/icedtea-npplugin.stamp: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so + touch stamps/icedtea-npplugin.stamp clean-IcedTeaNPPlugin: rm -f $(addprefix $(PLUGIN_BUILD_DIR)/,$(NPPLUGIN_OBJECTS)) @@ -2104,7 +2101,8 @@ clean-IcedTeaPlugin: rm -f $(PLUGIN_BUILD_DIR)/IcedTeaPlugin.so endif -stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) +stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \ + stamps/liveconnect-dist.stamp mkdir -p stamps touch $@ @@ -2122,7 +2120,7 @@ liveconnect-source-files.txt: stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp if test "x${LIVECONNECT_DIR}" != x; then \ - mkdir -p $(LIVECONNECT_CLASSES) ; \ + mkdir -p $(LIVECONNECT_CLASSES) && \ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -d $(LIVECONNECT_CLASSES) \ -classpath $(ICEDTEA_RT):$(NETX_CLASSES) \ @@ -2167,6 +2165,7 @@ stamps/netx.stamp: netx-source-files.txt -sourcepath $(NETX_SRCDIR):$(SOURCEPATH_DIRS) \ -bootclasspath \'\' \ @netx-source-files.txt ; + cp -r $(NETX_RESOURCE_DIR) $(NETX_CLASSES)/net/sourceforge/jnlp mkdir -p stamps touch $@ @@ -2199,8 +2198,7 @@ stamps/extra-class-files.stamp: extra-so -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \ -bootclasspath \'\' \ @extra-source-files.txt - cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \ - extra-lib/net/sourceforge/jnlp/about + cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';' mkdir -p stamps @@ -2555,30 +2553,19 @@ clean-add-zero-debug: # plugin tests -stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) \ - bootstrap/jdk1.7.0/jre/lib/rt-closed.jar +if ENABLE_PLUGIN +stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/plugin.stamp mkdir -p plugin/tests/LiveConnect - if test -d lib/rt/netscape ; then \ - set -e ; \ - if ! test -d $(ICEDTEA_BOOT_DIR) ; then \ - $(JAVAC) $(MEMORY_LIMIT) -g -d plugin/tests/LiveConnect \ - -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ - -source 1.5 $(PLUGIN_TEST_SRCS) ; \ - $(JAR) cf plugin/tests/LiveConnect/PluginTest.jar \ - plugin/tests/LiveConnect/*.class ; \ - else \ - $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \ - -d plugin/tests/LiveConnect \ - -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \ - -source 1.5 $(PLUGIN_TEST_SRCS) ; \ - $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ - plugin/tests/LiveConnect/*.class ; \ - fi ; \ - cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; \ - echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \ - fi + $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ + -d plugin/tests/LiveConnect \ + -classpath $(LIVECONNECT_JAR) $(PLUGIN_TEST_SRCS) ; + $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ + plugin/tests/LiveConnect/*.class ; + cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; + echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \ mkdir -p stamps touch stamps/plugin-tests.stamp +endif # jtreg @@ -2676,11 +2663,13 @@ jtregcheck: jtreg check-hotspot check-la # Support classes for non-OpenJDK bootstraps rt-source-files.txt: $(OPENJDK_BOOT_TREE) - $(FIND) $(abs_top_builddir)/rt -name '*.java' \ - | sort -u > $@ for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \ do \ $(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \ + done + for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \ + do \ + echo $$files >> $@ ; \ done stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt @@ -2799,6 +2788,8 @@ native-ecj: stamps/native-ecj.stamp nbplatform: stamps/nbplatform.stamp +netx: stamps/netx.stamp + netx-dist: stamps/netx-dist.stamp overlay: stamps/overlay.stamp diff -r d9f8a98810eb -r 8a1a5c294219 acinclude.m4 --- a/acinclude.m4 Tue Jun 01 16:12:06 2010 +0100 +++ b/acinclude.m4 Tue Jun 01 22:35:00 2010 +0100 @@ -74,6 +74,7 @@ JRE_ARCH_DIR=s390x CROSS_TARGET_ARCH=s390x ARCHFLAG="-m64" + ;; *) BUILD_ARCH_DIR=`uname -m` INSTALL_ARCH_DIR=$BUILD_ARCH_DIR diff -r d9f8a98810eb -r 8a1a5c294219 patches/extensions/liveconnect-dist.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/extensions/liveconnect-dist.patch Tue Jun 01 22:35:00 2010 +0100 @@ -0,0 +1,76 @@ +diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk +--- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 +@@ -0,0 +1,28 @@ ++# ++# Copyright 2009 Red Hat, 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. Red Hat 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. ++# ++ ++# The specific packages that come from or go to rt.jar and tools.jar ++IMPORT_RT_PACKAGES += \ ++ netscape/javascript \ ++ sun/applet ++ ++IMPORT_TOOLS_PACKAGES += ++ +diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk +--- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 ++++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 +@@ -49,6 +49,9 @@ + ifndef NETX_DIST + include $(BUILDDIR)/common/internal/Defs-netx.gmk + endif ++ifndef LIVECONNECT_DIST ++ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk ++endif + + # Clean up these lists so empty lists are empty + IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) +@@ -123,6 +126,7 @@ + $(call import-one-sources,JAXP_DIST,$1) + $(call import-one-sources,JAXWS_DIST,$1) + $(call import-one-sources,NETX_DIST,$1) ++$(call import-one-sources,LIVECONNECT_DIST,$1) + endef + + # Import all component docs into directory $1 (optional) +@@ -162,6 +166,7 @@ From xerxes at zafena.se Tue Jun 1 15:00:47 2010 From: xerxes at zafena.se (Xerxes Ranby) Date: Wed, 02 Jun 2010 00:00:47 +0200 Subject: Cross-compiling IcedTea7 In-Reply-To: <20100601163938.GA27371@avionic-design.de> References: <20100601163938.GA27371@avionic-design.de> Message-ID: <4C05830F.1050100@zafena.se> Thierry Reding wrote: > Hi, > > I've been trying to get IcedTea 7 to cross-compile, without much success. So > I went and gave OpenJDK a try and had some more luck. My plan now is to try > and take some of the insight from that and give IcedTea another try. > How far did you get by cross compiling OpenJDK directly? Do you mind elaborate what worked and what did not. What are your host and target for your cross compilation? > One of the problems with IcedTea is that it runs two iterations of the build, > If you already have a bootstrap JVM then you can make Icedtea 7 skip the bootstrap generation by configure it with --disable-bootstrap and thus only need to run one iteration. > the bootstrap stage as well as the final stage. Am I correct in assuming that > when cross-compiling the bootstrap stage should actually be built for the > architecture of the build host, and the final stage should then use that > bootstrap to build OpenJDK for the target architecture (or host architecture > in autoconf speak)? Yes you are correct, the bootstrap JVM needs to be run by the build host. You also must make sure that some helper binaries like sizer are generated for the build host during the final build stage. Sanity checks that runs binaries of the final build like the hotspot "test_gamma queens" must also be disabled in a cross-compile setup. > Currently both stages are built for one architecture, > which obviously will not work for a cross-compile. > In late 2008 Robert Schuster sorted out how to cross-compile Icedtea 6 and how to automated the process using the Jalimo and OpenEmbedded cross-compile build environment. http://rschuster.blogs.evolvis.org/2008/12/21/serving-cross-compiled-openjdk-with-icedtea/ - summary of steps involved to cross-compile icedtea6 and what needs to be looked into to make OpenJDK cross-compile aware. http://wiki.evolvis.org/jalimo/index.php/CrossCompilingOpenJDK - Roberts detailed notes on the steps needed for manual patching/hacking of OpenJDK to make it work. The Jalimo cross-compile recipes have since evolved and we can up to date automate cross-compiles up to icedtea 6 1.7.x. You might get some inspiration from the Jalimo recipes on how to make Icedtea 7 and OpenJDK in general more cross-compile-able. https://evolvis.org/scm/viewvc.php/trunk/oe-overlay/packages/icedtea/?root=jalimo > One general question is how much of the changes that actually modify code in > OpenJDK can go upstream and what needs to go into IcedTea patches. If you have signed the SCA then please make as much as possible go upstream into OpenJDK! The IcedTea project have the ability to locally host contributions and patches that for some reason cant go upstream into OpenJDK. > Preparing > patches against an OpenJDK tree and applying them in the IcedTea build also > turns out not to be an optimal workflow. What is the usual practice? > There are no usual practise ;) My workflow are to build icedtea out of tree, I usually do something like this: hg clone http://icedtea.classpath.org/hg/icedtea cd icedtea ./autogen.sh cd .. mkdir icedtea-build cd icedtea-build ../icedtea/configure make after the build finish then I fix things in the icedtea-build/openjdk dir with fixes in place then i get back to the icedtea-build dir, removes any blocking stamp file and restart the build. cd icedtea-build rm stamps/icedtea.stamp make personally i use a tool named quilt to easily keep track of my changes on the openjdk src dir so that i can quickly create patches without having to maintain a backup openjdk src tree to diff against. if i have made something worthwhile then i try file it upstream and possibly file a identical patch for IcedTea that contains the sun bug number, by doing so enables us to easily keep track when a upstream patch ends up in the next openjdk release or get backported. > Thierry > Cheers and have a reat day! Xerxes From thierry.reding at avionic-design.de Wed Jun 2 00:20:41 2010 From: thierry.reding at avionic-design.de (Thierry Reding) Date: Wed, 2 Jun 2010 09:20:41 +0200 Subject: Cross-compiling IcedTea7 In-Reply-To: <4C05830F.1050100@zafena.se> References: <20100601163938.GA27371@avionic-design.de> <4C05830F.1050100@zafena.se> Message-ID: <20100602072041.GA24961@avionic-design.de> * Xerxes Ranby wrote: > Thierry Reding wrote: > >Hi, > > > >I've been trying to get IcedTea 7 to cross-compile, without much success. So > >I went and gave OpenJDK a try and had some more luck. My plan now is to try > >and take some of the insight from that and give IcedTea another try. > How far did you get by cross compiling OpenJDK directly? Do you mind > elaborate what worked and what did not. > > What are your host and target for your cross compilation? My target platform is an i686 processor, while my build computer is x86_64. Getting this to work was not very difficult because build-time tests were actually able to execute. But I also managed to get things to build for an ARM target. I've been able to runtime test the cross-build, using the cross-built javac on the target to build a simple "Hello, World" application and run it with the cross-built java interpreter. However I only tested the runtime on the i686 target because I couldn't get my hands on ARM hardware. > >One of the problems with IcedTea is that it runs two iterations of the build, > If you already have a bootstrap JVM then you can make Icedtea 7 skip > the bootstrap generation by configure it with > --disable-bootstrap and thus only need to run one iteration. Yeah, I was thinking about that as well. But then I thought it would be just as nice if IcedTea was able to bootstrap everything itself, even in cross-compilation mode, instead of me building OpenJDK once and then run the IcedTea build with --disable-bootstrap. > >the bootstrap stage as well as the final stage. Am I correct in assuming that > >when cross-compiling the bootstrap stage should actually be built for the > >architecture of the build host, and the final stage should then use that > >bootstrap to build OpenJDK for the target architecture (or host architecture > >in autoconf speak)? > Yes you are correct, the bootstrap JVM needs to be run by the build host. > > You also must make sure that some helper binaries like sizer are > generated for the build host during the final build stage. Sanity > checks that runs binaries of the final build like the hotspot > "test_gamma queens" must also be disabled in a cross-compile setup. Right, that's the sort of errors I was running into when building on the x86_64 build computer for the ARM target. I worked around that by defining HOSTCC, HOSTCPPFLAGS, HOSTCFLAGS and HOSTLDFLAGS. > >Currently both stages are built for one architecture, > >which obviously will not work for a cross-compile. > In late 2008 Robert Schuster sorted out how to cross-compile Icedtea > 6 and how to automated the process using the Jalimo and OpenEmbedded > cross-compile build environment. > http://rschuster.blogs.evolvis.org/2008/12/21/serving-cross-compiled-openjdk-with-icedtea/ > - summary of steps involved to cross-compile icedtea6 and what needs > to be looked into to make OpenJDK cross-compile aware. > http://wiki.evolvis.org/jalimo/index.php/CrossCompilingOpenJDK - > Roberts detailed notes on the steps needed for manual > patching/hacking of OpenJDK to make it work. > > The Jalimo cross-compile recipes have since evolved and we can up to > date automate cross-compiles up to icedtea 6 1.7.x. > > You might get some inspiration from the Jalimo recipes on how to > make Icedtea 7 and OpenJDK in general more cross-compile-able. > https://evolvis.org/scm/viewvc.php/trunk/oe-overlay/packages/icedtea/?root=jalimo Perhaps I should have mentioned that. Initially I tried getting the cross-compile to work based on the Jalimo recipes, though without success. But a the inspiration from Robert's work helped a lot when cross-building OpenJDK. One particular problem comes to mind: IcedTea (and by default OpenJDK as well) don't seem to build everything in the correct order. Corba is usually built before Hotspot, which fails at the linking stage of corba because the libjvm.so is missing. The same goes for libjava.so (built by OpenJDK's jdk target). This is not a problem for native builds because libjvm.so and libjava.so are either provided by gcj in the bootstrap phase or later by the libraries from the bootstrap build in the final phase. This obviously fails for the final phase in a cross-compile. > >One general question is how much of the changes that actually modify code in > >OpenJDK can go upstream and what needs to go into IcedTea patches. > If you have signed the SCA then please make as much as possible go > upstream into OpenJDK! I should probably do that then. Unfortunately I'm on a pretty tight schedule (who isn't?), so I'm hoping I can get as much as possible upstream (either OpenJDK or IcedTea). > The IcedTea project have the ability to locally host contributions > and patches that for some reason cant go upstream into OpenJDK. > >Preparing > >patches against an OpenJDK tree and applying them in the IcedTea build also > >turns out not to be an optimal workflow. What is the usual practice? > There are no usual practise ;) > > My workflow are to build icedtea out of tree, I usually do something > like this: > > hg clone http://icedtea.classpath.org/hg/icedtea > cd icedtea > ./autogen.sh > cd .. > mkdir icedtea-build > cd icedtea-build > ../icedtea/configure > make > > after the build finish then I fix things in the icedtea-build/openjdk dir > with fixes in place then i get back to the icedtea-build dir, > removes any blocking stamp file and restart the build. > cd icedtea-build > rm stamps/icedtea.stamp > make > > personally i use a tool named quilt to easily keep track of my > changes on the openjdk src dir so that i can quickly create patches > without having to maintain a backup openjdk src tree to diff > against. I've worked with quilt before. Perhaps I should use that as well. > if i have made something worthwhile then i try file it upstream and > possibly file a identical patch for IcedTea that contains the sun > bug number, by doing so enables us to easily keep track when a > upstream patch ends up in the next openjdk release or get > backported. Thanks for the input! Cheers, Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100602/d07c9525/attachment.bin From andrew at icedtea.classpath.org Wed Jun 2 06:27:52 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Jun 2010 13:27:52 +0000 Subject: /hg/release/icedtea6-1.7: 2 new changesets Message-ID: changeset 0ebb8329d845 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=0ebb8329d845 author: Deepak Bhole date: Mon Mar 15 13:35:18 2010 -0400 Liveconnect message processing design changes. - Redesigned message consumption/processing model to allow arbitrary number of applets to load without increasing MAX_WORKERS count. - Implemented priority queuing to allow blocking threads to get responses first. - Made message consumption non-blocking and fixed thread-safety issues therein 2010-03-13 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (requestPluginCookieInfo): Register cookie info as a priority message. (requestPluginProxyInfo): Register proxy info as a priority message. * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Re- designed message consumption to implement priority queuing and parallel initialization limits so that an arbitrary number of applets can load without blocking one another, all in a thread-safe manner. (registerPriorityWait): New method. Registers a string that is considered a "priority" string, which gets delegated to dedicated worker threads. (unRegisterPriorityWait): Unregisters a string so that it is no longer a priority. (PluginMessageConsumer): Do not create any workers when starting. (consume): Remove method. Consumption is now done in a separate dedicated thread to prevent blocking. (getPriorityStrIfPriority): New method. If the given message is priority, return why (i.e the 'priority string'it matched). (isInInit): New method. Returns if the plugin is currently initializing an applet. (addToInitWorkers): New method. Adds given worker to list of workers currently initializting applets. (okayToProcess): New method. Returns whether or not it is okay to process the given applet. (notifyWorkerIsFree): New method. Notifies this class that a worker has just become free. (queue): Queues the given message for consumption. (ConsumerThread): New protected inner (thread) class. Responsible for consuming messages in the queue, and regueuing them if consumption if not possible. (getFreeWorker): Changed to be non-blocking, and return either a priority worker or a normal worker depending on what is requested. * plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java (PluginMessageHandlerWorker): Set new priority and consumer variables. (busy): Make thread-safe by waiting on same property that free() waits on. (free): Make thread-safe by waiting on same property that busy() waits on. (isPriority): New method. Returns of worker is a priority worker. (isFree): Made thread-safe, and accounts for priority. * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java (startProcessing): Call consumer.queue() instead of consumer.consume(). (postMessage): Remove unused method. changeset 0424d3023049 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=0424d3023049 author: Deepak Bhole date: Tue Mar 16 10:29:49 2010 -0400 Added support for JSObject.finalize() 2010-03-16 Deepak Bhole * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (newMessageOnBus): Added support for finalize. (finalize): New function. Decrements object reference count by one. (queue_processor): Added support for finalize. * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused function declerations. Added decleration for finalize. diffstat: 7 files changed, 363 insertions(+), 89 deletions(-) ChangeLog | 52 + plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 56 ++ plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 10 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 2 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 267 ++++++++-- plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 38 + plugin/icedteanp/java/sun/applet/PluginStreamHandler.java | 27 - diffs (truncated from 601 to 500 lines): diff -r 92e2665861fb -r 0424d3023049 ChangeLog --- a/ChangeLog Tue Mar 09 15:54:50 2010 -0500 +++ b/ChangeLog Tue Mar 16 10:29:49 2010 -0400 @@ -1,3 +1,55 @@ 2010-03-09 Deepak Bhole + + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (newMessageOnBus): Added support for finalize. + (finalize): New function. Decrements object reference count by one. + (queue_processor): Added support for finalize. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused + function declerations. Added decleration for finalize. + +2010-03-13 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (requestPluginCookieInfo): Register cookie info as a priority message. + (requestPluginProxyInfo): Register proxy info as a priority message. + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Re-designed + message consumption to implement priority queuing and parallel + initialization limits so that an arbitrary number of applets can load + without blocking one another, all in a thread-safe manner. + (registerPriorityWait): New method. Registers a string that is + considered a "priority" string, which gets delegated to dedicated worker + threads. + (unRegisterPriorityWait): Unregisters a string so that it is no longer + a priority. + (PluginMessageConsumer): Do not create any workers when starting. + (consume): Remove method. Consumption is now done in a separate dedicated + thread to prevent blocking. + (getPriorityStrIfPriority): New method. If the given message is priority, + return why (i.e the 'priority string'it matched). + (isInInit): New method. Returns if the plugin is currently initializing an + applet. + (addToInitWorkers): New method. Adds given worker to list of workers + currently initializting applets. + (okayToProcess): New method. Returns whether or not it is okay to process + the given applet. + (notifyWorkerIsFree): New method. Notifies this class that a worker has + just become free. + (queue): Queues the given message for consumption. + (ConsumerThread): New protected inner (thread) class. Responsible for + consuming messages in the queue, and regueuing them if consumption if not + possible. + (getFreeWorker): Changed to be non-blocking, and return either a priority + worker or a normal worker depending on what is requested. + * plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java + (PluginMessageHandlerWorker): Set new priority and consumer variables. + (busy): Make thread-safe by waiting on same property that free() waits on. + (free): Make thread-safe by waiting on same property that busy() waits on. + (isPriority): New method. Returns of worker is a priority worker. + (isFree): Made thread-safe, and accounts for priority. + * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java + (startProcessing): Call consumer.queue() instead of consumer.consume(). + (postMessage): Remove unused method. + 2010-03-09 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc diff -r 92e2665861fb -r 0424d3023049 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Tue Mar 09 15:54:50 2010 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Tue Mar 16 10:29:49 2010 -0400 @@ -119,7 +119,8 @@ PluginRequestProcessor::newMessageOnBus( command == "Call" || command == "GetSlot" || command == "SetSlot" || - command == "Eval") + command == "Eval" || + command == "Finalize") { // Update queue synchronously @@ -665,6 +666,53 @@ PluginRequestProcessor::sendMember(std:: pthread_mutex_unlock(&tc_mutex); } +/** + * Decrements reference count to given object + * + * @param message_parts The request message. + */ + +void +PluginRequestProcessor::finalize(std::vector* message_parts) +{ + std::string type; + std::string command; + int reference; + std::string response = std::string(); + std::string variant_ptr_str = std::string(); + NPVariant* variant_ptr; + NPObject* window_ptr; + int id; + + type = message_parts->at(0); + id = atoi(message_parts->at(1).c_str()); + reference = atoi(message_parts->at(3).c_str()); + variant_ptr_str = message_parts->at(5); + + NPP instance; + get_instance_from_id(id, instance); + + variant_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(variant_ptr_str); + window_ptr = NPVARIANT_TO_OBJECT(*variant_ptr); + browser_functions.releaseobject(window_ptr); + + // remove reference + IcedTeaPluginUtilities::removeInstanceID(variant_ptr); + + // clear memory + free(variant_ptr); + + // We need the context 0 for backwards compatibility with the Java side + IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); + response += " JavaScriptFinalize"; + + plugin_to_java_bus->post(response.c_str()); + + delete message_parts; + +} + + void* queue_processor(void* data) { @@ -725,6 +773,12 @@ queue_processor(void* data) // write methods are synchronized pthread_mutex_lock(&syn_write_mutex); processor->setMember(message_parts); + pthread_mutex_unlock(&syn_write_mutex); + } else if (command == "Finalize") + { + // write methods are synchronized + pthread_mutex_lock(&syn_write_mutex); + processor->finalize(message_parts); pthread_mutex_unlock(&syn_write_mutex); } else { diff -r 92e2665861fb -r 0424d3023049 plugin/icedteanp/IcedTeaPluginRequestProcessor.h --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Tue Mar 09 15:54:50 2010 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Tue Mar 16 10:29:49 2010 -0400 @@ -72,14 +72,6 @@ typedef struct async_call_thread_data /* Internal request reference counter */ static long internal_req_ref_counter; -// JS request processor methods -static void* requestFromMainThread(); -static void* getSlot(void* tdata); -static void* setSlot(void* tdata); -static void* removeMember(void* tdata); -static void* call(void* tdata); -static void* finalize(void* tdata); - /* Given a value and type, performs the appropriate Java->JS type * mapping and puts it in the given variant */ @@ -147,6 +139,8 @@ class PluginRequestProcessor : public Bu /* Evaluate the given script */ void call(std::vector* message_parts); + /* Decrements reference count for given object */ + void finalize(std::vector* message_parts); }; #endif // __ICEDTEAPLUGINREQUESTPROCESSOR_H__ diff -r 92e2665861fb -r 0424d3023049 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Mar 09 15:54:50 2010 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Tue Mar 16 10:29:49 2010 -0400 @@ -1281,6 +1281,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; return null; } + PluginMessageConsumer.registerPriorityWait(reference); streamhandler.postCallRequest(request); streamhandler.write(request.getMessage()); try { @@ -1326,6 +1327,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; "plugin PluginProxyInfo reference " + reference + " " + requestURI, reference); + PluginMessageConsumer.registerPriorityWait(reference); streamhandler.postCallRequest(request); streamhandler.write(request.getMessage()); try { diff -r 92e2665861fb -r 0424d3023049 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Tue Mar 09 15:54:50 2010 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Tue Mar 16 10:29:49 2010 -0400 @@ -38,82 +38,257 @@ package sun.applet; package sun.applet; import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; import java.util.LinkedList; - -import sun.applet.AppletSecurity; +import java.util.Set; class PluginMessageConsumer { - int MAX_WORKERS = 20; + private static int MAX_PARALLEL_INITS = 1; + + // Each initialization requires 5 responses (tag, handle, width, proxy, cookie) + // before the message stack unlocks/collapses. This works out well because we + // want to allow upto 5 parallel tasks anyway + private static int MAX_WORKERS = MAX_PARALLEL_INITS*5; + private static int PRIORITY_WORKERS = MAX_PARALLEL_INITS*2; + + private static Hashtable initWorkers = new Hashtable(2); + LinkedList readQueue = new LinkedList(); + private static LinkedList priorityWaitQueue = new LinkedList(); ArrayList workers = new ArrayList(); PluginStreamHandler streamHandler = null; AppletSecurity as; + ConsumerThread consumerThread = new ConsumerThread(); + /** + * Registers a reference to wait for. Responses to registered priority + * references get handled by priority worker if normal workers are busy. + * + * @param reference The reference to give priority to + */ + public static void registerPriorityWait(Long reference) { + PluginDebug.debug("Registering priority for reference " + reference); + registerPriorityWait("reference " + reference.toString()); + } + + /** + * Registers a string to wait for. + * + * @param searchString the string to look for in a response + */ + public static void registerPriorityWait(String searchString) { + PluginDebug.debug("Registering priority for string " + searchString); + synchronized (priorityWaitQueue) { + if (!priorityWaitQueue.contains(searchString)) + priorityWaitQueue.add(searchString); + } + } + + /** + * Unregisters a priority reference to wait for. + * + * @param reference The reference to remove + */ + public static void unRegisterPriorityWait(Long reference) { + unRegisterPriorityWait(reference.toString()); + } + + /** + * Unregisters a priority string to wait for. + * + * @param searchString The string to unregister from the priority list + */ + public static void unRegisterPriorityWait(String searchString) { + synchronized (priorityWaitQueue) { + priorityWaitQueue.remove(searchString); + } + } + + /** + * Returns the reference for this message. This method assumes that + * the message has a reference number. + * + * @param The message + * @return the reference number + */ + private Long getReference(String[] msgParts) { + return Long.parseLong(msgParts[3]); + } + public PluginMessageConsumer(PluginStreamHandler streamHandler) { as = new AppletSecurity(); this.streamHandler = streamHandler; - - // create some workers at the start... - for (int i=0; i < 3; i++) { - PluginDebug.debug("Creating worker " + i); - PluginMessageHandlerWorker worker = new PluginMessageHandlerWorker(streamHandler, i, as); - worker.start(); - workers.add(worker); - } + this.consumerThread.start(); } - public void consume(String message) { - - PluginDebug.debug("Consumer received message " + message); - - synchronized(readQueue) { - readQueue.add(message); - } + private String getPriorityStrIfPriority(String message) { - PluginDebug.debug("Message " + message + " added to queue. Looking for free worker..."); - final PluginMessageHandlerWorker worker = getFreeWorker(); + synchronized (priorityWaitQueue) { + Iterator it = priorityWaitQueue.iterator(); - synchronized(readQueue) { - if (readQueue.size() > 0) { - worker.setmessage(readQueue.poll()); - } - } + while (it.hasNext()) { + String priorityStr = it.next(); + if (message.indexOf(priorityStr) > 0) + return priorityStr; + } + } - worker.interrupt(); + return null; } - private PluginMessageHandlerWorker getFreeWorker() { + private boolean isInInit(Integer instanceNum) { + return initWorkers.containsKey(instanceNum); + } + + private void addToInitWorkers(Integer instanceNum, PluginMessageHandlerWorker worker) { + synchronized(initWorkers) { + initWorkers.put(instanceNum, worker); + } + } + + private boolean okayToProcess(String[] msgParts) { + + if (msgParts[2].equals("tag")) { + + Integer instanceNum = new Integer(msgParts[1]); + + synchronized(initWorkers) { + if (initWorkers.size() >= MAX_PARALLEL_INITS) { + return false; + } + } + + registerPriorityWait("instance " + instanceNum + " handle"); + registerPriorityWait("instance " + instanceNum + " width"); + + } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) { + Integer instanceNum = new Integer(msgParts[1]); + + // If this instance is not in init, return false immediately. + // Handle/Width messages should NEVER go before tag messages + if (!isInInit(instanceNum)) + return false; + } + + return true; + } + + public void notifyWorkerIsFree(PluginMessageHandlerWorker worker) { + synchronized (initWorkers) { + Iterator i = initWorkers.keySet().iterator(); + while (i.hasNext()) { + Integer key = i.next(); + if (initWorkers.get(key).equals(worker)) + initWorkers.remove(key); + } + } + + consumerThread.interrupt(); + } + + public void queue(String message) { + synchronized(readQueue) { + readQueue.addLast(message); + } + + // Wake that lazy consumer thread + consumerThread.interrupt(); + } + + protected class ConsumerThread extends Thread { + public void run() { + + while (true) { + + String message = null; + + synchronized(readQueue) { + message = readQueue.poll(); + } + + if (message != null) { + + String[] msgParts = message.split(" "); + + // if it is no okay to process just yet, push it back and + if (!okayToProcess(msgParts)) { + synchronized(readQueue) { + readQueue.addLast(message); + } + + continue; // re-loop to try next msg + } + + String priorityStr = getPriorityStrIfPriority(message); + boolean isPriorityResponse = (priorityStr != null); - // FIXME: Can be made more efficient by having an idle worker pool - - while (true) { + //PluginDebug.debug("Message " + message + " (priority=" + isPriorityResponse + ") ready to be processed. Looking for free worker..."); + final PluginMessageHandlerWorker worker = getFreeWorker(isPriorityResponse); + + if (worker == null) { + synchronized(readQueue) { + readQueue.addLast(message); + } + + continue; // re-loop to try next msg + } + + if (msgParts[2].equals("tag")) + addToInitWorkers((new Integer(msgParts[1])), worker); + + if (isPriorityResponse) { + unRegisterPriorityWait(priorityStr); + } + + worker.setmessage(message); + worker.interrupt(); + + } else { + try { + Thread.sleep(1000); + } catch (InterruptedException ie) {} + } + } + } + } + + private PluginMessageHandlerWorker getFreeWorker(boolean prioritized) { + for (PluginMessageHandlerWorker worker: workers) { - if (worker.isFree()) { - PluginDebug.debug("Found free worker with id " + worker.getWorkerId()); + if (worker.isFree(prioritized)) { + PluginDebug.debug("Found free worker (" + worker.isPriority() + ") with id " + worker.getWorkerId()); // mark it busy before returning worker.busy(); return worker; } } - + // If we have less than MAX_WORKERS, create a new worker if (workers.size() <= MAX_WORKERS) { - PluginDebug.debug("Cannot find free worker, creating worker " + workers.size()); - PluginMessageHandlerWorker worker = new PluginMessageHandlerWorker(streamHandler, workers.size(), as); - worker.start(); - workers.add(worker); - worker.busy(); - return worker; - } else { - // else wait + PluginMessageHandlerWorker worker = null; + + if (workers.size() <= (MAX_WORKERS - PRIORITY_WORKERS)) { + PluginDebug.debug("Cannot find free worker, creating worker " + workers.size()); + worker = new PluginMessageHandlerWorker(this, streamHandler, workers.size(), as, false); + } else if (prioritized) { + PluginDebug.debug("Cannot find free worker, creating priority worker " + workers.size()); + worker = new PluginMessageHandlerWorker(this, streamHandler, workers.size(), as, true); + } else { + return null; + } + + worker.start(); + worker.busy(); + workers.add(worker); + return worker; + } - - Thread.yield(); - } - - //throw new RuntimeException("Out of message handler workers"); + + // No workers available. Better luck next time! + return null; } } diff -r 92e2665861fb -r 0424d3023049 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Tue Mar 09 15:54:50 2010 -0500 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Tue Mar 16 10:29:49 2010 -0400 @@ -42,15 +42,25 @@ class PluginMessageHandlerWorker extends class PluginMessageHandlerWorker extends Thread { private boolean free = true; + private boolean isPriorityWorker = false; From bugzilla-daemon at icedtea.classpath.org Wed Jun 2 07:17:03 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Jun 2010 14:17:03 +0000 Subject: [Bug 488] Question mark changing into underscore in URLs directed from an applet. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=488 ------- Comment #3 from omajid at redhat.com 2010-06-02 14:17 ------- (In reply to comment #2) > Created an attachment (id=341) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=341&action=view) [details] > Patch for proper decoding of lowercase hex symbols > > Proposed patch for bug in the HEX_TO_INT macro in IcedTeaPluginUtils.h. > I can confirm that the patch fixes the problem. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gbenson at icedtea.classpath.org Wed Jun 2 08:34:48 2010 From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org) Date: Wed, 02 Jun 2010 15:34:48 +0000 Subject: /hg/release/icedtea6-1.7-shark: 16 new changesets Message-ID: changeset 1a7b267eccb8 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=1a7b267eccb8 author: Gary Benson date: Thu Mar 11 16:35:10 2010 -0500 Fix bugs preventing Shark building itself changeset d33878888360 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=d33878888360 author: Gary Benson date: Wed Jun 02 15:46:18 2010 +0100 Fix an issue with lost asynchronous exceptions changeset 97e88099d052 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=97e88099d052 author: Gary Benson date: Wed Jun 02 15:48:00 2010 +0100 Shark updates changeset b7ae2dea1cd1 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=b7ae2dea1cd1 author: Gary Benson date: Wed Jun 02 15:50:04 2010 +0100 PR icedtea/459: shark do nothing on stub frame changeset 22e146a82c40 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=22e146a82c40 author: Gary Benson date: Wed Jun 02 15:51:33 2010 +0100 Update Shark for LLVM 2.8 API change r100304 changeset 34b933268f34 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=34b933268f34 author: Gary Benson date: Wed Jun 02 15:55:32 2010 +0100 Shark calling static jni methods jclass argument fix changeset e91674622c51 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=e91674622c51 author: Gary Benson date: Wed Jun 02 15:56:29 2010 +0100 Fix PR icedtea/324 changeset 72482e71e8cf in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=72482e71e8cf author: Gary Benson date: Wed Jun 02 15:57:27 2010 +0100 Fix PR IcedTea/481 changeset 1d42cf5c96fd in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=1d42cf5c96fd author: Gary Benson date: Wed Jun 02 15:58:55 2010 +0100 Updated Zero to semi-latest upstream changeset c58efa7c6e72 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=c58efa7c6e72 author: Gary Benson date: Fri May 07 11:25:06 2010 +0100 Revert an accidental reversion changeset d22feecddbd7 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=d22feecddbd7 author: Gary Benson date: Wed Jun 02 16:30:20 2010 +0100 Backport new frame anchor and stack overflow code for Zero and Shark changeset 9c0303256eb8 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=9c0303256eb8 author: Gary Benson date: Tue May 11 09:26:09 2010 +0100 Remove a now-unnecessary hack changeset 5c5e31018399 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=5c5e31018399 author: Gary Benson date: Thu May 13 15:53:35 2010 +0100 Fix signedness of T_BYTE and T_CHAR results changeset 137342fa4b62 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=137342fa4b62 author: Gary Benson date: Fri May 14 11:16:36 2010 +0100 Add missing semicolon changeset e24af79dcade in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=e24af79dcade author: Gary Benson date: Fri May 14 13:55:26 2010 +0100 Fix PR icedtea/484 changeset 53901c78cd5f in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=53901c78cd5f author: Gary Benson date: Fri May 14 17:37:29 2010 +0100 Fix stack leak in Shark This commit fixes a bug where having an exception handler in a loop would caused a little bit of stack to be allocated every time the handler was invoked. This code... int a = 23; int b = 0; while (true) { try { int c = a / b; } catch (ArithmeticException e) { // do nothing } } ...would eventually fail with a stack overflow. diffstat: 40 files changed, 1102 insertions(+), 368 deletions(-) ChangeLog | 317 ++++++++++ Makefile.am | 1 patches/icedtea-shark.patch | 21 patches/zero/shark_do_nothing_on_stub_frame.patch | 15 ports/hotspot/make/linux/makefiles/zeroshark.make | 4 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 147 +--- ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 12 ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 9 ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 8 ports/hotspot/src/cpu/zero/vm/entry_zero.hpp | 30 ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp | 4 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 14 ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 22 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 12 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 11 ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 8 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 7 ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 27 ports/hotspot/src/cpu/zero/vm/stack_zero.cpp | 86 ++ ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp | 48 + ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 78 +- ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 24 ports/hotspot/src/share/vm/includeDB_shark | 3 ports/hotspot/src/share/vm/includeDB_zero | 15 ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 12 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 57 + ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 22 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 1 ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 11 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 4 ports/hotspot/src/share/vm/shark/sharkContext.cpp | 6 ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 15 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 53 + ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 10 ports/hotspot/src/share/vm/shark/sharkStack.cpp | 87 ++ ports/hotspot/src/share/vm/shark/sharkStack.hpp | 48 + ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 176 ++++- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 5 ports/hotspot/src/share/vm/shark/shark_globals.hpp | 14 diffs (truncated from 2695 to 500 lines): diff -r 0424d3023049 -r 53901c78cd5f ChangeLog --- a/ChangeLog Tue Mar 16 10:29:49 2010 -0400 +++ b/ChangeLog Fri May 14 17:37:29 2010 +0100 @@ -1,3 +1,309 @@ 2010-03-16 Deepak Bhole + + * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp + (SharkCodeBuffer::inline_data): New method. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::CreateInlineData): Likewise. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::CreateInlineData): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::handle_exception): Inline the exception + handler table in the code buffer rather than creating it on + the stack. + +2010-05-14 Gary Benson + + PR icedtea/484 + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp + (CppInterpreter::normal_entry): Return int instead of void. + (CppInterpreter::native_entry): Likewise. + (CppInterpreter::accessor_entry): Likewise. + (CppInterpreter::empty_entry): Likewise. + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp + (CppInterpreter::normal_entry): Return 0. + (CppInterpreter::native_entry): Likewise. + (CppInterpreter::accessor_entry): Likewise. + (CppInterpreter::empty_entry): Likewise. + * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp + (ZeroEntry::NormalEntryFunc): Return int instead of void. + (ZeroEntry::OSREntryFunc): Likewise. + (ZeroEntry::invoke): Deoptimize where necessary. + (ZeroEntry::invoke_osr): Likewise. + (ZeroEntry::maybe_deoptimize): New method. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::deoptimized_entry_point): New method. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::uncommon_trap): Return int instead of void. + (SharkBuilder::deoptimized_entry_point): New method. + * ports/hotspot/src/share/vm/shark/sharkContext.cpp + (SharkContext::SharkContext): Updated entry point types. + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Make generated wrappers + return 0 instead of void. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::uncommon_trap): Return int instead of void. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::uncommon_trap): Don't enter the interpreter, + just return the number of frames that have been deoptimized. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::do_trap): Return the number of deoptimized + frames instead of void. + (SharkTopLevelBlock::handle_return): Return 0 instead of void. + (SharkTopLevelBlock::do_call): Deoptimize where necessary. + + * ports/hotspot/make/linux/makefiles/zeroshark.make: + Note that ARM interpreter needs updating for this change too. + +2010-05-14 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp + (AbstractInterpreter::layout_activation): Add missing semicolon. + +2010-05-13 Gary Benson + + PR icedtea/483 + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Fix signedness of T_BYTE + and T_CHAR results. + +2010-05-11 Gary Benson + + PR icedtea/323 + * patches/icedtea-shark.patch + (Deoptimization::create_vframeArray): Remove a now-unnecessary hack. + +2010-05-10 Gary Benson + + PR icedtea/323 + * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp + (JavaFrameAnchor::_last_Java_fp): New field. + (JavaFrameAnchor::clear): Also clear the above. + (JavaFrameAnchor::set): New method. + (JavaFrameAnchor::copy): Use the above. + (JavaFrameAnchor::set_lat_Java_sp): Removed. + (JavaFrameAnchor::last_Java_fp): New method. + (JavaFrameAnchor::last_Java_fp_offset): Likewise. + * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp + (JavaThread::last_Java_fp): Likewise. + (JavaThread::last_Java_fp_offset): Likewise. + (JavaThread::set_last_Java_frame): Use new new frame anchor code. + (JavaThread::reset_last_Java_frame): Likewise. + (JavaThread::pd_last_frame): Likewise. + * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp + (frame::frame): Flipped arguments. + (frame::_fp): Replaced with... + (frame::_zeroframe): New field. + (frame::fp): Updated. + (frame::zeroframe): Likewise. + * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp + (frame::frame): Likewise. + (frame::sender_sp): Likewise. + (frame::id): Likewise. + * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp + (frame::sender_for_entry_frame): Likewise. + (frame::sender_for_nonentry_frame): Likewise. + (frame::zero_print_on_error): Likewise. + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp + (AbstractInterpreter::layout_activation): Use new frame + anchor code. + + * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp + (ZeroStack::suggest_size): New method. + (ZeroStack::total_words): Likewise. + (ZeroStack::abi_stack_available): Likewise. + (ZeroStack::zap): Likewise. + * ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp + (ZeroStack::abi_stack_available): New method. + (ZeroStack::overflow_check): Use the above. + * ports/hotspot/src/cpu/zero/vm/stack_zero.cpp + (ZeroStack::suggest_size): New method. + (ZeroStack::zap): Likewise. + (ZeroStack::handle_overflow): Use new frame anchor code. + * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp + (StubGenerator::call_stub): Use ZeroStack::suggest_size. + + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::throw_StackOverflowError): New method. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::throw_StackOverflowError): Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.hpp + (SharkStack::initialize): Removed argument. + (SharkStack::CreateStackOverflowCheck): Updated. + (SharkStack::CreateCheckStack): Removed method. + (SharkStack::frame_anchor_addr): Likewise. + (SharkStack::last_Java_sp_addr): New method. + (SharkStack::last_Java_fp_addr): New method. + (SharkStack::CreateSetLastJavaFrame): Use new frame anchor code. + (SharkStack::CreateResetLastJavaFrame): Likewise. + (SharkStack::CreateAssertLastJavaSPIsNull): New method. + * ports/hotspot/src/share/vm/shark/sharkStack.cpp + (SharkStack::initialize): Updated for new stack overflow code. + (SharkStack::CreateStackOverflowCheck): Likewise. + (SharkStack::CreateCheckStack): Removed. + (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated + for new stack overflow code. + (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise. + (SharkStack::CreateAssertLastJavaSPIsNull): New method. + + * ports/hotspot/make/linux/makefiles/zeroshark.make + (CFLAGS): Remove -DHOTSPOT_ASM until the ARM interpreter + and JIT are updated to use the new frame anchor code. + + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Whitespace fix. + +2010-05-07 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp + (ZeroStack::_shadow_pages_size): New field. + (ZeroStack::ZeroStack): Initialize the above. + (ZeroStack::shadow_pages_size): New method. + (ZeroStack::overflow_check): Likewise. + (ZeroStack::handle_overflow): Likewise. + * ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp: New file. + * ports/hotspot/src/cpu/zero/vm/stack_zero.cpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp + (CppInterpreter::stack_overflow_imminent): Removed. + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp + (CppInterpreter::stack_overflow_imminent): Likewise. + (CppInterpreter::normal_entry): Use new stack overflow code. + (CppInterpreter::main_loop): Likewise. + (CppInterpreter::native_entry): Likewise. + (InterpreterFrame::build): Likewise. + * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp + (EntryFrame::build): Likewise. + * ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp + (FakeStubFrame::build): Likewise. + * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp + (InterpreterFrame::build): Likewise. + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp + (InterpreterRuntime::slow_signature_handler): Likewise. + * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp + (StubGenerator::call_stub): Likewise. + (EntryFrame::build): Likewise. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::uncommon_trap): Likewise. + (FakeStubFrame::build): Likewise. + + * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp + (JavaThread::set_last_Java_frame): Refactored. + (JavaThread::reset_last_Java_frame): Likewise. + + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Updated. + * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise. + + * ports/hotspot/src/share/vm/includeDB_zero: Updated. + * ports/hotspot/src/share/vm/includeDB_shark: Likewise. + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::end_frame): Updated for newer HotSpot. + +2010-05-05 Gary Benson + + PR icedtea/481 + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::improve_virtual_call): Disable an + optimization that cannot currently be supported. + +2010-04-30 Gary Benson + + PR icedtea/324 + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::do_aload): Cope with cases where + the array's type is unknown. + (SharkTopLevelBlock::do_astore): Likewise. + +2010-04-22 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Shark calling static jni + methods jclass argument fix. + +2010-04-19 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::memset): Update Shark for LLVM 2.8 API change. + LLVM 2.8 added a fifth isVolatile field for memset + introduced with LLVM r100304. + (SharkBuilder::CreateMemset): Likewise + +2010-04-12 Xerxes R??nby + + PR icedtea/459: + * Makefile.am: (ICEDTEA_PATCHES): + Apply patches/zero/shark_do_nothing_on_stub_frame.patch. + * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp + (frame::is_fake_stub_frame): New method. + * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp + (frame::is_fake_stub_frame): Likewise. + * patches/zero/shark_do_nothing_on_stub_frame.patch: New. + +2010-03-19 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp + (Disassembler::pd_instruction_alignment): Return a usable default. + (Disassembler::pd_cpu_opts): Likewise. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::do_field_access): Indentation fixes. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::throw_ArithmeticException): New method. + (SharkBuilder::throw_ClassCastException): Likewise. + (SharkBuilder::frame_address): Likewise. + (SharkBuilder::CreateGetFrameAddress): Likewise. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::throw_ArithmeticException): New method. + (SharkBuilder::throw_ClassCastException): Likewise. + (SharkBuilder::frame_address): Likewise. + (SharkBuilder::CreateGetFrameAddress): Likewise. + (SharkBuilder::CreateMemoryBarrier): Actually do something on x86. + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Implemented UseMembar code. + * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp + (SharkRuntime::throw_ArithmeticException): New method. + (SharkRuntime::throw_ClassCastException): Likewise. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::throw_ArithmeticException): New method. + (SharkRuntime::throw_ClassCastException): Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.hpp + (SharkStack::initialize): Added setup_sp_and_method parameter. + (SharkStack::CreateStackOverflowCheck): New method. + (SharkStack::CreateCheckStack): Likewise. + (SharkStack::interpreter_entry_point): Likewise. + (SharkStackWithNormalFrame::interpreter_entry_point): Likewise. + (SharkStackWithNativeFrame::interpreter_entry_point): Likewise. + (SharkStack::CreateHardStackOverflowCheck): Removed. + (SharkStack::CreateSoftStackOverflowCheck): Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.cpp + (SharkStack::initialize): Added setup_sp_and_method parameter, + and changed to use new stack overflow detection code. + (SharkStack::CreateStackOverflowCheck): New method. + (SharkStack::CreateCheckStack): Likewise. + (SharkStack::CreateHardStackOverflowCheck): Removed. + (SharkStack::CreateSoftStackOverflowCheck): Likewise. + (SharkStackWithNormalFrame::interpreter_entry_point): Likewise. + (SharkStackWithNativeFrame::interpreter_entry_point): Likewise. + (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated. + (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::static_field_ok_in_clinit): New method. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::scan_for_traps): New trap. + (SharkTopLevelBlock::static_field_ok_in_clinit): New method. + (SharkTopLevelBlock::zero_check_value): Throw arithmetic exception + for divide by zero. + (SharkTopLevelBlock::do_full_instance_check): Throw class cast + exception. + (SharkTopLevelBlock::do_monitorexit): Do not handle exceptions. + * ports/hotspot/src/share/vm/shark/shark_globals.hpp: + Make debugging options available in product builds. + +2010-03-18 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp + (CppInterpreter::native_entry): Remove unnecessary calls to + JavaThread::set_do_not_unlock and JavaThread::clr_do_not_unlock, + fixing an issue that caused asynchronous exceptions to be lost. + 2010-03-16 Deepak Bhole * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc @@ -205,6 +511,17 @@ 2010-03-18 Pavel Tisnovsky + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp + (SharkCompiler::compile_method): Catch typeflow failures more + generally. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::scan_for_traps): New trap. + (SharkTopLevelBlock::do_call): Add assertion to check the above. + (SharkTopLevelBlock::static_subtype_check): Deal with unloaded + object_klass. 2010-03-11 Gary Benson diff -r 0424d3023049 -r 53901c78cd5f Makefile.am --- a/Makefile.am Tue Mar 16 10:29:49 2010 -0400 +++ b/Makefile.am Fri May 14 17:37:29 2010 +0100 @@ -209,6 +209,7 @@ ICEDTEA_PATCHES = \ patches/zero/6909153.patch \ patches/zero/6913869.patch \ patches/zero/6914622.patch \ + patches/zero/shark_do_nothing_on_stub_frame.patch \ patches/icedtea-notice-safepoints.patch \ patches/icedtea-parisc-opt.patch \ patches/icedtea-lucene-crash.patch \ diff -r 0424d3023049 -r 53901c78cd5f patches/icedtea-shark.patch --- a/patches/icedtea-shark.patch Tue Mar 16 10:29:49 2010 -0400 +++ b/patches/icedtea-shark.patch Fri May 14 17:37:29 2010 +0100 @@ -101,27 +101,6 @@ UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord, caller_adjustment * BytesPerWord, -@@ -890,7 +897,20 @@ - // stuff a C2I adapter we can properly fill in the callee-save - // register locations. - frame caller = fr.sender(reg_map); -+#ifdef ZERO -+ int frame_size; -+ { -+ // In zero, frame::sp() is the *end* of the frame, so -+ // caller.sp() - fr.sp() is the size of the *caller*. -+ RegisterMap dummy_map(thread, false); -+ frame frame_1 = thread->last_frame(); -+ frame frame_2 = frame_1.sender(&dummy_map); -+ assert(frame_2.sp() == fr.sp(), "should be"); -+ frame_size = frame_2.sp() - frame_1.sp(); -+ } -+#else - int frame_size = caller.sp() - fr.sp(); -+#endif // ZERO - - frame sender = caller; - @@ -1057,7 +1077,7 @@ JRT_END diff -r 0424d3023049 -r 53901c78cd5f patches/zero/shark_do_nothing_on_stub_frame.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/zero/shark_do_nothing_on_stub_frame.patch Fri May 14 17:37:29 2010 +0100 @@ -0,0 +1,15 @@ +Index: hotspot/src/share/vm/runtime/frame.cpp +=================================================================== +--- openjdk/hotspot.orig/src/share/vm/runtime/frame.cpp 2010-02-17 04:11:10.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-03-25 10:06:18.334380336 +0100 +@@ -1205,6 +1205,10 @@ + if (is_interpreted_frame()) { oops_interpreted_do(f, map, use_interpreter_oop_map_cache); + } else if (is_entry_frame()) { oops_entry_do (f, map); + } else if (CodeCache::contains(pc())) { oops_code_blob_do (f, map); ++#ifdef SHARK ++ } else if (is_fake_stub_frame()) { ++ // nothing to do ++#endif // SHARK + } else { + ShouldNotReachHere(); + } diff -r 0424d3023049 -r 53901c78cd5f ports/hotspot/make/linux/makefiles/zeroshark.make --- a/ports/hotspot/make/linux/makefiles/zeroshark.make Tue Mar 16 10:29:49 2010 -0400 +++ b/ports/hotspot/make/linux/makefiles/zeroshark.make Fri May 14 17:37:29 2010 +0100 @@ -30,7 +30,9 @@ Obj_Files += asm_helper.o Obj_Files += asm_helper.o Obj_Files += cppInterpreter_arm.o -CFLAGS += -DHOTSPOT_ASM +#XXX disabled until it has the updated frame anchor code (PR icedtea/323) +#XXX and the updated calling convention for deopt (PR icedtea/484) +#CFLAGS += -DHOTSPOT_ASM %.o: %.S @echo Assembling $< diff -r 0424d3023049 -r 53901c78cd5f ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Mar 16 10:29:49 2010 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Fri May 14 17:37:29 2010 +0100 @@ -37,27 +37,18 @@ thread->reset_last_Java_frame(); \ fixup_after_potential_safepoint() -void CppInterpreter::normal_entry(methodOop method, intptr_t UNUSED, TRAPS) { +int CppInterpreter::normal_entry(methodOop method, intptr_t UNUSED, TRAPS) { JavaThread *thread = (JavaThread *) THREAD; - ZeroStack *stack = thread->zero_stack(); - - // Adjust the caller's stack frame to accomodate any additional - // local variables we have contiguously with our parameters. - int extra_locals = method->max_locals() - method->size_of_parameters(); - if (extra_locals > 0) { - if (extra_locals > stack->available_words()) { - Unimplemented(); - } - for (int i = 0; i < extra_locals; i++) - stack->push(0); - } // Allocate and initialize our frame. - InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread); + InterpreterFrame *frame = InterpreterFrame::build(method, CHECK_0); thread->push_zero_frame(frame); // Execute those bytecodes! main_loop(0, THREAD); + + // No deoptimized frames on the stack + return 0; } void CppInterpreter::main_loop(int recurse, TRAPS) { @@ -75,12 +66,6 @@ void CppInterpreter::main_loop(int recur intptr_t *result = NULL; int result_slots = 0; - - // Check we're not about to run out of stack - if (stack_overflow_imminent(thread)) { - CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread)); - goto unwind_and_return; - } while (true) { // We can set up the frame anchor with everything we want at @@ -123,9 +108,9 @@ void CppInterpreter::main_loop(int recur int monitor_words = frame::interpreter_frame_monitor_size(); // Allocate the space - if (monitor_words > stack->available_words()) { - Unimplemented(); - } + stack->overflow_check(monitor_words, THREAD); + if (HAS_PENDING_EXCEPTION) + break; stack->alloc(monitor_words * wordSize); // Move the expression stack contents @@ -172,8 +157,6 @@ void CppInterpreter::main_loop(int recur } } - unwind_and_return: - // Unwind the current frame thread->pop_zero_frame(); @@ -185,7 +168,7 @@ void CppInterpreter::main_loop(int recur stack->push(result[-i]); } -void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) { +int CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) { // Make sure method is native and not abstract assert(method->is_native() && !method->is_abstract(), "should be"); @@ -193,20 +176,13 @@ void CppInterpreter::native_entry(method ZeroStack *stack = thread->zero_stack(); // Allocate and initialize our frame - InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread); + InterpreterFrame *frame = InterpreterFrame::build(method, CHECK_0); thread->push_zero_frame(frame); interpreterState istate = frame->interpreter_state(); intptr_t *locals = istate->locals(); - // Check we're not about to run out of stack - if (stack_overflow_imminent(thread)) { - CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread)); - goto unwind_and_return; From bugzilla-daemon at icedtea.classpath.org Wed Jun 2 08:53:59 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Jun 2010 15:53:59 +0000 Subject: [Bug 488] Question mark changing into underscore in URLs directed from an applet. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=488 ------- Comment #4 from omajid at redhat.com 2010-06-02 15:53 ------- Created an attachment (id=348) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=348&action=view) alternate patch -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Wed Jun 2 08:59:11 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Jun 2010 15:59:11 +0000 Subject: /hg/release/icedtea6-1.6: Backport tzdata support from 1.8 (--wi... Message-ID: changeset c3605faebe92 in /hg/release/icedtea6-1.6 details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=c3605faebe92 author: Andrew John Hughes date: Wed Jun 02 16:59:01 2010 +0100 Backport tzdata support from 1.8 (--with-tzdata-dir). 2009-12-22 Andrew John Hughes Backport --with-tzdata-dir option from IcedTea6. * Makefile.am: (icedtea.stamp): Copy tz.properties when TZDATA_DIR is specified. (icedtea-debug.stamp): Likewise. Add missing -debug suffix. * acinclude.m4: (CHECK_WITH_TZDATA_DIR): Allow a directory containing timezone data to be specified. Defaults to /usr/share/javazi. * configure.ac: Call CHECK_WITH_TZDATA_DIR. * patches/icedtea-use-system-tzdata.patch: New version which uses configurable datadir. As in IcedTea7. * patches/security/icedtea-6824265.patch: Revert to original version from Sun. * tz.properties.in: Input file for tzdata directory setting. diffstat: 7 files changed, 169 insertions(+), 99 deletions(-) ChangeLog | 20 ++++ Makefile.am | 26 +++-- acinclude.m4 | 30 ++++++ configure.ac | 1 patches/icedtea-use-system-tzdata.patch | 142 ++++++++++++++++++------------- patches/security/icedtea-6824265.patch | 48 ++-------- tz.properties.in | 1 diffs (406 lines): diff -r 54c929c868e4 -r c3605faebe92 ChangeLog --- a/ChangeLog Wed Apr 28 23:04:32 2010 +0100 +++ b/ChangeLog Wed Jun 02 16:59:01 2010 +0100 @@ -1,3 +1,23 @@ 2010-04-28 Andrew John Hughes + + Backport --with-tzdata-dir option from IcedTea6. + * Makefile.am: + (icedtea.stamp): Copy tz.properties when TZDATA_DIR + is specified. + (icedtea-debug.stamp): Likewise. Add missing -debug + suffix. + * acinclude.m4: + (CHECK_WITH_TZDATA_DIR): Allow a directory containing timezone + data to be specified. Defaults to /usr/share/javazi. + * configure.ac: Call CHECK_WITH_TZDATA_DIR. + * patches/icedtea-use-system-tzdata.patch: + New version which uses configurable datadir. + As in IcedTea7. + * patches/security/icedtea-6824265.patch: + Revert to original version from Sun. + * tz.properties.in: + Input file for tzdata directory setting. + 2010-04-28 Andrew John Hughes PR icedtea/476 diff -r 54c929c868e4 -r c3605faebe92 Makefile.am --- a/Makefile.am Wed Apr 28 23:04:32 2010 +0100 +++ b/Makefile.am Wed Jun 02 16:59:01 2010 +0100 @@ -560,7 +560,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-timezone.patch \ patches/icedtea-timezone-default-permission.patch \ patches/icedtea-simpletimezone-relax.patch \ - patches/icedtea-use-system-tzdata.patch \ patches/icedtea-headers.patch \ patches/hotspot/$(HSBUILD)/icedtea-headers.patch \ patches/icedtea-ant.patch \ @@ -668,7 +667,8 @@ ICEDTEA_PATCHES = \ patches/icedtea-format-warnings.patch \ patches/icedtea-fortify-source.patch \ patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \ - patches/hotspot/$(HSBUILD)/icedtea-includedb.patch + patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ + patches/icedtea-use-system-tzdata.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -1294,6 +1294,10 @@ if ENABLE_NSS cp $(abs_top_builddir)/nss.cfg \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; endif +if WITH_TZDATA_DIR + cp $(abs_top_builddir)/tz.properties \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; +endif @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) mkdir -p stamps touch stamps/icedtea.stamp @@ -1369,27 +1373,31 @@ if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif if ENABLE_SYSTEMTAP - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ if test $$? -eq 0; then \ sed -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot.stp \ - > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \ sed -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_jni.stp \ - > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ + > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \ else \ cp $(abs_top_builddir)/tapset/hotspot.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \ fi; \ cp $(abs_top_builddir)/tapset/jstack.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp endif if ENABLE_NSS cp $(abs_top_builddir)/nss.cfg \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security; +endif +if WITH_TZDATA_DIR + cp $(abs_top_builddir)/tz.properties \ + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib; endif @echo "IcedTea (debug build) is served:" \ $(BUILD_OUTPUT_DIR)-debug diff -r 54c929c868e4 -r c3605faebe92 acinclude.m4 --- a/acinclude.m4 Wed Apr 28 23:04:32 2010 +0100 +++ b/acinclude.m4 Wed Jun 02 16:59:01 2010 +0100 @@ -1039,3 +1039,33 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK], AC_SUBST(with_openjdk) ]) +AC_DEFUN([AC_CHECK_WITH_TZDATA_DIR], +[ + DEFAULT="/usr/share/javazi" + AC_MSG_CHECKING([which Java timezone data directory to use]) + AC_ARG_WITH([tzdata-dir], + [AS_HELP_STRING(--with-tzdata-dir,set the Java timezone data directory [[default=${DEFAULT}]])], + [ + if test "x${withval}" = x || test "x${withval}" = xyes; then + TZDATA_DIR_SET=yes + TZDATA_DIR="${DEFAULT}" + else + if test "x${withval}" = xno; then + TZDATA_DIR_SET=no + AC_MSG_RESULT([no]) + else + TZDATA_DIR_SET=yes + TZDATA_DIR="${withval}" + fi + fi + ], + [ + TZDATA_DIR="${DEFAULT}" + ]) + if test "x${TZDATA_DIR}" != "x"; then + AC_MSG_RESULT([${TZDATA_DIR}]) + fi + AC_SUBST([TZDATA_DIR]) + AM_CONDITIONAL(WITH_TZDATA_DIR, test "x${TZDATA_DIR}" != "x") + AC_CONFIG_FILES([tz.properties]) +]) diff -r 54c929c868e4 -r c3605faebe92 configure.ac --- a/configure.ac Wed Apr 28 23:04:32 2010 +0100 +++ b/configure.ac Wed Jun 02 16:59:01 2010 +0100 @@ -248,6 +248,7 @@ ENABLE_ZERO_BUILD ENABLE_ZERO_BUILD ENABLE_HG AC_CHECK_WITH_HG_REVISION +AC_CHECK_WITH_TZDATA_DIR if test "x${enable_visualvm}" = "xyes" then diff -r 54c929c868e4 -r c3605faebe92 patches/icedtea-use-system-tzdata.patch --- a/patches/icedtea-use-system-tzdata.patch Wed Apr 28 23:04:32 2010 +0100 +++ b/patches/icedtea-use-system-tzdata.patch Wed Jun 02 16:59:01 2010 +0100 @@ -1,67 +1,99 @@ ---- openjdk6.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Sat Mar 15 13:43:05 2008 -0400 -+++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Fri Aug 21 11:34:56 2009 +0200 -@@ -465,6 +465,27 @@ - */ - public static final byte TAG_TZDataVersion = 68; +# HG changeset patch +# User andrew +# Date 1257348405 0 +# Node ID d03acee39d3b283dbfe972ce9398ea1ce9cdd3fc +# Parent 922421b1938a44633d22fd2a5a1e376a99bb9090 +6593486: (tz) RFE: support user-defined directory path to time zone data files +Summary: Allow the timezone data directory to be changed by setting sun.timezone.dir + +diff -r 922421b1938a -r d03acee39d3b src/share/classes/sun/util/calendar/ZoneInfoFile.java +--- openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Wed Nov 04 12:22:35 2009 +0000 ++++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Wed Nov 04 15:26:45 2009 +0000 +@@ -25,10 +25,12 @@ -+ // Cached location of the TZDATA files -+ private static final String JAVAZI_DIR = setup_JAVAZI_DIR(); + package sun.util.calendar; + ++import java.io.BufferedInputStream; + import java.io.File; + import java.io.FileInputStream; + import java.io.FileNotFoundException; + import java.io.IOException; ++import java.io.InputStream; + import java.lang.ref.SoftReference; + import java.security.AccessController; + import java.security.PrivilegedAction; +@@ -38,6 +40,7 @@ + import java.util.HashMap; + import java.util.List; + import java.util.Map; ++import java.util.Properties; + + /** + * ZoneInfoFile reads Zone information files in the +@@ -473,17 +476,52 @@ + private static Map zoneInfoObjects = null; + + private static final String ziDir; + -+ private static String setup_JAVAZI_DIR() { -+ try { -+ final String dir = AccessController.doPrivileged -+ (new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); + static { +- String zi = (String) AccessController.doPrivileged( +- new sun.security.action.GetPropertyAction("java.home")) +- + File.separator + "lib" + File.separator + "zi"; ++ final String homeDir = ++ AccessController.doPrivileged( ++ new sun.security.action.GetPropertyAction("java.home")); ++ if (homeDir == null) { ++ throw new Error("java.home is not set"); ++ } ++ String zi = homeDir + File.separator + "lib" + ++ File.separator + "zi"; + try { ++ String otherDir = getZoneInfoDir(homeDir); ++ if (otherDir != null) ++ zi = otherDir; + zi = new File(zi).getCanonicalPath(); + } catch (Exception e) { + } + ziDir = zi; + } + ++ private static String getZoneInfoDir(final String homeDir) { ++ try { + return AccessController.doPrivileged -+ (new PrivilegedExceptionAction() { -+ public String run() { -+ File f = new File(dir, "ZoneInfoMappings"); -+ if (f.exists()) -+ return dir; -+ return null; -+ } -+ }); ++ (new PrivilegedExceptionAction() { ++ public String run() throws IOException { ++ File f = new File(homeDir + File.separator + "lib" + ++ File.separator + "tz.properties"); ++ InputStream in = new FileInputStream(f); ++ BufferedInputStream bin = new BufferedInputStream(in); ++ Properties props = new Properties(); ++ props.load(bin); ++ bin.close(); ++ String dir = props.getProperty("sun.zoneinfo.dir"); ++ if (dir == null) ++ return null; ++ File zim = new File(dir, "ZoneInfoMappings"); ++ if (zim.exists()) ++ return dir; ++ return null; ++ } ++ }); + } catch (PrivilegedActionException e) { -+ return null; ++ return null; + } + } + /** - * Excluded zones item tag. (Added in Mustang) - */ -@@ -1021,11 +1042,17 @@ + * Converts the given time zone ID to a platform dependent path + * name. For example, "America/Los_Angeles" is converted to +@@ -1032,8 +1070,8 @@ byte[] buffer = null; try { -- String homeDir = AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("java.home")); -- final String fname = homeDir + File.separator + "lib" + File.separator -- + "zi" + File.separator + fileName; - buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { -+ -+ String zi_dir = JAVAZI_DIR; -+ if (zi_dir == null) { -+ // Fall back to JDK-supplied tzdata -+ String homeDir = (String) AccessController.doPrivileged(new sun.security.action.GetPropertyAction("java.home")); -+ zi_dir = homeDir + File.separator + "lib" + File.separator -+ + "zi"; -+ } -+ -+ final String fname = zi_dir + File.separator + fileName; -+ buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws IOException { - File file = new File(fname); - if (!file.canRead()) { ---- oldopenjdk6/hotspot/src/os/linux/vm/os_linux.cpp 2008-03-26 05:07:22.000000000 -0400 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-05-08 11:03:17.000000000 -0400 -@@ -376,6 +381,11 @@ - } - } - -+ SystemProperty* sp = Arguments::system_properties(); -+ // Use the system zoneinfo files, if present -+ Arguments::PropertyList_add (&sp, -+ "user.zoneinfo.dir", "/usr/share/javazi"); -+ - #undef malloc - #undef getenv - #undef EXTENSIONS_DIR +- public Object run() throws IOException { ++ buffer = AccessController.doPrivileged(new PrivilegedExceptionAction() { ++ public byte[] run() throws IOException { + File file = new File(ziDir, fileName); + if (!file.exists() || !file.isFile()) { + return null; diff -r 54c929c868e4 -r c3605faebe92 patches/security/icedtea-6824265.patch --- a/patches/security/icedtea-6824265.patch Wed Apr 28 23:04:32 2010 +0100 +++ b/patches/security/icedtea-6824265.patch Wed Jun 02 16:59:01 2010 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/src/share/cla diff -Nru openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java ---- openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2009-11-08 23:11:42.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2009-11-08 23:25:32.000000000 +0000 +--- openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2009-04-24 08:34:26.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2010-06-02 16:28:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. @@ -8,30 +8,15 @@ diff -Nru openjdk.orig/jdk/src/share/cla * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it -@@ -465,10 +465,7 @@ - */ - public static final byte TAG_TZDataVersion = 68; - -- // Cached location of the TZDATA files -- private static final String JAVAZI_DIR = setup_JAVAZI_DIR(); -- -- private static String setup_JAVAZI_DIR() { -+ private static String setupJavaZIDir() { - try { - final String dir = AccessController.doPrivileged - (new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); -@@ -493,6 +490,21 @@ +@@ -472,6 +472,18 @@ private static Map zoneInfoObjects = null; + private static final String ziDir; + static { -+ String zi = setupJavaZIDir(); -+ if (zi == null) { -+ zi = AccessController.doPrivileged( ++ String zi = (String) AccessController.doPrivileged( + new sun.security.action.GetPropertyAction("java.home")) -+ + File.separator + "lib" + File.separator + "zi"; -+ } ++ + File.separator + "lib" + File.separator + "zi"; + try { + zi = new File(zi).getCanonicalPath(); + } catch (Exception e) { @@ -42,7 +27,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla /** * Converts the given time zone ID to a platform dependent path * name. For example, "America/Los_Angeles" is converted to -@@ -597,20 +609,7 @@ +@@ -576,20 +588,7 @@ return null; } @@ -64,7 +49,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla int filesize = buf.length; int rawOffset = 0; int dstSavings = 0; -@@ -621,6 +620,18 @@ +@@ -600,6 +599,18 @@ int[] simpleTimeZoneParams = null; try { @@ -83,7 +68,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla while (index < filesize) { byte tag = buf[index++]; int len = ((buf[index++] & 0xFF) << 8) + (buf[index++] & 0xFF); -@@ -1038,36 +1049,34 @@ +@@ -1017,30 +1028,33 @@ * Reads the specified file under <java.home>/lib/zi into a buffer. * @return the buffer, or null if any I/O error occurred. */ @@ -92,18 +77,11 @@ diff -Nru openjdk.orig/jdk/src/share/cla byte[] buffer = null; try { - -- String zi_dir = JAVAZI_DIR; -- if (zi_dir == null) { -- // Fall back to JDK-supplied tzdata -- String homeDir = (String) AccessController.doPrivileged(new sun.security.action.GetPropertyAction("java.home")); -- zi_dir = homeDir + File.separator + "lib" + File.separator -- + "zi"; -- } -- -- final String fname = zi_dir + File.separator + fileName; -- buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { -+ buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { +- String homeDir = AccessController.doPrivileged( +- new sun.security.action.GetPropertyAction("java.home")); +- final String fname = homeDir + File.separator + "lib" + File.separator +- + "zi" + File.separator + fileName; + buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws IOException { - File file = new File(fname); - if (!file.canRead()) { diff -r 54c929c868e4 -r c3605faebe92 tz.properties.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tz.properties.in Wed Jun 02 16:59:01 2010 +0100 @@ -0,0 +1,1 @@ +sun.zoneinfo.dir=@TZDATA_DIR@ From andrew at icedtea.classpath.org Wed Jun 2 09:35:40 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Jun 2010 16:35:40 +0000 Subject: /hg/release/icedtea6-1.7: Backport tzdata support from 1.8 (--wi... Message-ID: changeset 7f0427a81b5b in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=7f0427a81b5b author: Andrew John Hughes date: Wed Jun 02 17:35:32 2010 +0100 Backport tzdata support from 1.8 (--with-tzdata-dir). 2009-12-22 Andrew John Hughes Backport --with-tzdata-dir option from IcedTea6. * Makefile.am: (icedtea.stamp): Copy tz.properties when TZDATA_DIR is specified. (icedtea-debug.stamp): Likewise. Add missing -debug suffix. * acinclude.m4: (CHECK_WITH_TZDATA_DIR): Allow a directory containing timezone data to be specified. Defaults to /usr/share/javazi. * configure.ac: Call CHECK_WITH_TZDATA_DIR. * patches/icedtea-use-system-tzdata.patch: New version which uses configurable datadir. As in IcedTea7. * patches/security/icedtea-6824265.patch: Revert to original version from Sun. * tz.properties.in: Input file for tzdata directory setting. diffstat: 7 files changed, 169 insertions(+), 99 deletions(-) ChangeLog | 20 ++++ Makefile.am | 26 +++-- acinclude.m4 | 30 ++++++ configure.ac | 1 patches/icedtea-use-system-tzdata.patch | 142 ++++++++++++++++++------------- patches/security/icedtea-6824265.patch | 48 ++-------- tz.properties.in | 1 diffs (409 lines): diff -r 0424d3023049 -r 7f0427a81b5b ChangeLog --- a/ChangeLog Tue Mar 16 10:29:49 2010 -0400 +++ b/ChangeLog Wed Jun 02 17:35:32 2010 +0100 @@ -1,3 +1,23 @@ 2010-03-16 Deepak Bhole + + Backport --with-tzdata-dir option from IcedTea6. + * Makefile.am: + (icedtea.stamp): Copy tz.properties when TZDATA_DIR + is specified. + (icedtea-debug.stamp): Likewise. Add missing -debug + suffix. + * acinclude.m4: + (CHECK_WITH_TZDATA_DIR): Allow a directory containing timezone + data to be specified. Defaults to /usr/share/javazi. + * configure.ac: Call CHECK_WITH_TZDATA_DIR. + * patches/icedtea-use-system-tzdata.patch: + New version which uses configurable datadir. + As in IcedTea7. + * patches/security/icedtea-6824265.patch: + Revert to original version from Sun. + * tz.properties.in: + Input file for tzdata directory setting. + 2010-03-16 Deepak Bhole * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc diff -r 0424d3023049 -r 7f0427a81b5b Makefile.am --- a/Makefile.am Tue Mar 16 10:29:49 2010 -0400 +++ b/Makefile.am Wed Jun 02 17:35:32 2010 +0100 @@ -224,7 +224,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-tools.patch \ patches/icedtea-timezone.patch \ patches/icedtea-timezone-default-permission.patch \ - patches/icedtea-use-system-tzdata.patch \ patches/icedtea-headers.patch \ patches/icedtea-headers-hotspot.patch \ patches/icedtea-gcc-suffix.patch \ @@ -332,7 +331,8 @@ ICEDTEA_PATCHES = \ patches/security/20100330/6914823.patch \ patches/security/20100330/6914866.patch \ patches/security/20100330/6932480.patch \ - patches/ant-1.8.0.patch + patches/ant-1.8.0.patch \ + patches/icedtea-use-system-tzdata.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -1347,6 +1347,10 @@ if ENABLE_NSS cp $(abs_top_builddir)/nss.cfg \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; endif +if WITH_TZDATA_DIR + cp $(abs_top_builddir)/tz.properties \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; +endif @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) mkdir -p stamps touch stamps/icedtea.stamp @@ -1424,27 +1428,31 @@ if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif if ENABLE_SYSTEMTAP - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ if test $$? -eq 0; then \ sed -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot.stp \ - > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \ sed -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_jni.stp \ - > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ + > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \ else \ cp $(abs_top_builddir)/tapset/hotspot.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \ fi; \ cp $(abs_top_builddir)/tapset/jstack.stp \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp endif if ENABLE_NSS cp $(abs_top_builddir)/nss.cfg \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security; +endif +if WITH_TZDATA_DIR + cp $(abs_top_builddir)/tz.properties \ + $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib; endif @echo "IcedTea (debug build) is served:" \ $(BUILD_OUTPUT_DIR)-debug diff -r 0424d3023049 -r 7f0427a81b5b acinclude.m4 --- a/acinclude.m4 Tue Mar 16 10:29:49 2010 -0400 +++ b/acinclude.m4 Wed Jun 02 17:35:32 2010 +0100 @@ -1064,6 +1064,36 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK], AC_SUBST(with_openjdk) ]) +AC_DEFUN([AC_CHECK_WITH_TZDATA_DIR], +[ + DEFAULT="/usr/share/javazi" + AC_MSG_CHECKING([which Java timezone data directory to use]) + AC_ARG_WITH([tzdata-dir], + [AS_HELP_STRING(--with-tzdata-dir,set the Java timezone data directory [[default=${DEFAULT}]])], + [ + if test "x${withval}" = x || test "x${withval}" = xyes; then + TZDATA_DIR_SET=yes + TZDATA_DIR="${DEFAULT}" + else + if test "x${withval}" = xno; then + TZDATA_DIR_SET=no + AC_MSG_RESULT([no]) + else + TZDATA_DIR_SET=yes + TZDATA_DIR="${withval}" + fi + fi + ], + [ + TZDATA_DIR="${DEFAULT}" + ]) + if test "x${TZDATA_DIR}" != "x"; then + AC_MSG_RESULT([${TZDATA_DIR}]) + fi + AC_SUBST([TZDATA_DIR]) + AM_CONDITIONAL(WITH_TZDATA_DIR, test "x${TZDATA_DIR}" != "x") + AC_CONFIG_FILES([tz.properties]) +]) AC_DEFUN([IT_CHECK_ADDITIONAL_VMS], [ AC_MSG_CHECKING([for additional virtual machines to build]) diff -r 0424d3023049 -r 7f0427a81b5b configure.ac --- a/configure.ac Tue Mar 16 10:29:49 2010 -0400 +++ b/configure.ac Wed Jun 02 17:35:32 2010 +0100 @@ -198,6 +198,7 @@ ENABLE_HG ENABLE_HG AC_CHECK_WITH_HG_REVISION IT_CHECK_XULRUNNER_VERSION +AC_CHECK_WITH_TZDATA_DIR if test "x${enable_visualvm}" = "xyes" then diff -r 0424d3023049 -r 7f0427a81b5b patches/icedtea-use-system-tzdata.patch --- a/patches/icedtea-use-system-tzdata.patch Tue Mar 16 10:29:49 2010 -0400 +++ b/patches/icedtea-use-system-tzdata.patch Wed Jun 02 17:35:32 2010 +0100 @@ -1,67 +1,99 @@ ---- openjdk6.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Sat Mar 15 13:43:05 2008 -0400 -+++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Fri Aug 21 11:34:56 2009 +0200 -@@ -465,6 +465,27 @@ - */ - public static final byte TAG_TZDataVersion = 68; +# HG changeset patch +# User andrew +# Date 1257348405 0 +# Node ID d03acee39d3b283dbfe972ce9398ea1ce9cdd3fc +# Parent 922421b1938a44633d22fd2a5a1e376a99bb9090 +6593486: (tz) RFE: support user-defined directory path to time zone data files +Summary: Allow the timezone data directory to be changed by setting sun.timezone.dir + +diff -r 922421b1938a -r d03acee39d3b src/share/classes/sun/util/calendar/ZoneInfoFile.java +--- openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Wed Nov 04 12:22:35 2009 +0000 ++++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Wed Nov 04 15:26:45 2009 +0000 +@@ -25,10 +25,12 @@ -+ // Cached location of the TZDATA files -+ private static final String JAVAZI_DIR = setup_JAVAZI_DIR(); + package sun.util.calendar; + ++import java.io.BufferedInputStream; + import java.io.File; + import java.io.FileInputStream; + import java.io.FileNotFoundException; + import java.io.IOException; ++import java.io.InputStream; + import java.lang.ref.SoftReference; + import java.security.AccessController; + import java.security.PrivilegedAction; +@@ -38,6 +40,7 @@ + import java.util.HashMap; + import java.util.List; + import java.util.Map; ++import java.util.Properties; + + /** + * ZoneInfoFile reads Zone information files in the +@@ -473,17 +476,52 @@ + private static Map zoneInfoObjects = null; + + private static final String ziDir; + -+ private static String setup_JAVAZI_DIR() { -+ try { -+ final String dir = AccessController.doPrivileged -+ (new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); + static { +- String zi = (String) AccessController.doPrivileged( +- new sun.security.action.GetPropertyAction("java.home")) +- + File.separator + "lib" + File.separator + "zi"; ++ final String homeDir = ++ AccessController.doPrivileged( ++ new sun.security.action.GetPropertyAction("java.home")); ++ if (homeDir == null) { ++ throw new Error("java.home is not set"); ++ } ++ String zi = homeDir + File.separator + "lib" + ++ File.separator + "zi"; + try { ++ String otherDir = getZoneInfoDir(homeDir); ++ if (otherDir != null) ++ zi = otherDir; + zi = new File(zi).getCanonicalPath(); + } catch (Exception e) { + } + ziDir = zi; + } + ++ private static String getZoneInfoDir(final String homeDir) { ++ try { + return AccessController.doPrivileged -+ (new PrivilegedExceptionAction() { -+ public String run() { -+ File f = new File(dir, "ZoneInfoMappings"); -+ if (f.exists()) -+ return dir; -+ return null; -+ } -+ }); ++ (new PrivilegedExceptionAction() { ++ public String run() throws IOException { ++ File f = new File(homeDir + File.separator + "lib" + ++ File.separator + "tz.properties"); ++ InputStream in = new FileInputStream(f); ++ BufferedInputStream bin = new BufferedInputStream(in); ++ Properties props = new Properties(); ++ props.load(bin); ++ bin.close(); ++ String dir = props.getProperty("sun.zoneinfo.dir"); ++ if (dir == null) ++ return null; ++ File zim = new File(dir, "ZoneInfoMappings"); ++ if (zim.exists()) ++ return dir; ++ return null; ++ } ++ }); + } catch (PrivilegedActionException e) { -+ return null; ++ return null; + } + } + /** - * Excluded zones item tag. (Added in Mustang) - */ -@@ -1021,11 +1042,17 @@ + * Converts the given time zone ID to a platform dependent path + * name. For example, "America/Los_Angeles" is converted to +@@ -1032,8 +1070,8 @@ byte[] buffer = null; try { -- String homeDir = AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("java.home")); -- final String fname = homeDir + File.separator + "lib" + File.separator -- + "zi" + File.separator + fileName; - buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { -+ -+ String zi_dir = JAVAZI_DIR; -+ if (zi_dir == null) { -+ // Fall back to JDK-supplied tzdata -+ String homeDir = (String) AccessController.doPrivileged(new sun.security.action.GetPropertyAction("java.home")); -+ zi_dir = homeDir + File.separator + "lib" + File.separator -+ + "zi"; -+ } -+ -+ final String fname = zi_dir + File.separator + fileName; -+ buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws IOException { - File file = new File(fname); - if (!file.canRead()) { ---- oldopenjdk6/hotspot/src/os/linux/vm/os_linux.cpp 2008-03-26 05:07:22.000000000 -0400 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-05-08 11:03:17.000000000 -0400 -@@ -376,6 +381,11 @@ - } - } - -+ SystemProperty* sp = Arguments::system_properties(); -+ // Use the system zoneinfo files, if present -+ Arguments::PropertyList_add (&sp, -+ new SystemProperty("user.zoneinfo.dir", "/usr/share/javazi",true)); -+ - #undef malloc - #undef getenv - #undef EXTENSIONS_DIR +- public Object run() throws IOException { ++ buffer = AccessController.doPrivileged(new PrivilegedExceptionAction() { ++ public byte[] run() throws IOException { + File file = new File(ziDir, fileName); + if (!file.exists() || !file.isFile()) { + return null; diff -r 0424d3023049 -r 7f0427a81b5b patches/security/icedtea-6824265.patch --- a/patches/security/icedtea-6824265.patch Tue Mar 16 10:29:49 2010 -0400 +++ b/patches/security/icedtea-6824265.patch Wed Jun 02 17:35:32 2010 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/src/share/cla diff -Nru openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java ---- openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2009-11-08 23:11:42.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2009-11-08 23:25:32.000000000 +0000 +--- openjdk.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2009-04-24 08:34:26.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2010-06-02 16:28:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. @@ -8,30 +8,15 @@ diff -Nru openjdk.orig/jdk/src/share/cla * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it -@@ -465,10 +465,7 @@ - */ - public static final byte TAG_TZDataVersion = 68; - -- // Cached location of the TZDATA files -- private static final String JAVAZI_DIR = setup_JAVAZI_DIR(); -- -- private static String setup_JAVAZI_DIR() { -+ private static String setupJavaZIDir() { - try { - final String dir = AccessController.doPrivileged - (new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); -@@ -493,6 +490,21 @@ +@@ -472,6 +472,18 @@ private static Map zoneInfoObjects = null; + private static final String ziDir; + static { -+ String zi = setupJavaZIDir(); -+ if (zi == null) { -+ zi = AccessController.doPrivileged( ++ String zi = (String) AccessController.doPrivileged( + new sun.security.action.GetPropertyAction("java.home")) -+ + File.separator + "lib" + File.separator + "zi"; -+ } ++ + File.separator + "lib" + File.separator + "zi"; + try { + zi = new File(zi).getCanonicalPath(); + } catch (Exception e) { @@ -42,7 +27,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla /** * Converts the given time zone ID to a platform dependent path * name. For example, "America/Los_Angeles" is converted to -@@ -597,20 +609,7 @@ +@@ -576,20 +588,7 @@ return null; } @@ -64,7 +49,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla int filesize = buf.length; int rawOffset = 0; int dstSavings = 0; -@@ -621,6 +620,18 @@ +@@ -600,6 +599,18 @@ int[] simpleTimeZoneParams = null; try { @@ -83,7 +68,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla while (index < filesize) { byte tag = buf[index++]; int len = ((buf[index++] & 0xFF) << 8) + (buf[index++] & 0xFF); -@@ -1038,36 +1049,34 @@ +@@ -1017,30 +1028,33 @@ * Reads the specified file under <java.home>/lib/zi into a buffer. * @return the buffer, or null if any I/O error occurred. */ @@ -92,18 +77,11 @@ diff -Nru openjdk.orig/jdk/src/share/cla byte[] buffer = null; try { - -- String zi_dir = JAVAZI_DIR; -- if (zi_dir == null) { -- // Fall back to JDK-supplied tzdata -- String homeDir = (String) AccessController.doPrivileged(new sun.security.action.GetPropertyAction("java.home")); -- zi_dir = homeDir + File.separator + "lib" + File.separator -- + "zi"; -- } -- -- final String fname = zi_dir + File.separator + fileName; -- buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { -+ buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { +- String homeDir = AccessController.doPrivileged( +- new sun.security.action.GetPropertyAction("java.home")); +- final String fname = homeDir + File.separator + "lib" + File.separator +- + "zi" + File.separator + fileName; + buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws IOException { - File file = new File(fname); - if (!file.canRead()) { diff -r 0424d3023049 -r 7f0427a81b5b tz.properties.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tz.properties.in Wed Jun 02 17:35:32 2010 +0100 @@ -0,0 +1,1 @@ +sun.zoneinfo.dir=@TZDATA_DIR@ From andrew at icedtea.classpath.org Wed Jun 2 11:56:15 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Jun 2010 18:56:15 +0000 Subject: /hg/release/icedtea6-1.7: Make the new plugin the default. Upda... Message-ID: changeset 0235bfe1d08d in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=0235bfe1d08d author: Andrew John Hughes date: Wed Jun 02 19:56:03 2010 +0100 Make the new plugin the default. Update NEWS. 2010-06-02 Andrew John Hughes * NEWS: Update with latest backports. * acinclude.m4: Make the new plugin the default. diffstat: 3 files changed, 18 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ NEWS | 12 ++++++++++++ acinclude.m4 | 2 +- diffs (44 lines): diff -r 7f0427a81b5b -r 0235bfe1d08d ChangeLog --- a/ChangeLog Wed Jun 02 17:35:32 2010 +0100 +++ b/ChangeLog Wed Jun 02 19:56:03 2010 +0100 @@ -1,3 +1,8 @@ 2009-12-22 Andrew John Hughes + + * NEWS: Update with latest backports. + * acinclude.m4: Make the new plugin the default. + 2009-12-22 Andrew John Hughes Backport --with-tzdata-dir option from IcedTea6. diff -r 7f0427a81b5b -r 0235bfe1d08d NEWS --- a/NEWS Wed Jun 02 17:35:32 2010 +0100 +++ b/NEWS Wed Jun 02 19:56:03 2010 +0100 @@ -1,4 +1,16 @@ New in release 1.7.3 (2010-03-31): +New in release 1.7.4 (2010-XX-XX): + +* Backport --with-tzdata-dir support from IcedTea6 1.8 to ensure + that external timezone data works again. +* Make the new plugin the default. This is now the main supported + plugin. Use --disable-npplugin to use the old one. +* Updates to the new plugin: + - Added support for JSObject.finalize() + - Liveconnect message processing design changes. + - Message protocol overhaul to fix race conditions + New in release 1.7.3 (2010-03-31): + - Fix for plugin buffer overflow: https://bugzilla.mozilla.org/show_bug.cgi?id=555342 - Fix issue with ant -diagnostics on ant 1.8.0 due to changed exit code diff -r 7f0427a81b5b -r 0235bfe1d08d acinclude.m4 --- a/acinclude.m4 Wed Jun 02 17:35:32 2010 +0100 +++ b/acinclude.m4 Wed Jun 02 19:56:03 2010 +0100 @@ -1274,7 +1274,7 @@ AC_ARG_ENABLE([npplugin], AC_ARG_ENABLE([npplugin], [AS_HELP_STRING([--enable-npplugin], [Enable compilation of browser plugin (automatically disables default plugin)])], - [enable_npplugin="${enableval}"], [enable_npplugin="no"]) + [enable_npplugin="${enableval}"], [enable_npplugin="yes"]) AC_MSG_RESULT(${enable_npplugin}) ]) From andrew at icedtea.classpath.org Wed Jun 2 12:26:32 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Jun 2010 19:26:32 +0000 Subject: /hg/icedtea: 3 new changesets Message-ID: changeset e39b0fad0de1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e39b0fad0de1 author: Deepak Bhole date: Tue Mar 16 10:29:49 2010 -0400 Added support for JSObject.finalize() 2010-03-16 Deepak Bhole * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (newMessageOnBus): Added support for finalize. (finalize): New function. Decrements object reference count by one. (queue_processor): Added support for finalize. * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused function declerations. Added decleration for finalize. changeset 9f29f7bf45c5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9f29f7bf45c5 author: Andrew John Hughes date: Wed Jun 02 15:42:29 2010 +0100 NetX/plugin build sync (3/3): Remove binary plug import. 2010-03-16 Andrew John Hughes NetX/plugin build sync (3/3): * patches/icedtea-copy-plugs.patch: Remove plug-related segments and move remainder to patches/boot/getannotation- cast.patch. * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add javax/management/StandardMBean.java. (ICEDTEA_PATCHES): Remove copy-plugs.patch. (BOOTCLASSPATH_RT_LIBGCJ): Remove duplication of including system rt.jar as well. (ICEDTEA_BOOT_PATCHES): Add getannotation-cast.patch. (clean-local): Don't depend on clean-plugs. (.PHONY): Likewise. (icedtea-debug.stamp): Remove liveconnect- dist.stamp as implied by plugin.stamp. (icedtea- boot.stamp): Likewise and add plugin.stamp. (clean-rt): Revert to system rt.jar. (bootstrap/jdk1.7.0/jre/lib/rt- closed.jar): Removed. (plugs.stamp): Removed. (clean-plugs): Removed. * patches/boot/getannotation-cast.patch: Remaining part of copy-plugs.patch which provides a cast for getAnnotation for older versions of GNU Classpath. changeset 19818bda1c63 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=19818bda1c63 author: Andrew John Hughes date: Wed Jun 02 19:36:23 2010 +0100 Remove @Override hack. 2010-06-02 Andrew John Hughes * Makefile.am: (IT_LANGUAGE_SOURCE_VERSION): Bump to 6 to support @Override. (IT_CLASS_TARGET_VERSION): Likewise. (extract-openjdk.stamp): Remove @Override hack. * patches/xrender/icedtea-001.patch: Recreated. diffstat: 7 files changed, 186 insertions(+), 157 deletions(-) ChangeLog | 44 ++++++++ Makefile.am | 49 +++------ patches/boot/getannotation-cast.patch | 12 ++ patches/icedtea-copy-plugs.patch | 60 ----------- patches/xrender/icedtea-001.patch | 112 ++++++++++----------- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 56 ++++++++++ plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 10 - diffs (truncated from 759 to 500 lines): diff -r 8a1a5c294219 -r 19818bda1c63 ChangeLog --- a/ChangeLog Tue Jun 01 22:35:00 2010 +0100 +++ b/ChangeLog Wed Jun 02 19:36:23 2010 +0100 @@ -1,3 +1,47 @@ 2010-03-15 Andrew John Hughes + + * Makefile.am: + (IT_LANGUAGE_SOURCE_VERSION): Bump to 6 + to support @Override. + (IT_CLASS_TARGET_VERSION): Likewise. + (extract-openjdk.stamp): Remove @Override hack. + * patches/xrender/icedtea-001.patch: + Recreated. + +2010-03-16 Andrew John Hughes + + NetX/plugin build sync (3/3): + * patches/icedtea-copy-plugs.patch: + Remove plug-related segments and move + remainder to patches/boot/getannotation-cast.patch. + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add javax/management/StandardMBean.java. + (ICEDTEA_PATCHES): Remove copy-plugs.patch. + (BOOTCLASSPATH_RT_LIBGCJ): Remove duplication of including system rt.jar as well. + (ICEDTEA_BOOT_PATCHES): Add getannotation-cast.patch. + (clean-local): Don't depend on clean-plugs. + (.PHONY): Likewise. + (icedtea-debug.stamp): Remove liveconnect-dist.stamp as + implied by plugin.stamp. + (icedtea-boot.stamp): Likewise and add plugin.stamp. + (clean-rt): Revert to system rt.jar. + (bootstrap/jdk1.7.0/jre/lib/rt-closed.jar): Removed. + (plugs.stamp): Removed. + (clean-plugs): Removed. + * patches/boot/getannotation-cast.patch: + Remaining part of copy-plugs.patch which + provides a cast for getAnnotation for older versions + of GNU Classpath. + +2010-03-16 Deepak Bhole + + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (newMessageOnBus): Added support for finalize. + (finalize): New function. Decrements object reference count by one. + (queue_processor): Added support for finalize. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused + function declerations. Added decleration for finalize. + 2010-03-15 Andrew John Hughes NetX/plugin build sync (2/3): diff -r 8a1a5c294219 -r 19818bda1c63 Makefile.am --- a/Makefile.am Tue Jun 01 22:35:00 2010 +0100 +++ b/Makefile.am Wed Jun 02 19:36:23 2010 +0100 @@ -136,15 +136,18 @@ ICEDTEA_BOOTSTRAP_RESOURCES = \ ICEDTEA_BOOTSTRAP_RESOURCES = \ $(LANGTOOLS)/com/sun/tools/javac/resources +# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel +# PR43389 - javax.management.StandardMBean ICEDTEA_BOOTSTRAP_CLASSES = \ - $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java + $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \ + $(SHARE)/javax/management/StandardMBean.java endif # Settings for javac -IT_LANGUAGE_SOURCE_VERSION=5 -IT_CLASS_TARGET_VERSION=5 +IT_LANGUAGE_SOURCE_VERSION=6 +IT_CLASS_TARGET_VERSION=6 IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE) IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION) @@ -265,7 +268,6 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit # Patch list ICEDTEA_PATCHES = \ - patches/icedtea-copy-plugs.patch \ patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ patches/icedtea-ssl.patch \ patches/icedtea-rmi_amd64.patch \ @@ -412,7 +414,8 @@ ICEDTEA_BOOT_PATCHES = patches/boot/ant- patches/boot/icedtea-jopt.patch \ patches/boot/icedtea-dyn.patch \ patches/boot/icedtea-jaxp-dependency.patch \ - patches/boot/genstubs-nofork.patch + patches/boot/genstubs-nofork.patch \ + patches/boot/getannotation-cast.patch if CP39408_JAVAH ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch @@ -559,7 +562,7 @@ ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT):$(ICEDTEA_RT)" \ BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_BOOT)" \ - BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT):$(SYSTEM_JDK_DIR)/jre/lib/rt.jar" \ + BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT)" \ GENSRCDIR="$(abs_top_builddir)/generated" \ JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \ @@ -754,7 +757,7 @@ check-local: jtregcheck clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \ - clean-plugs clean-extra clean-netx clean-visualvm clean-nbplatform \ + clean-extra clean-netx clean-visualvm clean-nbplatform \ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \ clean-extract clean-generated clean-plugin clean-liveconnect clean-native-ecj \ @@ -780,7 +783,7 @@ install: clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \ clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ - clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \ + clean-icedtea icedtea-stage2 clean-icedtea-boot \ clean-visualvm clean-nbplatform clean-rt clean-plugin hotspot \ hotspot-helper clean-extra clean-jtreg clean-jtreg-reports clean-netx \ clean-drops @@ -1289,8 +1292,6 @@ endif fi chmod -R ug+w openjdk sh $(srcdir)/fsg.sh ; - find openjdk -name '*.java' \ - -exec sed -i 's/^[[:space:]]*@Override//' {} + ; \ mkdir -p stamps touch $@ @@ -1876,8 +1877,7 @@ stamps/icedtea-debug.stamp: stamps/boots stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \ - stamps/netx-dist.stamp stamps/liveconnect-dist.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + stamps/netx-dist.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -1985,9 +1985,8 @@ clean-icedtea-debug-stage2: # =================== stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \ - stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/plugs.stamp \ - stamps/netx-dist.stamp stamps/liveconnect-dist.stamp stamps/cacao.stamp \ - stamps/rewrite-rhino.stamp + stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/netx-dist.stamp \ + stamps/plugin.stamp stamps/cacao.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_BOOT) \ -C openjdk-boot \ @@ -2703,21 +2702,9 @@ clean-rt: rm -rf lib/rt rm -f stamps/rt-class-files.stamp stamps/rt.stamp rm -f rt-source-files.txt - -# rt-closed.jar. -bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt.stamp - mkdir -p bootstrap/jdk1.7.0/jre/lib - ln -sf ${abs_top_builddir}/bootstrap/boot/jre/lib/rt.jar \ - bootstrap/jdk1.7.0/jre/lib/rt-closed.jar - -stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar - mkdir -p stamps - touch $@ - -clean-plugs: clean-rt - rm -f stamps/plugs.stamp - rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar - rm -rf bootstrap/jdk1.7.0 + if [ -e bootstrap/boot/jre/lib ] ; then + cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar bootstrap/boot/jre/lib + fi # Target Aliases # =============== @@ -2804,8 +2791,6 @@ plugin: stamps/plugin.stamp plugin-tests: stamps/plugin-tests.stamp -plugs: stamps/plugs.stamp - pulse-java: $(PULSE_JAVA_TARGET) rewriter: stamps/rewriter.stamp diff -r 8a1a5c294219 -r 19818bda1c63 patches/boot/getannotation-cast.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/getannotation-cast.patch Wed Jun 02 19:36:23 2010 +0100 @@ -0,0 +1,12 @@ +diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java +--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 02:25:40.000000000 +0000 ++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 15:45:15.000000000 +0000 +@@ -1475,7 +1475,7 @@ + } + + private static String[] getAnnotationValue(Constructor constructor) { +- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class); ++ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class)); + return (annotation != null) + ? annotation.value() + : null; diff -r 8a1a5c294219 -r 19818bda1c63 patches/icedtea-copy-plugs.patch --- a/patches/icedtea-copy-plugs.patch Tue Jun 01 22:35:00 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk ---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2009-02-05 08:44:12.000000000 +0000 -+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2009-02-10 15:49:40.000000000 +0000 -@@ -93,11 +93,32 @@ - @for i in $(PLUG_JMF_CLASS_NAMES) ; do \ - $(ECHO) "$$i" >> $@; \ - done -+$(PLUG_TEMPDIR)/gnu.clist: -+ @$(prep-target) -+ @for i in $(PLUG_GNU_CLASS_NAMES) ; do \ -+ $(ECHO) "$$i" >> $@ ; \ -+ done -+$(PLUG_TEMPDIR)/javax.clist: -+ @$(prep-target) -+ @for i in $(PLUG_JAVAX_CLASS_NAMES) ; do \ -+ $(ECHO) "$$i" >> $@ ; \ -+ done -+$(PLUG_TEMPDIR)/netx.clist: -+ @$(prep-target) -+ @for i in $(PLUG_NETX_CLASS_NAMES) ; do \ -+ $(ECHO) "$$i" >> $@ ; \ -+ done - $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS) - @$(prep-target) - $(CAT) $(PLUG_CLISTS) > $@ - $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist - $(plug-create-jargs) -+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist -+ $(plug-create-jargs) -+$(PLUG_TEMPDIR)/javax.jargs: $(PLUG_TEMPDIR)/javax.clist -+ $(plug-create-jargs) -+$(PLUG_TEMPDIR)/netx.jargs: $(PLUG_TEMPDIR)/netx.clist -+ $(plug-create-jargs) - $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist - $(plug-create-jargs) - -@@ -122,9 +143,9 @@ - # Import classes command - - define import-binary-plug-classes --@$(MKDIR) -p $(CLASSDESTDIR) -+$(MKDIR) -p $(CLASSDESTDIR) - @$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /' --($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1 $(BOOT_JAR_JFLAGS) ) -+($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) `$(CAT) $1`) - ($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) ) - endef # import-binary-plug-classes - -diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java ---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 02:25:40.000000000 +0000 -+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2009-02-10 15:45:15.000000000 +0000 -@@ -1475,7 +1475,7 @@ - } - - private static String[] getAnnotationValue(Constructor constructor) { -- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class); -+ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class)); - return (annotation != null) - ? annotation.value() - : null; diff -r 8a1a5c294219 -r 19818bda1c63 patches/xrender/icedtea-001.patch --- a/patches/xrender/icedtea-001.patch Tue Jun 01 22:35:00 2010 +0100 +++ b/patches/xrender/icedtea-001.patch Wed Jun 02 19:36:23 2010 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/sun/font diff -Nru openjdk.orig/jdk/make/sun/font/FILES_c.gmk openjdk/jdk/make/sun/font/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/font/FILES_c.gmk 2009-06-30 14:05:45.000000000 +0100 -+++ openjdk/jdk/make/sun/font/FILES_c.gmk 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/make/sun/font/FILES_c.gmk 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/make/sun/font/FILES_c.gmk 2010-06-02 19:03:05.000000000 +0100 @@ -115,6 +115,7 @@ FILES_cpp_platform = else @@ -10,9 +10,9 @@ diff -Nru openjdk.orig/jdk/make/sun/font FILES_cpp_platform = endif diff -Nru openjdk.orig/jdk/make/sun/font/Makefile openjdk/jdk/make/sun/font/Makefile ---- openjdk.orig/jdk/make/sun/font/Makefile 2009-10-21 19:24:47.000000000 +0100 -+++ openjdk/jdk/make/sun/font/Makefile 2009-10-23 14:35:23.000000000 +0100 -@@ -86,6 +86,7 @@ +--- openjdk.orig/jdk/make/sun/font/Makefile 2010-06-02 18:53:13.000000000 +0100 ++++ openjdk/jdk/make/sun/font/Makefile 2010-06-02 19:03:05.000000000 +0100 +@@ -87,6 +87,7 @@ sun/font/NativeStrike.java \ sun/font/NativeStrikeDisposer.java \ sun/font/X11TextRenderer.java \ @@ -21,8 +21,8 @@ diff -Nru openjdk.orig/jdk/make/sun/font endif # PLATFORM diff -Nru openjdk.orig/jdk/make/sun/font/mapfile-vers openjdk/jdk/make/sun/font/mapfile-vers ---- openjdk.orig/jdk/make/sun/font/mapfile-vers 2009-10-21 16:42:03.000000000 +0100 -+++ openjdk/jdk/make/sun/font/mapfile-vers 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/make/sun/font/mapfile-vers 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/make/sun/font/mapfile-vers 2010-06-02 19:03:05.000000000 +0100 @@ -56,6 +56,7 @@ Java_sun_font_NativeFont_getGlyphImage; Java_sun_font_NativeFont_getGlyphImageNoDefault; @@ -32,8 +32,8 @@ diff -Nru openjdk.orig/jdk/make/sun/font *; }; diff -Nru openjdk.orig/jdk/make/sun/font/mapfile-vers.openjdk openjdk/jdk/make/sun/font/mapfile-vers.openjdk ---- openjdk.orig/jdk/make/sun/font/mapfile-vers.openjdk 2009-10-21 16:42:03.000000000 +0100 -+++ openjdk/jdk/make/sun/font/mapfile-vers.openjdk 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/make/sun/font/mapfile-vers.openjdk 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/make/sun/font/mapfile-vers.openjdk 2010-06-02 19:03:05.000000000 +0100 @@ -75,6 +75,7 @@ Java_sun_font_FreetypeFontScaler_getUnitsPerEMNative; Java_sun_font_FreetypeFontScaler_initNativeScaler; @@ -43,8 +43,8 @@ diff -Nru openjdk.orig/jdk/make/sun/font *; }; diff -Nru openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk ---- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2009-05-08 16:10:44.000000000 +0100 -+++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-06-02 19:03:05.000000000 +0100 @@ -79,4 +79,11 @@ gtk2_interface.c \ swing_GTKEngine.c \ @@ -59,9 +59,9 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt + XRRenderer.c \ + XRPMBlitLoops.c diff -Nru openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile ---- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-05-08 16:10:44.000000000 +0100 -+++ openjdk/jdk/make/sun/xawt/Makefile 2009-10-23 14:35:23.000000000 +0100 -@@ -87,7 +87,7 @@ +--- openjdk.orig/jdk/make/sun/xawt/Makefile 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/make/sun/xawt/Makefile 2010-06-02 19:03:05.000000000 +0100 +@@ -88,7 +88,7 @@ vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 @@ -71,9 +71,9 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt ifeq ($(PLATFORM), solaris) diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers ---- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2009-10-21 16:42:03.000000000 +0100 -+++ openjdk/jdk/make/sun/xawt/mapfile-vers 2009-10-23 14:35:23.000000000 +0100 -@@ -367,6 +367,33 @@ +--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-06-02 19:03:05.000000000 +0100 +@@ -370,6 +370,33 @@ Java_sun_java2d_x11_X11SurfaceData_XSetForeground; Java_sun_java2d_x11_X11SurfaceData_XSetGraphicsExposures; @@ -108,8 +108,8 @@ diff -Nru openjdk.orig/jdk/make/sun/xawt Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box; Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box_1gap; diff -Nru openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java ---- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2009-10-21 19:23:52.000000000 +0100 -+++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java 2010-06-02 19:03:05.000000000 +0100 @@ -307,7 +307,7 @@ * linear RGB space. Copied directly from the * MultipleGradientPaintContext class. @@ -120,8 +120,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla input = color / 255.0f; diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2009-10-21 19:24:08.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2010-06-02 19:03:05.000000000 +0100 @@ -37,6 +37,7 @@ import java.util.HashMap; @@ -185,8 +185,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c } } diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java ---- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-10-21 19:24:08.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-10-23 14:36:10.000000000 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-06-02 19:03:05.000000000 +0100 @@ -47,9 +47,9 @@ import sun.font.Font2D; import sun.font.FontManager; @@ -265,7 +265,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c * Checks if Shared Memory extension can be used. * Returns: @@ -397,4 +432,14 @@ - + @Override public void paletteChanged() { } + @@ -281,7 +281,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c } diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java --- openjdk.orig/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/font/XRTextRenderer.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,53 @@ +/* + * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. @@ -337,8 +337,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c + } +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java openjdk/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2009-10-21 19:24:09.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java 2010-06-02 19:03:05.000000000 +0100 @@ -33,6 +33,7 @@ import sun.java2d.opengl.GLXGraphicsConfig; import sun.java2d.opengl.GLXVolatileSurfaceManager; @@ -365,8 +365,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c } } diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2009-10-21 19:24:09.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2009-10-23 14:35:23.000000000 +0100 +--- openjdk.orig/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java 2010-06-02 19:03:05.000000000 +0100 @@ -42,10 +42,7 @@ import java.awt.image.Raster; import java.awt.peer.ComponentPeer; @@ -417,7 +417,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c /** * Returns true if we can use DGA on any of the screens */ -@@ -661,7 +668,7 @@ +@@ -664,7 +671,7 @@ { // assert SunToolkit.isAWTLockHeldByCurrentThread(); @@ -428,7 +428,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRDrawImage.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,50 @@ +package sun.java2d.xr; + @@ -482,7 +482,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c + diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * To change this template, choose Tools | Templates @@ -528,7 +528,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,71 @@ +package sun.java2d.xr; + @@ -603,7 +603,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,75 @@ +package sun.java2d.xr; + @@ -682,7 +682,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,206 @@ +/* + * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. @@ -893,7 +893,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c \ No newline at end of file diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRRenderer.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,255 @@ +package sun.java2d.xr; + @@ -1152,7 +1152,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2009-10-23 14:35:23.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2010-06-02 19:03:05.000000000 +0100 @@ -0,0 +1,1017 @@ +/* + * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. @@ -2173,7 +2173,7 @@ diff -Nru openjdk.orig/jdk/src/solaris/c +} diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java --- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java 2009-10-23 14:35:23.000000000 +0100 From gbenson at icedtea.classpath.org Thu Jun 3 01:07:35 2010 From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org) Date: Thu, 03 Jun 2010 08:07:35 +0000 Subject: /hg/release/icedtea6-1.7-shark: Fix build errors Message-ID: changeset 798c38a4f187 in /hg/release/icedtea6-1.7-shark details: http://icedtea.classpath.org/hg/release/icedtea6-1.7-shark?cmd=changeset;node=798c38a4f187 author: Gary Benson date: Thu Jun 03 08:07:22 2010 -0400 Fix build errors diffstat: 2 files changed, 3 insertions(+), 1 deletion(-) ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 3 +++ ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 1 - diffs (21 lines): diff -r 53901c78cd5f -r 798c38a4f187 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Fri May 14 17:37:29 2010 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Thu Jun 03 08:07:22 2010 -0400 @@ -45,3 +45,6 @@ define_pd_global(intx, StackShadowPages define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); + +define_pd_global(uintx, NewSize, ScaleForWordSize(LP64_ONLY(2048) NOT_LP64(1024) * K)); +define_pd_global(uintx, TLABSize, 0); diff -r 53901c78cd5f -r 798c38a4f187 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Fri May 14 17:37:29 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Jun 03 08:07:22 2010 -0400 @@ -149,7 +149,6 @@ void SharkDecacher::end_frame() { pc_offset(), target(), bci(), - true, debug_info()->create_scope_values(locarray()), debug_info()->create_scope_values(exparray()), debug_info()->create_monitor_values(monarray())); From andrew at icedtea.classpath.org Thu Jun 3 03:51:05 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Jun 2010 10:51:05 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset aabae1196053 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=aabae1196053 author: Andrew John Hughes date: Thu Jun 03 11:49:34 2010 +0100 Remove the old plugin. 2010-03-16 Andrew John Hughes * IcedTeaPlugin.cc, * plugin/icedtea/java/netscape/javascript/JSException.java, * plugin/icedtea/java/netscape/javascript/JSObject.java, * plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.jav a, * plugin/icedtea/java/netscape/javascript/JSProxy.java, * plugin/icedtea/java/netscape/javascript/JSRunnable.java, * plugin/icedtea/java/netscape/javascript/JSUtil.java, * plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java, * plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java, * plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java, * plugin/icedtea/java/sun/applet/JavaConsole.java, * plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java, * plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java, * plugin/icedtea/java/sun/applet/PluginAppletViewer.java, * plugin/icedtea/java/sun/applet/PluginCallRequest.java, * plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java, * plugin/icedtea/java/sun/applet/PluginClassLoader.java, * plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java, * plugin/icedtea/java/sun/applet/PluginCookieManager.java, * plugin/icedtea/java/sun/applet/PluginDebug.java, * plugin/icedtea/java/sun/applet/PluginException.java, * plugin/icedtea/java/sun/applet/PluginMain.java, * plugin/icedtea/java/sun/applet/PluginMessageConsumer.java, * plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java, * plugin/icedtea/java/sun/applet/PluginObjectStore.java, * plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java, * plugin/icedtea/java/sun/applet/PluginProxySelector.java, * plugin/icedtea/java/sun/applet/PluginStreamHandler.java, * plugin/icedtea/java/sun/applet/RequestQueue.java, * plugin/icedtea/java/sun/applet/TestEnv.java, * plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java: Remove old plugin code. * Makefile.am: Drop ENABLE_PLUGIN blocks. Rename ENABLE_NPPLUGIN to ENABLE_PLUGIN and IcedTeaNPPlugin to IcedTeaPlugin. (EXTRA_DIST): Drop IcedTeaPlugin.cc. (icedtea.stamp): Remove old plugin references. Change NPPlugin references to reference Plugin. (icedtea-debug.stamp): Likewise. (PLUGIN_SRC): Renamed from NPPLUGIN_SRC. (PLUGIN_OBJECTS): Renamed from NPPLUGIN_OBJECTS. ($(PLUGIN_DIR)/%.o): Change from NPPLUGIN to PLUGIN. ($(PLUGIN_DIR)/IcedTeaPlugin.so): Change to PLUGIN_BUILD_DIR. (clean-IcedTeaPlugin): Moved from clean-IcedTeaNPPlugin. (IcedTeaPlugin.o): Removed. (IcedTeaPlugin.so): Removed. (clean-IcedTeaPlugin): Removed. (plugin.stamp): Remove old plugin dependency. (clean-plugin): Likewise. * acinclude.m4: (IT_CHECK_PLUGIN): Renamed from IT_CHECK_OLD_PLUGIN. (IT_CHECK_NEW_PLUGIN): Removed. (IT_CHECK_PLUGIN_DEPENDENCIES): No longer require IT_CHECK_OLD_PLUGIN and IT_CHECK_NEW_PLUGIN. Require IT_CHECK_PLUGIN. Remove enable_npplugin tests as now assumed, being the only plugin. (IT_CHECK_XULRUNNER_VERSION): Drop enable_npplugin test. * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Remove duplicate declaration of member_identifier arising from merge. changeset 8d5863423d1b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d5863423d1b author: Andrew John Hughes date: Thu Jun 03 11:50:51 2010 +0100 Call clean-rt from clean-local; should have replaced clean-plugs. 2010-06-03 Andrew John Hughes * Makefile.am: (clean-local): Add missing call to clean-rt which should have replaced clean-plugs. diffstat: 35 files changed, 92 insertions(+), 13168 deletions(-) ChangeLog | 69 IcedTeaPlugin.cc | 6009 ---------- Makefile.am | 89 acinclude.m4 | 44 plugin/icedtea/java/netscape/javascript/JSException.java | 140 plugin/icedtea/java/netscape/javascript/JSObject.java | 290 plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.java | 47 plugin/icedtea/java/netscape/javascript/JSProxy.java | 58 plugin/icedtea/java/netscape/javascript/JSRunnable.java | 72 plugin/icedtea/java/netscape/javascript/JSUtil.java | 59 plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java | 71 plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java | 76 plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java | 75 plugin/icedtea/java/sun/applet/JavaConsole.java | 365 plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java | 241 plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java | 1311 -- plugin/icedtea/java/sun/applet/PluginAppletViewer.java | 2004 --- plugin/icedtea/java/sun/applet/PluginCallRequest.java | 85 plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java | 62 plugin/icedtea/java/sun/applet/PluginClassLoader.java | 51 plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java | 82 plugin/icedtea/java/sun/applet/PluginCookieManager.java | 88 plugin/icedtea/java/sun/applet/PluginDebug.java | 51 plugin/icedtea/java/sun/applet/PluginException.java | 53 plugin/icedtea/java/sun/applet/PluginMain.java | 319 plugin/icedtea/java/sun/applet/PluginMessageConsumer.java | 119 plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java | 121 plugin/icedtea/java/sun/applet/PluginObjectStore.java | 132 plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java | 85 plugin/icedtea/java/sun/applet/PluginProxySelector.java | 195 plugin/icedtea/java/sun/applet/PluginStreamHandler.java | 479 plugin/icedtea/java/sun/applet/RequestQueue.java | 77 plugin/icedtea/java/sun/applet/TestEnv.java | 172 plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java | 67 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 2 diffs (truncated from 13538 to 500 lines): diff -r 19818bda1c63 -r 8d5863423d1b ChangeLog --- a/ChangeLog Wed Jun 02 19:36:23 2010 +0100 +++ b/ChangeLog Thu Jun 03 11:50:51 2010 +0100 @@ -1,3 +1,72 @@ 2010-06-02 Andrew John Hughes + + * Makefile.am: + (clean-local): Add missing call to clean-rt + which should have replaced clean-plugs. + +2010-03-16 Andrew John Hughes + + * IcedTeaPlugin.cc, + * plugin/icedtea/java/netscape/javascript/JSException.java, + * plugin/icedtea/java/netscape/javascript/JSObject.java, + * plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.java, + * plugin/icedtea/java/netscape/javascript/JSProxy.java, + * plugin/icedtea/java/netscape/javascript/JSRunnable.java, + * plugin/icedtea/java/netscape/javascript/JSUtil.java, + * plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java, + * plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java, + * plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java, + * plugin/icedtea/java/sun/applet/JavaConsole.java, + * plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java, + * plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java, + * plugin/icedtea/java/sun/applet/PluginAppletViewer.java, + * plugin/icedtea/java/sun/applet/PluginCallRequest.java, + * plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java, + * plugin/icedtea/java/sun/applet/PluginClassLoader.java, + * plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java, + * plugin/icedtea/java/sun/applet/PluginCookieManager.java, + * plugin/icedtea/java/sun/applet/PluginDebug.java, + * plugin/icedtea/java/sun/applet/PluginException.java, + * plugin/icedtea/java/sun/applet/PluginMain.java, + * plugin/icedtea/java/sun/applet/PluginMessageConsumer.java, + * plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java, + * plugin/icedtea/java/sun/applet/PluginObjectStore.java, + * plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java, + * plugin/icedtea/java/sun/applet/PluginProxySelector.java, + * plugin/icedtea/java/sun/applet/PluginStreamHandler.java, + * plugin/icedtea/java/sun/applet/RequestQueue.java, + * plugin/icedtea/java/sun/applet/TestEnv.java, + * plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java: + Remove old plugin code. + * Makefile.am: + Drop ENABLE_PLUGIN blocks. Rename ENABLE_NPPLUGIN + to ENABLE_PLUGIN and IcedTeaNPPlugin to IcedTeaPlugin. + (EXTRA_DIST): Drop IcedTeaPlugin.cc. + (icedtea.stamp): Remove old plugin references. Change NPPlugin + references to reference Plugin. + (icedtea-debug.stamp): Likewise. + (PLUGIN_SRC): Renamed from NPPLUGIN_SRC. + (PLUGIN_OBJECTS): Renamed from NPPLUGIN_OBJECTS. + ($(PLUGIN_DIR)/%.o): Change from NPPLUGIN to PLUGIN. + ($(PLUGIN_DIR)/IcedTeaPlugin.so): Change to PLUGIN_BUILD_DIR. + (clean-IcedTeaPlugin): Moved from clean-IcedTeaNPPlugin. + (IcedTeaPlugin.o): Removed. + (IcedTeaPlugin.so): Removed. + (clean-IcedTeaPlugin): Removed. + (plugin.stamp): Remove old plugin dependency. + (clean-plugin): Likewise. + * acinclude.m4: + (IT_CHECK_PLUGIN): Renamed from IT_CHECK_OLD_PLUGIN. + (IT_CHECK_NEW_PLUGIN): Removed. + (IT_CHECK_PLUGIN_DEPENDENCIES): No longer require + IT_CHECK_OLD_PLUGIN and IT_CHECK_NEW_PLUGIN. Require + IT_CHECK_PLUGIN. Remove enable_npplugin tests as now + assumed, being the only plugin. + (IT_CHECK_XULRUNNER_VERSION): Drop enable_npplugin test. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: + Remove duplicate declaration of member_identifier + arising from merge. + 2010-06-02 Andrew John Hughes * Makefile.am: diff -r 19818bda1c63 -r 8d5863423d1b IcedTeaPlugin.cc --- a/IcedTeaPlugin.cc Wed Jun 02 19:36:23 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6009 +0,0 @@ -/* IcedTeaPlugin -- implement OJI - Copyright (C) 2008 Red Hat - -This file is part of IcedTea. - -IcedTea is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -IcedTea 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 for more details. - -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -#include - -PRThread* current_thread (); - -#if PR_BYTES_PER_LONG == 8 -#define PLUGIN_JAVASCRIPT_TYPE jlong -#define PLUGIN_INITIALIZE_JAVASCRIPT_ARGUMENT(args, obj) args[0].j = obj -#define PLUGIN_JAVASCRIPT_SIGNATURE "(J)V" -#else -#define PLUGIN_JAVASCRIPT_TYPE jint -#define PLUGIN_INITIALIZE_JAVASCRIPT_ARGUMENT(args, obj) args[0].i = obj -#define PLUGIN_JAVASCRIPT_SIGNATURE "(I)V" -#endif - -// System includes. -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// GLib includes. -#include -#include - -// GTK includes. -#include - -// FIXME: Look into this: -// #0 nsACString_internal (this=0xbff3016c) at ../../../dist/include/string/nsTSubstring.h:522 -// #1 0x007117c9 in nsDependentCSubstring (this=0xbff3016c, str=@0xab20d00, startPos=0, length=0) at ../../dist/include/string/nsTDependentSubstring.h:68 -// #2 0x0076a9d9 in Substring (str=@0xab20d00, startPos=0, length=0) at ../../dist/include/string/nsTDependentSubstring.h:103 -// #3 0x008333a7 in nsStandardURL::Hostport (this=0xab20ce8) at nsStandardURL.h:338 -// #4 0x008299b8 in nsStandardURL::GetHostPort (this=0xab20ce8, result=@0xbff30210) at nsStandardURL.cpp:1003 -// #5 0x0095b9dc in nsPrincipal::GetOrigin (this=0xab114e0, aOrigin=0xbff30320) at nsPrincipal.cpp:195 -// #6 0x0154232c in nsCSecurityContext::GetOrigin (this=0xab8f410, buf=0xbff30390 "\004", buflen=256) at nsCSecurityContext.cpp:126 -// #7 0x04db377e in CNSAdapter_SecurityContextPeer::GetOrigin () from /opt/jdk1.6.0_03/jre/plugin/i386/ns7/libjavaplugin_oji.so -// #8 0x05acd59f in getAndPackSecurityInfo () from /opt/jdk1.6.0_03/jre/lib/i386/libjavaplugin_nscp.so -// #9 0x05acc77f in jni_SecureCallMethod () from /opt/jdk1.6.0_03/jre/lib/i386/libjavaplugin_nscp.so -// #10 0x05aba88d in CSecureJNIEnv::CallMethod () from /opt/jdk1.6.0_03/jre/lib/i386/libjavaplugin_nscp.so -// #11 0x04db1be7 in CNSAdapter_SecureJNIEnv::CallMethod () from /opt/jdk1.6.0_03/jre/plugin/i386/ns7/libjavaplugin_oji.so -// #12 0x0153e62f in ProxyJNIEnv::InvokeMethod (env=0xa8b8040, obj=0x9dad690, method=0xa0ed070, args=0x0) at ProxyJNI.cpp:571 -// #13 0x0153f91c in ProxyJNIEnv::InvokeMethod (env=0xa8b8040, obj=0x9dad690, method=0xa0ed070, args=0xbff3065c "\235\225$") at ProxyJNI.cpp:580 -// #14 0x0153fdbf in ProxyJNIEnv::CallObjectMethod (env=0xa8b8040, obj=0x9dad690, methodID=0xa0ed070) at ProxyJNI.cpp:641 - -// timeout (in seconds) for various calls to java side -#define TIMEOUT 180 - -#define NOT_IMPLEMENTED() \ - PLUGIN_DEBUG_1ARG ("NOT IMPLEMENTED: %s\n", __PRETTY_FUNCTION__) - -#define ID(object) \ - (object == NULL ? (PRUint32) 0 : reinterpret_cast (object)->identifier) - -static int plugin_debug = 0; - -#if 1 -// Debugging macros. - -#define PLUGIN_DEBUG_0ARG(str) \ - do \ - { \ - if (plugin_debug) \ - { \ - fprintf (stderr, str); \ - } \ - } while (0) - -#define PLUGIN_DEBUG_1ARG(str, arg1) \ - do \ - { \ - if (plugin_debug) \ - { \ - fprintf (stderr, str, arg1); \ - } \ - } while (0) - -#define PLUGIN_DEBUG_2ARG(str, arg1, arg2) \ - do \ - { \ - if (plugin_debug) \ - { \ - fprintf (stderr, str, arg1, arg2); \ - } \ - } while (0) - -#define PLUGIN_DEBUG_3ARG(str, arg1, arg2, arg3) \ - do \ - { \ - if (plugin_debug) \ - { \ - fprintf (stderr, str, arg1, arg2, arg3); \ - } \ - } while (0) - -#define PLUGIN_DEBUG_4ARG(str, arg1, arg2, arg3, arg4) \ - do \ - { \ - if (plugin_debug) \ - { \ - fprintf (stderr, str, arg1, arg2, arg3, arg4); \ - } \ - } while (0) - -#define PLUGIN_DEBUG(message) \ - PLUGIN_DEBUG_1ARG ("ICEDTEA PLUGIN: %s\n", message) - -#define PLUGIN_DEBUG_TWO(first, second) \ - PLUGIN_DEBUG_2ARG ("ICEDTEA PLUGIN: %s %s\n", \ - first, second) - -// Tracing. -class Trace -{ -public: - Trace (char const* name, char const* function) - { - Trace::name = name; - Trace::function = function; - PLUGIN_DEBUG_2ARG ("ICEDTEA PLUGIN: %s%s\n", - name, function); - } - - ~Trace () - { - PLUGIN_DEBUG_3ARG ("ICEDTEA PLUGIN: %s%s %s\n", - name, function, "return"); - } -private: - char const* name; - char const* function; -}; - -// Testing macro. -#define PLUGIN_TEST(expression, message) \ - do \ - { \ - if (!(expression)) \ - printf ("FAIL: %d: %s\n", __LINE__, \ - message); \ - } \ - while (0); - -#include -#include - -inline suseconds_t get_time_in_ms() -{ - struct timeval tv; - struct timezone tz; - gettimeofday(&tv, &tz); - - return tv.tv_usec; -} - - -inline long get_time_in_s() -{ - time_t t; - return time(&t); -} - -// __func__ is a variable, not a string literal, so it cannot be -// concatenated by the preprocessor. -#define PLUGIN_TRACE_JNIENV() Trace _trace ("JNIEnv::", __func__) -#define PLUGIN_TRACE_FACTORY() Trace _trace ("Factory::", __func__) -#define PLUGIN_TRACE_INSTANCE() Trace _trace ("Instance::", __func__) -#define PLUGIN_TRACE_EVENTSINK() Trace _trace ("EventSink::", __func__) -#define PLUGIN_TRACE_LISTENER() Trace _trace ("Listener::", __func__) -//#define PLUGIN_TRACE_RC() Trace _trace ("ResultContainer::", __func__) -#define PLUGIN_TRACE_RC() - -// Error reporting macros. -#define PLUGIN_ERROR(message) \ - fprintf (stderr, "%s:%d: Error: %s\n", __FILE__, __LINE__, \ - message) - -#define PLUGIN_ERROR_TWO(first, second) \ - fprintf (stderr, "%s:%d: Error: %s: %s\n", __FILE__, __LINE__, \ - first, second) - -#define PLUGIN_ERROR_THREE(first, second, third) \ - fprintf (stderr, "%s:%d: Error: %s: %s: %s\n", __FILE__, \ - __LINE__, first, second, third) - -#define PLUGIN_CHECK_RETURN(message, result) \ - if (NS_SUCCEEDED (result)) \ - { \ - PLUGIN_DEBUG (message); \ - } \ - else \ - { \ - PLUGIN_ERROR (message); \ - return result; \ - } - -#define PLUGIN_CHECK(message, result) \ - if (NS_SUCCEEDED (result)) \ - { \ - PLUGIN_DEBUG (message); \ - } else \ - { \ - PLUGIN_ERROR (message); \ - } - -#else - -// Debugging macros. -#define PLUGIN_DEBUG(message) -#define PLUGIN_DEBUG_TWO(first, second) - -// Testing macros. -#define PLUGIN_TEST(expression, message) -#define PLUGIN_TRACE_JNIENV() -#define PLUGIN_TRACE_FACTORY() Trace _trace ("Factory::", __func__) -//#define PLUGIN_TRACE_FACTORY() -#define PLUGIN_TRACE_INSTANCE() -#define PLUGIN_TRACE_EVENTSINK() -#define PLUGIN_TRACE_LISTENER() - -// Error reporting macros. -#define PLUGIN_ERROR(message) \ - fprintf (stderr, "%s:%d: Error: %s\n", __FILE__, __LINE__, \ - message) - -#define PLUGIN_ERROR_TWO(first, second) \ - fprintf (stderr, "%s:%d: Error: %s: %s\n", __FILE__, __LINE__, \ - first, second) - -#define PLUGIN_ERROR_THREE(first, second, third) \ - fprintf (stderr, "%s:%d: Error: %s: %s: %s\n", __FILE__, \ - __LINE__, first, second, third) -#define PLUGIN_CHECK_RETURN(message, result) -#define PLUGIN_CHECK(message, result) -#endif - -#define PLUGIN_NAME "IcedTea Java Web Browser Plugin (using " PLUGIN_VERSION ")" -#define PLUGIN_DESCRIPTION "The " PLUGIN_NAME " executes Java applets." -#define PLUGIN_MIME_DESC \ - "application/x-java-vm:class,jar:IcedTea;" \ - "application/x-java-applet:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.1:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.1.1:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.1.2:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.1.3:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.2:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.2.1:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.2.2:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.3:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.3.1:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.4:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.4.1:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.4.2:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.5:class,jar:IcedTea;" \ - "application/x-java-applet;version=1.6:class,jar:IcedTea;" \ - "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;" \ - "application/x-java-bean:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.1:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.1.1:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.1.2:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.1.3:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.2:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.2.1:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.2.2:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.3:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.3.1:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.4:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.4.1:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.4.2:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.5:class,jar:IcedTea;" \ - "application/x-java-bean;version=1.6:class,jar:IcedTea;" \ - "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;" - -#define FAILURE_MESSAGE "IcedTeaPluginFactory error: Failed to run %s." \ - " For more detail rerun \"firefox -g\" in a terminal window." - -// Global instance counter. -// A global variable for reporting GLib errors. This must be free'd -// and set to NULL after each use. -static GError* channel_error = NULL; -// Fully-qualified appletviewer executable. -gchar* data_directory = NULL; -static char* appletviewer_executable = NULL; -static char* libjvm_so = NULL; - -class IcedTeaPluginFactory; - -static PRBool factory_created = PR_FALSE; -static IcedTeaPluginFactory* factory = NULL; - -static PRBool jvm_attached = PR_FALSE; - -// Applet viewer input channel (needs to be static because it is used in plugin_in_pipe_callback) -GIOChannel* in_from_appletviewer = NULL; - -// Callback used to monitor input pipe status. -static gboolean plugin_in_pipe_callback (GIOChannel* source, - GIOCondition condition, - gpointer plugin_data); - -#include -#include -#include -#include -#include - -PRMonitor *jvmMsgQueuePRMonitor; -std::queue jvmMsgQueue; -nsCOMPtr processThread; - -// IcedTeaJNIEnv helpers. -class JNIReference -{ -public: - JNIReference (PRUint32 identifier); - ~JNIReference (); - PRUint32 identifier; - PRUint32 count; -}; - -JNIReference::JNIReference (PRUint32 identifier) - : identifier (identifier), - count (0) -{ - PLUGIN_DEBUG_2ARG ("JNIReference CONSTRUCT: %d %p\n", identifier, this); -} - -JNIReference::~JNIReference () -{ - PLUGIN_DEBUG_2ARG ("JNIReference DECONSTRUCT: %d %p\n", identifier, this); -} - -class JNIID : public JNIReference -{ -public: - JNIID (PRUint32 identifier, char const* signature); - ~JNIID (); - char const* signature; -}; - -JNIID::JNIID (PRUint32 identifier, char const* signature) - : JNIReference (identifier), - signature (strdup (signature)) -{ - PLUGIN_DEBUG_2ARG ("JNIID CONSTRUCT: %d %p\n", identifier, this); -} - -JNIID::~JNIID () -{ - PLUGIN_DEBUG_2ARG ("JNIID DECONSTRUCT: %d %p\n", identifier, this); -} - -char const* TYPES[10] = { "Object", - "boolean", - "byte", - "char", - "short", - "int", - "long", - "float", - "double", - "void" }; - - -// FIXME: create index from security context. -#define MESSAGE_CREATE() \ - nsCString message ("context "); \ - message.AppendInt (0); \ - -#define MESSAGE_ADD_STACK_REFERENCE(reference) \ - message += " reference "; \ - message.AppendInt (reference); \ - if (!factory->result_map.Get(reference, NULL)) { \ - ResultContainer *resultC = new ResultContainer(); \ - factory->result_map.Put(reference, resultC); \ - PLUGIN_DEBUG_3ARG ("ResultMap %p created for reference %d found = %d\n", resultC, reference, factory->result_map.Get(reference, NULL)); \ - } \ - else \ - { \ From andrew at icedtea.classpath.org Thu Jun 3 04:32:50 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Jun 2010 11:32:50 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset 408e1b8501d1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=408e1b8501d1 author: Andrew John Hughes date: Thu Jun 03 12:29:29 2010 +0100 Synchronise plugin with version on the 1.7 branch. 2010-06-03 Andrew John Hughes * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc, * plugin/icedteanp/IcedTeaPluginUtils.cc, * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Synchronise with version on IcedTea6 1.7 branch. changeset c19577b915ad in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c19577b915ad author: Andrew John Hughes date: Thu Jun 03 12:31:47 2010 +0100 Add missing escapes in clean-rt to join if statement together. 2010-06-03 Andrew John Hughes * Makefile.am: (clean-rt): Add missing escapes to join lines of if statement. diffstat: 5 files changed, 29 insertions(+), 4 deletions(-) ChangeLog | 13 +++++++++++++ Makefile.am | 4 ++-- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 11 +++++++++++ plugin/icedteanp/IcedTeaPluginUtils.cc | 2 -- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 3 +++ diffs (87 lines): diff -r 8d5863423d1b -r c19577b915ad ChangeLog --- a/ChangeLog Thu Jun 03 11:50:51 2010 +0100 +++ b/ChangeLog Thu Jun 03 12:31:47 2010 +0100 @@ -1,3 +1,16 @@ 2010-06-03 Andrew John Hughes + + * Makefile.am: + (clean-rt): Add missing escapes to join lines + of if statement. + +2010-06-03 Andrew John Hughes + + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc, + * plugin/icedteanp/IcedTeaPluginUtils.cc, + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: + Synchronise with version on IcedTea6 1.7 branch. + 2010-06-03 Andrew John Hughes * Makefile.am: diff -r 8d5863423d1b -r c19577b915ad Makefile.am --- a/Makefile.am Thu Jun 03 11:50:51 2010 +0100 +++ b/Makefile.am Thu Jun 03 12:31:47 2010 +0100 @@ -2643,8 +2643,8 @@ clean-rt: rm -rf lib/rt rm -f stamps/rt-class-files.stamp stamps/rt.stamp rm -f rt-source-files.txt - if [ -e bootstrap/boot/jre/lib ] ; then - cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar bootstrap/boot/jre/lib + if [ -e bootstrap/boot/jre/lib ] ; then \ + cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar bootstrap/boot/jre/lib ; \ fi # Target Aliases diff -r 8d5863423d1b -r c19577b915ad plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Jun 03 11:50:51 2010 +0100 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Jun 03 12:31:47 2010 +0100 @@ -463,6 +463,15 @@ PluginRequestProcessor::setMember(std::v } else { java_result = java_request.getString(propertyNameID); + + // the result we want is in result_string (assuming there was no error) + if (java_result->error_occurred) + { + printf("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg); + //goto cleanup; + } + + property_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str()); } AsyncCallThreadData thread_data = AsyncCallThreadData(); @@ -938,6 +947,8 @@ _call(void* data) ((AsyncCallThreadData*) data)->call_successful = browser_functions.invoke(instance, window_ptr, function, args, *arg_count, call_result); + IcedTeaPluginUtilities::printNPVariant(*call_result); + if (((AsyncCallThreadData*) data)->call_successful) { IcedTeaPluginUtilities::JSIDToString(call_result, &call_result_ptr_str); diff -r 8d5863423d1b -r c19577b915ad plugin/icedteanp/IcedTeaPluginUtils.cc --- a/plugin/icedteanp/IcedTeaPluginUtils.cc Thu Jun 03 11:50:51 2010 +0100 +++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Thu Jun 03 12:31:47 2010 +0100 @@ -777,8 +777,6 @@ IcedTeaPluginUtilities::javaResultToNPVa PLUGIN_DEBUG_1ARG("Method call returned a string: \"%s\"\n", return_str); STRINGZ_TO_NPVARIANT(return_str, *variant); - // delete string from java side, as it is no longer needed - java_request.deleteReference(return_obj_instance_id); } else { // Else this is a regular class. Reference the class object so diff -r 8d5863423d1b -r c19577b915ad plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jun 03 11:50:51 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jun 03 12:31:47 2010 +0100 @@ -556,6 +556,9 @@ import com.sun.jndi.toolkit.url.UrlUtil; request.documentbase = UrlUtil.decode(message.substring("tag".length() + 1, index)); request.tag = message.substring(index + 1); + PluginDebug.debug ("REQUEST TAG: " + request.tag + " " + + Thread.currentThread()); + PluginDebug.debug ("REQUEST TAG, PARSING " + Thread.currentThread()); PluginAppletViewer.parse From bugzilla-daemon at icedtea.classpath.org Thu Jun 3 06:30:31 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Jun 2010 13:30:31 +0000 Subject: [Bug 451] Incomplete links are created during build process without reporting errors Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=451 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|asu at redhat.com |.org | Status|NEW |ASSIGNED ------- Comment #5 from asu at redhat.com 2010-06-03 13:29 ------- Created an attachment (id=349) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=349&action=view) Patch for Makefile.am: added condition based off of an assumption on how --with-openjdk works -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From omajid at redhat.com Thu Jun 3 06:33:37 2010 From: omajid at redhat.com (Omair Majid) Date: Thu, 3 Jun 2010 13:33:37 +0000 (UTC) Subject: [RFC] PulseAudio bugfix References: <890957040.305821272918672013.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <129484441.306331272919037727.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: writes: > The attached diff fixes: > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438 > > Any comments? If these look okay, I assume the changes should be applied to both icedtea6 and icedtea. > The patch looks good to me. I can confirm it fixes the issue and adds the source to src.zip. Cheers, Omair From ahughes at redhat.com Thu Jun 3 06:51:34 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 3 Jun 2010 14:51:34 +0100 Subject: [RFC] PulseAudio bugfix In-Reply-To: References: <890957040.305821272918672013.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <129484441.306331272919037727.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: On 3 June 2010 14:33, Omair Majid wrote: > ? writes: > >> The attached diff fixes: >> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438 > >> >> Any comments? ?If these look okay, I assume the changes should be applied to > both icedtea6 and icedtea. >> > > The patch looks good to me. I can confirm it fixes the issue and adds the source > to src.zip. > > Cheers, > Omair > > Looks ok to me, though I'm not sure the second cd is necessary if you bracket it as in other targets. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Thu Jun 3 12:41:23 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Jun 2010 19:41:23 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME ------- Comment #3 from asu at redhat.com 2010-06-03 19:41 ------- Unable to reproduce - Works for me. java version "1.6.0_17" OpenJDK Runtime Environment (IcedTea6 1.7.1) (fedora-37.b17.fc13-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) Try an updated version of Icedtea and see if it will fix this issue for you. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 3 13:14:54 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Jun 2010 20:14:54 +0000 Subject: [Bug 290] plugin crash on amd64 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=290 ------- Comment #5 from asu at redhat.com 2010-06-03 20:14 ------- unable to reproduce. The applet runs for a while then times out. After that, it redirects me to the error page regarding it's timeout. It does not leave a java process running after it has ended, nor has firefox crashed. java version "1.6.0_17" OpenJDK Runtime Environment (IcedTea6 1.7.1) (fedora-37.b17.fc13-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) My situation is similar to Jon's first comment [1] [1]http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=290#c2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Fri Jun 4 07:59:28 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 04 Jun 2010 14:59:28 +0000 Subject: /hg/icedtea: 6 new changesets Message-ID: changeset 628ba74f1b0b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=628ba74f1b0b author: Matthias Klose date: Thu Jun 03 13:42:03 2010 +0100 Update NEWS for 1.8. 2010-03-17 Matthias Klose * NEWS: Update for 1.8. changeset 0ceaac97f06d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0ceaac97f06d author: Andrew John Hughes date: Thu Jun 03 14:53:04 2010 +0100 Updates for Hitachi SH 2010-03-17 Nobuhiro Iwamatsu * acinclude.m4 (IT_SET_ARCH_SETTINGS): Define architecture as sh for all sh* variants. * patches/sh4-support.patch: Likewise. changeset d4d99f124924 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d4d99f124924 author: Matthias Klose date: Thu Jun 03 17:51:26 2010 +0100 More NEWS ... 2010-03-17 Matthias Klose * NEWS: More news. changeset 36ef4b3af35c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=36ef4b3af35c author: Pavel Tisnovsky date: Thu Mar 18 19:27:35 2010 +0100 Added new regression test to check if the cacerts keytool database is configured and created properly and if SSL is really working. 2010-03-18 Pavel Tisnovsky * patches/jtreg-httpTest.patch: new regression test to check if the cacerts keytool database is configured and created properly and if SSL is really working. changeset b816ca920164 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b816ca920164 author: Deepak Bhole date: Fri Mar 19 11:40:06 2010 -0400 Fixed Bug# 166: Create FIFO pies in temp dir instead of ~/.icedteaplugin 2010-03-19 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (start_jvm_if_needed): Create pipes in a temporary dir instead of users home directory. (plugin_start_appletviewer): Pass pipe names to PluginMain when initializing Java. * plugin/icedteanp/java/sun/applet/PluginMain.java: Receive pipe names during initialization. changeset 788424aa74ed in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=788424aa74ed author: Gary Benson date: Fri Mar 19 15:50:36 2010 +0000 Shark updates 2010-03-19 Gary Benson * ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::do_field_access): Indentation fixes. * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (SharkBuilder::throw_ArithmeticException): New method. (SharkBuilder::throw_ClassCastException): Likewise. (SharkBuilder::frame_address): Likewise. (SharkBuilder::CreateGetFrameAddress): Likewise. * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::throw_ArithmeticException): New method. (SharkBuilder::throw_ClassCastException): Likewise. (SharkBuilder::frame_address): Likewise. (SharkBuilder::CreateGetFrameAddress): Likewise. (SharkBuilder::CreateMemoryBarrier): Actually do something on x86. * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp (SharkNativeWrapper::initialize): Implemented UseMembar code. * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp (SharkRuntime::throw_ArithmeticException): New method. (SharkRuntime::throw_ClassCastException): Likewise. * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp (SharkRuntime::throw_ArithmeticException): New method. (SharkRuntime::throw_ClassCastException): Likewise. * ports/hotspot/src/share/vm/shark/sharkStack.hpp (SharkStack::initialize): Added setup_sp_and_method parameter. (SharkStack::CreateStackOverflowCheck): New method. (SharkStack::CreateCheckStack): Likewise. (SharkStack::interpreter_entry_point): Likewise. (SharkStackWithNormalFrame::interpreter_entry_point): Likewise. (SharkStackWithNativeFrame::interpreter_entry_point): Likewise. (SharkStack::CreateHardStackOverflowCheck): Removed. (SharkStack::CreateSoftStackOverflowCheck): Likewise. * ports/hotspot/src/share/vm/shark/sharkStack.cpp (SharkStack::initialize): Added setup_sp_and_method parameter, and changed to use new stack overflow detection code. (SharkStack::CreateStackOverflowCheck): New method. (SharkStack::CreateCheckStack): Likewise. (SharkStack::CreateHardStackOverflowCheck): Removed. (SharkStack::CreateSoftStackOverflowCheck): Likewise. (SharkStackWithNormalFrame::interpreter_entry_point): Likewise. (SharkStackWithNativeFrame::interpreter_entry_point): Likewise. (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated. (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::static_field_ok_in_clinit): New method. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::scan_for_traps): New trap. (SharkTopLevelBlock::static_field_ok_in_clinit): New method. (SharkTopLevelBlock::zero_check_value): Throw arithmetic exception for divide by zero. (SharkTopLevelBlock::do_full_instance_check): Throw class cast exception. (SharkTopLevelBlock::do_monitorexit): Do not handle exceptions. * ports/hotspot/src/share/vm/shark/shark_globals.hpp: Make debugging options available in product builds. diffstat: 19 files changed, 527 insertions(+), 88 deletions(-) ChangeLog | 85 ++++++++++ Makefile.am | 3 NEWS | 28 +++ acinclude.m4 | 6 patches/jtreg-httpTest.patch | 37 ++++ patches/sh4-support.patch | 126 +++++++++++++-- plugin/icedteanp/IcedTeaNPPlugin.cc | 58 ++++-- plugin/icedteanp/java/sun/applet/PluginMain.java | 6 ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 12 - ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 22 ++ ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 6 ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 4 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 18 ++ ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 6 ports/hotspot/src/share/vm/shark/sharkStack.cpp | 89 +++++++--- ports/hotspot/src/share/vm/shark/sharkStack.hpp | 25 ++ ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 65 +++++++ ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 5 ports/hotspot/src/share/vm/shark/shark_globals.hpp | 14 - diffs (truncated from 1089 to 500 lines): diff -r c19577b915ad -r 788424aa74ed ChangeLog --- a/ChangeLog Thu Jun 03 12:31:47 2010 +0100 +++ b/ChangeLog Fri Mar 19 15:50:36 2010 +0000 @@ -1,3 +1,88 @@ 2010-06-03 Andrew John Hughes + + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp + (SharkBlock::do_field_access): Indentation fixes. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::throw_ArithmeticException): New method. + (SharkBuilder::throw_ClassCastException): Likewise. + (SharkBuilder::frame_address): Likewise. + (SharkBuilder::CreateGetFrameAddress): Likewise. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::throw_ArithmeticException): New method. + (SharkBuilder::throw_ClassCastException): Likewise. + (SharkBuilder::frame_address): Likewise. + (SharkBuilder::CreateGetFrameAddress): Likewise. + (SharkBuilder::CreateMemoryBarrier): Actually do something on x86. + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Implemented UseMembar code. + * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp + (SharkRuntime::throw_ArithmeticException): New method. + (SharkRuntime::throw_ClassCastException): Likewise. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::throw_ArithmeticException): New method. + (SharkRuntime::throw_ClassCastException): Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.hpp + (SharkStack::initialize): Added setup_sp_and_method parameter. + (SharkStack::CreateStackOverflowCheck): New method. + (SharkStack::CreateCheckStack): Likewise. + (SharkStack::interpreter_entry_point): Likewise. + (SharkStackWithNormalFrame::interpreter_entry_point): Likewise. + (SharkStackWithNativeFrame::interpreter_entry_point): Likewise. + (SharkStack::CreateHardStackOverflowCheck): Removed. + (SharkStack::CreateSoftStackOverflowCheck): Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.cpp + (SharkStack::initialize): Added setup_sp_and_method parameter, + and changed to use new stack overflow detection code. + (SharkStack::CreateStackOverflowCheck): New method. + (SharkStack::CreateCheckStack): Likewise. + (SharkStack::CreateHardStackOverflowCheck): Removed. + (SharkStack::CreateSoftStackOverflowCheck): Likewise. + (SharkStackWithNormalFrame::interpreter_entry_point): Likewise. + (SharkStackWithNativeFrame::interpreter_entry_point): Likewise. + (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated. + (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::static_field_ok_in_clinit): New method. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::scan_for_traps): New trap. + (SharkTopLevelBlock::static_field_ok_in_clinit): New method. + (SharkTopLevelBlock::zero_check_value): Throw arithmetic exception + for divide by zero. + (SharkTopLevelBlock::do_full_instance_check): Throw class cast + exception. + (SharkTopLevelBlock::do_monitorexit): Do not handle exceptions. + * ports/hotspot/src/share/vm/shark/shark_globals.hpp: + Make debugging options available in product builds. + +2010-03-19 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (start_jvm_if_needed): Create pipes in a temporary dir instead of users + home directory. + (plugin_start_appletviewer): Pass pipe names to PluginMain when initializing Java. + * plugin/icedteanp/java/sun/applet/PluginMain.java: Receive pipe names + during initialization. + +2010-03-18 Pavel Tisnovsky + + * patches/jtreg-httpTest.patch: new regression test + to check if the cacerts keytool database is configured and + created properly and if SSL is really working. + +2010-03-17 Matthias Klose + + * NEWS: More news. + +2010-03-17 Nobuhiro Iwamatsu + + * acinclude.m4 (IT_SET_ARCH_SETTINGS): Define architecture as sh + for all sh* variants. + * patches/sh4-support.patch: Likewise. + +2010-03-17 Matthias Klose + + * NEWS: Update for 1.8. + 2010-06-03 Andrew John Hughes * Makefile.am: diff -r c19577b915ad -r 788424aa74ed Makefile.am --- a/Makefile.am Thu Jun 03 12:31:47 2010 +0100 +++ b/Makefile.am Fri Mar 19 15:50:36 2010 +0000 @@ -312,7 +312,8 @@ ICEDTEA_PATCHES = \ patches/sh4-support.patch \ patches/extensions/netx.patch \ patches/extensions/netx-dist.patch \ - patches/extensions/netx-umask.patch + patches/extensions/netx-umask.patch \ + patches/jtreg-httpTest.patch # Conditional patches diff -r c19577b915ad -r 788424aa74ed NEWS --- a/NEWS Thu Jun 03 12:31:47 2010 +0100 +++ b/NEWS Fri Mar 19 15:50:36 2010 +0000 @@ -27,6 +27,34 @@ New in release 1.13 (2010-XX-XX) - Added JNI call tracing using systemtap version 1.0+ when configuring with --enable-systemtap. See tapset/hotspot_jni.stp. - Add support for Zero build on Hitachi SH. +- Removed the old plugin, replaced by the NPPlugin. +Bug fixes +- PR179: Rhino bootclasspath issue +- Add missing .c file to PulseAudio build +Zero/Shark +- Formatting changes and other fixes to match upstream +- PR428: Shark on ARM precompiled header incls +- Update Shark for LLVM r95390 API change. +- S6927165: Zero S/390 fixes (from upstream) +- Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs. +- Add s390 support to TCK setup helper script +- Strip stupid options that llvm-config supplies +- Update Shark for LLVM r94686 API change. +- S6914622, S6909153, S6913869 upstream Zero fixes. +- Fixed Shark sharkCompiler mattr memory corruption bug when using llvm 2.7. +NPPlugin fixes +- PR446: Use JDK_UPDATE_VERSION to set the jpi version. +- Re-designed frame embedding code so that the applet is dynamically + packed into given handle. This increases stability and breaks + reliance on the assumption that the browser will always provide a + handle in a certain sequence. +- Encode new lines, carriage returns, and other special characters + before sending them to Java side (de-coding code is already in + effect on Java side). +- Centralised and increased timeouts to give slow-loading applets + enough time to load. +- Fix security permissions related to get/set property, based on + specifications. New in release 1.12 (2009-11-17) diff -r c19577b915ad -r 788424aa74ed acinclude.m4 --- a/acinclude.m4 Thu Jun 03 12:31:47 2010 +0100 +++ b/acinclude.m4 Fri Mar 19 15:50:36 2010 +0000 @@ -74,6 +74,12 @@ JRE_ARCH_DIR=s390x CROSS_TARGET_ARCH=s390x ARCHFLAG="-m64" + ;; + sh*) + BUILD_ARCH_DIR=sh + INSTALL_ARCH_DIR=sh + JRE_ARCH_DIR=sh + CROSS_TARGET_ARCH=sh ;; *) BUILD_ARCH_DIR=`uname -m` diff -r c19577b915ad -r 788424aa74ed patches/jtreg-httpTest.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jtreg-httpTest.patch Fri Mar 19 15:50:36 2010 +0000 @@ -0,0 +1,37 @@ +--- /dev/null 2010-03-18 17:24:04.000000000 +0100 ++++ openjdk/jdk/test/java/net/URL/TestHttps.java 2010-03-18 17:24:04.000000000 +0100 +@@ -0,0 +1,34 @@ ++/* ++ * Copyright 2010 Red Hat, 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. ++ * ++ * 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. ++ */ ++ ++ ++/* @test ++ * @summary This test check if the cacerts keytool database is configured properly and SSL is really working. The test should not fail if SSL is working. ++ */ ++ ++import java.io.IOException; ++ ++import java.net.URL; ++import java.net.URLConnection; ++ ++public class TestHttps { ++ public static void main(String[] args) throws IOException { ++ new URL("https://www.verisign.com/").openConnection().connect(); ++ } ++} diff -r c19577b915ad -r 788424aa74ed patches/sh4-support.patch --- a/patches/sh4-support.patch Thu Jun 03 12:31:47 2010 +0100 +++ b/patches/sh4-support.patch Fri Mar 19 15:50:36 2010 +0000 @@ -1,7 +1,37 @@ diff -Nru openjdk.orig/corba/make/common +diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk +--- openjdk.orig/corba/make/common/Defs-linux.gmk 2010-06-03 14:00:19.000000000 +0100 ++++ openjdk/corba/make/common/Defs-linux.gmk 2010-06-03 14:08:47.000000000 +0100 +@@ -109,6 +109,7 @@ + LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 + CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 + LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 ++CFLAGS_REQUIRED_sh += -mieee + ifeq ($(ZERO_BUILD), true) + CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) + ifeq ($(ZERO_ENDIANNESS), little) +@@ -186,7 +187,7 @@ + CXXFLAGS_DBG += $(CC_LOWER_OPT) + endif + +-CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) \ ++CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha sh),,-D$(ARCH)) \ + -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ + -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT + diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk ---- openjdk.orig/corba/make/common/shared/Platform.gmk 2010-05-10 15:04:44.000000000 +0100 -+++ openjdk/corba/make/common/shared/Platform.gmk 2010-05-10 18:37:14.000000000 +0100 -@@ -220,6 +220,9 @@ +--- openjdk.orig/corba/make/common/shared/Platform.gmk 2010-06-03 14:00:19.000000000 +0100 ++++ openjdk/corba/make/common/shared/Platform.gmk 2010-06-03 14:11:30.000000000 +0100 +@@ -193,6 +193,9 @@ + arm*) \ + echo arm \ + ;; \ ++ sh*) \ ++ echo sh \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \ +@@ -220,6 +223,9 @@ else ARCH_DATA_MODEL=64 endif @@ -12,8 +42,8 @@ diff -Nru openjdk.orig/corba/make/common endif diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2010-05-10 15:04:44.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-05-10 18:37:14.000000000 +0100 +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-03 14:00:19.000000000 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-03 14:08:47.000000000 +0100 @@ -1756,7 +1756,8 @@ {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, @@ -37,9 +67,29 @@ diff -Nru openjdk.orig/hotspot/src/os/li #endif // Identify compatability class for VM's architecture and library's architecture +diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2010-06-03 14:00:19.000000000 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2010-06-03 14:08:47.000000000 +0100 +@@ -126,6 +126,7 @@ + LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 + CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 + LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 ++CFLAGS_REQUIRED_sh += -mieee + ifeq ($(ZERO_BUILD), true) + CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) + ifeq ($(ZERO_ENDIANNESS), little) +@@ -204,7 +205,7 @@ + CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) + endif + +-CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) \ ++CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha sh),,-D$(ARCH)) \ + -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ + -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT + diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2010-05-10 15:04:45.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-05-10 18:37:14.000000000 +0100 +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2010-06-03 14:00:21.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-06-03 14:08:47.000000000 +0100 @@ -117,6 +117,11 @@ REQUIRED_CC_VER = 3.2 REQUIRED_GCC_VER = 3.2.* @@ -52,9 +102,67 @@ diff -Nru openjdk.orig/jdk/make/common/s # Option used to create a shared library SHARED_LIBRARY_FLAG = -shared -mimpure-text SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) +diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2010-06-03 14:00:19.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2010-06-03 14:08:47.000000000 +0100 +@@ -171,6 +171,9 @@ + arm*) \ + echo arm \ + ;; \ ++ sh*) \ ++ echo sh \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \ +@@ -198,6 +201,9 @@ + else + ARCH_DATA_MODEL=64 + endif ++ ifeq ($(ARCH), sh) ++ ARCH_DATA_MODEL=32 ++ endif + endif + endif + +diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk +--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2010-06-03 14:00:19.000000000 +0100 ++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2010-06-03 14:10:12.000000000 +0100 +@@ -114,9 +114,9 @@ + CPPFLAGS += -DX_ARCH=X_SPARCV9 + endif # ARCH sparcv9 + +- ifeq ($(ARCH), amd64) +- CPPFLAGS += -DX_ARCH=X_AMD64 +- endif # ARCH amd64 ++ ifeq ($(ARCH), sh) ++ CPPFLAGS += -DX_ARCH=X_SH ++ endif # ARCH Renesas SuperH(sh) + endif + + +diff -Nru openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh +--- openjdk.orig/jdk/make/jdk_generic_profile.sh 2010-05-19 19:30:53.000000000 +0100 ++++ openjdk/jdk/make/jdk_generic_profile.sh 2010-06-03 14:10:57.000000000 +0100 +@@ -349,13 +349,14 @@ + i?86) ZERO_LIBARCH=i386 ;; + sparc64) ZERO_LIBARCH=sparcv9 ;; + arm*) ZERO_LIBARCH=arm ;; ++ sh*) ZERO_LIBARCH=sh ;; + *) ZERO_LIBARCH="$(arch)" + esac + export ZERO_LIBARCH + + # ARCH_DATA_MODEL is the number of bits in a pointer + case "${ZERO_LIBARCH}" in +- i386|ppc|s390|sparc|arm) ++ i386|ppc|s390|sparc|arm|sh) + ARCH_DATA_MODEL=32 + ;; + amd64|ppc64|s390x|sparcv9|ia64|alpha) diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ---- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-05-10 15:04:44.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-05-10 18:37:14.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-03 14:00:19.000000000 +0100 ++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-03 14:08:47.000000000 +0100 @@ -47,7 +47,8 @@ #define X_S390X 12 #define X_SPARC 13 diff -r c19577b915ad -r 788424aa74ed plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 03 12:31:47 2010 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Mar 19 15:50:36 2010 +0000 @@ -434,8 +434,8 @@ void start_jvm_if_needed() // pipe. // in_pipe_name - in_pipe_name = g_strdup_printf ("%s/icedteanp-appletviewer-to-plugin", - data_directory); + in_pipe_name = g_strdup_printf ("%s/%s-icedteanp-appletviewer-to-plugin", + data_directory, getenv ("USER")); if (!in_pipe_name) { PLUGIN_ERROR ("Failed to create input pipe name."); @@ -449,7 +449,7 @@ void start_jvm_if_needed() unlink (in_pipe_name); PLUGIN_DEBUG_1ARG ("GCJ_New: creating input fifo: %s\n", in_pipe_name); - if (mkfifo (in_pipe_name, 0700) == -1 && errno != EEXIST) + if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST) { PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno)); np_error = NPERR_GENERIC_ERROR; @@ -461,8 +461,8 @@ void start_jvm_if_needed() // output pipe. // out_pipe_name - out_pipe_name = g_strdup_printf ("%s/icedteanp-plugin-to-appletviewer", - data_directory); + out_pipe_name = g_strdup_printf ("%s/%s-icedteanp-plugin-to-appletviewer", + data_directory, getenv ("USER")); if (!out_pipe_name) { @@ -475,7 +475,7 @@ void start_jvm_if_needed() unlink (out_pipe_name); PLUGIN_DEBUG_1ARG ("GCJ_New: creating output fifo: %s\n", out_pipe_name); - if (mkfifo (out_pipe_name, 0700) == -1 && errno != EEXIST) + if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST) { PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno)); np_error = NPERR_GENERIC_ERROR; @@ -1461,19 +1461,23 @@ plugin_start_appletviewer (GCJPluginData if (plugin_debug) { - command_line = (gchar**) malloc(sizeof(gchar*)*6); + command_line = (gchar**) malloc(sizeof(gchar*)*8); command_line[0] = g_strdup(appletviewer_executable); command_line[1] = g_strdup("-Xdebug"); command_line[2] = g_strdup("-Xnoagent"); command_line[3] = g_strdup("-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"); command_line[4] = g_strdup("sun.applet.PluginMain"); - command_line[5] = NULL; + command_line[5] = g_strdup(out_pipe_name); + command_line[6] = g_strdup(in_pipe_name); + command_line[7] = NULL; } else { - command_line = (gchar**) malloc(sizeof(gchar)*3); + command_line = (gchar**) malloc(sizeof(gchar)*5); command_line[0] = g_strdup(appletviewer_executable); command_line[1] = g_strdup("sun.applet.PluginMain"); - command_line[2] = NULL; + command_line[2] = g_strdup(out_pipe_name); + command_line[3] = g_strdup(in_pipe_name); + command_line[4] = NULL; } if (!g_spawn_async (NULL, command_line, NULL, (GSpawnFlags) G_SPAWN_DO_NOT_REAP_CHILD, @@ -1963,7 +1967,7 @@ NP_Initialize (NPNetscapeFuncs* browserT // Make sure the plugin data directory exists, creating it if // necessary. - data_directory = g_strconcat (getenv ("HOME"), "/.icedteaplugin", NULL); + data_directory = g_strconcat (P_tmpdir, NULL); if (!data_directory) { PLUGIN_ERROR ("Failed to create data directory name."); @@ -1971,20 +1975,34 @@ NP_Initialize (NPNetscapeFuncs* browserT } NPError np_error = NPERR_NO_ERROR; gchar* filename = NULL; + + // If P_tmpdir does not exist, try /tmp directly + if (!g_file_test (data_directory, (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { int file_error = 0; - file_error = g_mkdir (data_directory, 0700); - if (file_error != 0) - { - PLUGIN_ERROR_THREE ("Failed to create data directory", - data_directory, - strerror (errno)); - np_error = NPERR_GENERIC_ERROR; - goto cleanup_data_directory; - } + data_directory = g_strconcat ("/tmp", NULL); + if (!data_directory) + { + PLUGIN_ERROR ("Failed to create data directory name."); + return NPERR_OUT_OF_MEMORY_ERROR; + } + + } + + // If that doesn't exit, bail + if (!g_file_test (data_directory, + (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + { + PLUGIN_ERROR_THREE ("Temp directory does not exist: ", + data_directory, + strerror (errno)); + + np_error = NPERR_GENERIC_ERROR; + goto cleanup_data_directory; + } // Set appletviewer_executable. diff -r c19577b915ad -r 788424aa74ed plugin/icedteanp/java/sun/applet/PluginMain.java --- a/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 03 12:31:47 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Fri Mar 19 15:50:36 2010 +0000 @@ -107,9 +107,13 @@ public class PluginMain public static void main(String args[]) throws IOException { + if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { + System.err.println("Invalid pipe names provided. Refusing to proceed."); + System.exit(1); + } try { - PluginMain pm = new PluginMain(System.getProperty("user.home") + "/.icedteaplugin/icedteanp-plugin-to-appletviewer", System.getProperty("user.home") + "/.icedteaplugin/icedteanp-appletviewer-to-plugin"); + PluginMain pm = new PluginMain(args[0], args[1]); } catch (Exception e) { e.printStackTrace(); System.err.println("Something very bad happened. I don't know what to do, so I am going to exit :("); diff -r c19577b915ad -r 788424aa74ed ports/hotspot/src/share/vm/shark/sharkBlock.cpp From jon.vanalten at redhat.com Fri Jun 4 08:56:23 2010 From: jon.vanalten at redhat.com (jon.vanalten at redhat.com) Date: Fri, 4 Jun 2010 11:56:23 -0400 (EDT) Subject: [RFC] PulseAudio bugfix In-Reply-To: <624414806.1172811275666384645.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <555293513.1173981275666983849.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Thanks for the reviews. ----- "Andrew John Hughes" wrote: > On 3 June 2010 14:33, Omair Majid wrote: > > ? writes: > > > >> The attached diff fixes: > >> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438 > > > > The patch looks good to me. I can confirm it fixes the issue and > adds the source > > to src.zip. > > > > Cheers, > > Omair > > > > > > Looks ok to me, though I'm not sure the second cd is necessary if you > bracket it as in other targets. Ah, thanks for the tip. You are absolutely right :D I've tested with this change in icedtea6 HEAD, about to test with icedtea HEAD, commits to follow shortly. cheers, jon > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Jun 4 09:22:56 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 4 Jun 2010 17:22:56 +0100 Subject: [RFC] PulseAudio bugfix In-Reply-To: <555293513.1173981275666983849.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <624414806.1172811275666384645.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <555293513.1173981275666983849.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: On 4 June 2010 16:56, wrote: > Thanks for the reviews. > > > ----- "Andrew John Hughes" wrote: > >> On 3 June 2010 14:33, Omair Majid wrote: >> > ? writes: >> > >> >> The attached diff fixes: >> >> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438 >> > >> > The patch looks good to me. I can confirm it fixes the issue and >> adds the source >> > to src.zip. >> > >> > Cheers, >> > Omair >> > >> > >> >> Looks ok to me, though I'm not sure the second cd is necessary if you >> bracket it as in other targets. > > Ah, thanks for the tip. ?You are absolutely right :D > > I've tested with this change in icedtea6 HEAD, about to test with icedtea HEAD, commits to follow shortly. > > cheers, > > jon > > >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > Please leave icedtea7 for now; the patch will get applied as part of the current forwardporting process. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From vanaltj at icedtea.classpath.org Fri Jun 4 11:23:29 2010 From: vanaltj at icedtea.classpath.org (vanaltj at icedtea.classpath.org) Date: Fri, 04 Jun 2010 18:23:29 +0000 Subject: /hg/icedtea6: Fix bug in PulseAudio backend http://icedtea.class... Message-ID: changeset f08bf2c87805 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f08bf2c87805 author: Jon VanAlten date: Fri Jun 04 14:20:15 2010 -0400 Fix bug in PulseAudio backend http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438 * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine. java: (isControlSupported): Correctly determine if control- type is supported. * Makefile.am (stamps/icedtea.stamp): Add PulseAudio sources to src.zip diffstat: 3 files changed, 13 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ Makefile.am | 2 ++ pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 4 +++- diffs (41 lines): diff -r 7674917fa451 -r f08bf2c87805 ChangeLog --- a/ChangeLog Tue Jun 01 11:38:30 2010 +0200 +++ b/ChangeLog Fri Jun 04 14:20:15 2010 -0400 @@ -1,3 +1,11 @@ 2010-06-01 Xerxes R??nby + + * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java: + (isControlSupported): Correctly determine if control-type is + supported. + * Makefile.am + (stamps/icedtea.stamp): Add PulseAudio sources to src.zip + 2010-06-01 Xerxes R??nby * Makefile.am: diff -r 7674917fa451 -r f08bf2c87805 Makefile.am --- a/Makefile.am Tue Jun 01 11:38:30 2010 +0200 +++ b/Makefile.am Fri Jun 04 14:20:15 2010 -0400 @@ -1250,6 +1250,8 @@ if ENABLE_PULSE_JAVA $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif if WITH_VISUALVM mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ diff -r 7674917fa451 -r f08bf2c87805 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java --- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Tue Jun 01 11:38:30 2010 +0200 +++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Fri Jun 04 14:20:15 2010 -0400 @@ -102,7 +102,9 @@ abstract class PulseAudioLine implements @Override public boolean isControlSupported(Type control) { for (Control myControl : controls) { - if (myControl.getType().getClass() == control.getClass()) { + //Control.Type's known descendants keep a set of + //static Types. + if (myControl.getType().equals(control)) { return true; } } From andrew at icedtea.classpath.org Fri Jun 4 12:29:05 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 04 Jun 2010 19:29:05 +0000 Subject: /hg/release/icedtea6-1.7: 4 new changesets Message-ID: changeset 22539a0f31fe in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=22539a0f31fe author: Deepak Bhole date: Fri Jun 04 14:26:12 2010 +0100 Fixed Bug# 166: Create FIFO pies in temp dir instead of ~/.icedteaplugin 2010-03-19 Deepak Bhole PR icedtea/166: * plugin/icedteanp/IcedTeaNPPlugin.cc (start_jvm_if_needed): Create pipes in a temporary dir instead of users home directory. (plugin_start_appletviewer): Pass pipe names to PluginMain when initializing Java. * plugin/icedteanp/java/sun/applet/PluginMain.java: Receive pipe names during initialization. changeset caf319401914 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=caf319401914 author: Deepak Bhole date: Mon Mar 22 15:34:55 2010 -0400 Changed FIFO file location from /tmp/$user-... to /tmp/icedteaplugin-$user/$pid-... 2010-03-22 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (start_jvm_if_needed): Change pipe file name format. (NP_Initialize): Put FIFO pipe in a separate per-user directory. changeset cd90c47cdc63 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cd90c47cdc63 author: Deepak Bhole date: Tue Apr 06 14:17:02 2010 -0400 Profiled memory usage and implemented proper cleanup for C++ side. 2010-04-06 Deepak Bhole * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc (newMessageOnBus): Update to used string pointer vector (form strSplit) instead of a string vector. Correctly free memory. * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Initialize message_queue to be a string pointer vector vector instead of a string vector vector. (newMessageOnBus): Update to used string pointer vector (form strSplit) instead of a string vector. Correctly free memory. (sendWindow): Deal with string pointers instead of strings for message parts. (eval): Same. (call): Same. (sendString): Same. (setMember): Same. (sendMember): Same. (finalize): Same. (queue_processor): Same. Also, free message part memory after processing. * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Change method signatures to deal with string pointer vectors instead of string vectors. * plugin/icedteanp/IcedTeaPluginUtils.cc (stringToJSID): Added another signature that receives a string pointer. (strSplit): Return string pointer vector instead of string vector. (getUTF8String): Change signature to receive string pointer vector instead of string vector. Update function accordingly. (getUTF16LEString): Same. (subscribe): Make subscription atomic. (unSubscribe): Make unsubscription atomic, bound to same lock as subscribe(). (post): Make list iteration and processing atomic, bound to same lock as subscribe and unSubscribe. * plugin/icedteanp/IcedTeaPluginUtils.h: Added new signature for stringToJSID and updated signatures for strSplit, getUTF8String and getUTF16LEString. * plugin/icedteanp/IcedTeaScriptablePluginObject.cc (IcedTeaScriptableJavaPackageObject::deAllocate): Implemented method. (IcedTeaScriptableJavaPackageObject::invalidate): Same. (IcedTeaScriptableJavaObject::deAllocate): Same. (IcedTeaScriptableJavaObject::invalidate): Same. changeset c67ef4e93e63 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=c67ef4e93e63 author: Deepak Bhole date: Wed Apr 07 14:49:04 2010 -0400 Update debug output string and function/structure names to change 'GCJ' references to ITNP/IcedTea NP Plugin Remove unnecessary trace print from proxy related code on Java side 2010-04-07 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with "ITNP", and change other strings to remove reference to GCJ. * plugin/icedteanp/IcedTeaNPPlugin.h : Renamed GCJPluginData to ITNPPluginData. * plugin/icedteanp/IcedTeaPluginUtils.h: Changed debug output to be prefixed with "ICEDTEA NP PLUGIN" instead of "GCJ PLUGIN". * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java: Don't print ArrayIndexOutOfBounds traces. Continue to print any others. diffstat: 11 files changed, 411 insertions(+), 274 deletions(-) ChangeLog | 68 ++ plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 97 +-- plugin/icedteanp/IcedTeaNPPlugin.cc | 270 +++++----- plugin/icedteanp/IcedTeaNPPlugin.h | 4 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 135 ++--- plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 16 plugin/icedteanp/IcedTeaPluginUtils.cc | 61 +- plugin/icedteanp/IcedTeaPluginUtils.h | 19 plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 7 plugin/icedteanp/java/sun/applet/PluginMain.java | 6 plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 2 diffs (truncated from 1653 to 500 lines): diff -r 0235bfe1d08d -r c67ef4e93e63 ChangeLog --- a/ChangeLog Wed Jun 02 19:56:03 2010 +0100 +++ b/ChangeLog Wed Apr 07 14:49:04 2010 -0400 @@ -1,3 +1,71 @@ 2010-06-02 Andrew John Hughes + + * plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with "ITNP", and + change other strings to remove reference to GCJ. + * plugin/icedteanp/IcedTeaNPPlugin.h : Renamed GCJPluginData to + ITNPPluginData. + * plugin/icedteanp/IcedTeaPluginUtils.h: Changed debug output to be + prefixed with "ICEDTEA NP PLUGIN" instead of "GCJ PLUGIN". + * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java: Don't + print ArrayIndexOutOfBounds traces. Continue to print any others. + +2010-04-06 Deepak Bhole + + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc + (newMessageOnBus): Update to used string pointer vector (form strSplit) + instead of a string vector. Correctly free memory. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Initialize + message_queue to be a string pointer vector vector instead of a string + vector vector. + (newMessageOnBus): Update to used string pointer vector (form strSplit) + instead of a string vector. Correctly free memory. + (sendWindow): Deal with string pointers instead of strings for message + parts. + (eval): Same. + (call): Same. + (sendString): Same. + (setMember): Same. + (sendMember): Same. + (finalize): Same. + (queue_processor): Same. Also, free message part memory after processing. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Change method + signatures to deal with string pointer vectors instead of string vectors. + * plugin/icedteanp/IcedTeaPluginUtils.cc + (stringToJSID): Added another signature that receives a string pointer. + (strSplit): Return string pointer vector instead of string vector. + (getUTF8String): Change signature to receive string pointer vector instead + of string vector. Update function accordingly. + (getUTF16LEString): Same. + (subscribe): Make subscription atomic. + (unSubscribe): Make unsubscription atomic, bound to same lock as + subscribe(). + (post): Make list iteration and processing atomic, bound to same lock as + subscribe and unSubscribe. + * plugin/icedteanp/IcedTeaPluginUtils.h: Added new signature for + stringToJSID and updated signatures for strSplit, getUTF8String and + getUTF16LEString. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc + (IcedTeaScriptableJavaPackageObject::deAllocate): Implemented method. + (IcedTeaScriptableJavaPackageObject::invalidate): Same. + (IcedTeaScriptableJavaObject::deAllocate): Same. + (IcedTeaScriptableJavaObject::invalidate): Same. + +2010-03-22 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (start_jvm_if_needed): Change pipe file name format. + (NP_Initialize): Put FIFO pipe in a separate per-user directory. + +2010-03-19 Deepak Bhole + + PR icedtea/166: + * plugin/icedteanp/IcedTeaNPPlugin.cc + (start_jvm_if_needed): Create pipes in a temporary dir instead of users + home directory. + (plugin_start_appletviewer): Pass pipe names to PluginMain when initializing Java. + * plugin/icedteanp/java/sun/applet/PluginMain.java: Receive pipe names + during initialization. + 2010-06-02 Andrew John Hughes * NEWS: Update with latest backports. diff -r 0235bfe1d08d -r c67ef4e93e63 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Wed Jun 02 19:56:03 2010 +0100 +++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Wed Apr 07 14:49:04 2010 -0400 @@ -60,21 +60,21 @@ JavaRequestProcessor::newMessageOnBus(co { // Anything we are waiting for _MUST_ have and instance id and reference # - std::vector* message_parts = IcedTeaPluginUtilities::strSplit(message, " "); + std::vector* message_parts = IcedTeaPluginUtilities::strSplit(message, " "); - IcedTeaPluginUtilities::printStringVector("JavaRequest::newMessageOnBus:", message_parts); + IcedTeaPluginUtilities::printStringPtrVector("JavaRequest::newMessageOnBus:", message_parts); - if (message_parts->at(0) == "context" && message_parts->at(2) == "reference") - if (atoi(message_parts->at(1).c_str()) == this->instance && atoi(message_parts->at(3).c_str()) == this->reference) + if (*(message_parts->at(0)) == "context" && *(message_parts->at(2)) == "reference") + if (atoi(message_parts->at(1)->c_str()) == this->instance && atoi(message_parts->at(3)->c_str()) == this->reference) { // Gather the results // Let's get errors out of the way first - if (message_parts->at(4).find("Error") == 0) + if (!message_parts->at(4)->find("Error")) { for (int i=5; i < message_parts->size(); i++) { - result->error_msg->append(message_parts->at(i)); + result->error_msg->append(*(message_parts->at(i))); result->error_msg->append(" "); } @@ -83,78 +83,78 @@ JavaRequestProcessor::newMessageOnBus(co result->error_occurred = true; result_ready = true; } - else if (message_parts->at(4) == "GetStringUTFChars" || - message_parts->at(4) == "GetToStringValue") + else if (!message_parts->at(4)->find("GetStringUTFChars") || + !message_parts->at(4)->find("GetToStringValue")) { // first item is length, and it is radix 10 - int length = strtol(message_parts->at(5).c_str(), NULL, 10); + int length = strtol(message_parts->at(5)->c_str(), NULL, 10); IcedTeaPluginUtilities::getUTF8String(length, 6 /* start at */, message_parts, result->return_string); result_ready = true; } - else if (message_parts->at(4) == "GetStringChars") // GetStringChars (UTF-16LE/UCS-2) + else if (!message_parts->at(4)->find("GetStringChars")) // GetStringChars (UTF-16LE/UCS-2) { // first item is length, and it is radix 10 - int length = strtol(message_parts->at(5).c_str(), NULL, 10); + int length = strtol(message_parts->at(5)->c_str(), NULL, 10); IcedTeaPluginUtilities::getUTF16LEString(length, 6 /* start at */, message_parts, result->return_wstring); result_ready = true; - } else if ((message_parts->at(4) == "FindClass") || - (message_parts->at(4) == "GetClassName") || - (message_parts->at(4) == "GetClassID") || - (message_parts->at(4) == "GetMethodID") || - (message_parts->at(4) == "GetStaticMethodID") || - (message_parts->at(4) == "GetObjectClass") || - (message_parts->at(4) == "NewObject") || - (message_parts->at(4) == "NewStringUTF") || - (message_parts->at(4) == "HasPackage") || - (message_parts->at(4) == "HasMethod") || - (message_parts->at(4) == "HasField") || - (message_parts->at(4) == "GetStaticFieldID") || - (message_parts->at(4) == "GetFieldID") || - (message_parts->at(4) == "GetJavaObject") || - (message_parts->at(4) == "IsInstanceOf") || - (message_parts->at(4) == "NewArray")) + } else if (!message_parts->at(4)->find("FindClass") || + !message_parts->at(4)->find("GetClassName") || + !message_parts->at(4)->find("GetClassID") || + !message_parts->at(4)->find("GetMethodID") || + !message_parts->at(4)->find("GetStaticMethodID") || + !message_parts->at(4)->find("GetObjectClass") || + !message_parts->at(4)->find("NewObject") || + !message_parts->at(4)->find("NewStringUTF") || + !message_parts->at(4)->find("HasPackage") || + !message_parts->at(4)->find("HasMethod") || + !message_parts->at(4)->find("HasField") || + !message_parts->at(4)->find("GetStaticFieldID") || + !message_parts->at(4)->find("GetFieldID") || + !message_parts->at(4)->find("GetJavaObject") || + !message_parts->at(4)->find("IsInstanceOf") || + !message_parts->at(4)->find("NewArray")) { - result->return_identifier = atoi(message_parts->at(5).c_str()); - result->return_string->append(message_parts->at(5)); // store it as a string as well, for easy access + result->return_identifier = atoi(message_parts->at(5)->c_str()); + result->return_string->append(*(message_parts->at(5))); // store it as a string as well, for easy access result_ready = true; - } else if ((message_parts->at(4) == "DeleteLocalRef") || - (message_parts->at(4) == "NewGlobalRef")) + } else if (!message_parts->at(4)->find("DeleteLocalRef") || + !message_parts->at(4)->find("NewGlobalRef")) { result_ready = true; // nothing else to do - } else if ((message_parts->at(4) == "CallMethod") || - (message_parts->at(4) == "CallStaticMethod") || - (message_parts->at(4) == "GetField") || - (message_parts->at(4) == "GetStaticField") || - (message_parts->at(4) == "GetValue") || - (message_parts->at(4) == "GetObjectArrayElement")) + } else if (!message_parts->at(4)->find("CallMethod") || + !message_parts->at(4)->find("CallStaticMethod") || + !message_parts->at(4)->find("GetField") || + !message_parts->at(4)->find("GetStaticField") || + !message_parts->at(4)->find("GetValue") || + !message_parts->at(4)->find("GetObjectArrayElement")) { - if (message_parts->at(5) == "literalreturn") + if (!message_parts->at(5)->find("literalreturn")) { // literal returns don't have a corresponding jni id result->return_identifier = 0; - result->return_string->append(message_parts->at(5)); + result->return_string->append(*(message_parts->at(5))); result->return_string->append(" "); - result->return_string->append(message_parts->at(6)); + result->return_string->append(*(message_parts->at(6))); } else { // Else it is a complex object - result->return_identifier = atoi(message_parts->at(5).c_str()); - result->return_string->append(message_parts->at(5)); // store it as a string as well, for easy access + result->return_identifier = atoi(message_parts->at(5)->c_str()); + result->return_string->append(*(message_parts->at(5))); // store it as a string as well, for easy access } result_ready = true; - } else if ((message_parts->at(4) == "GetArrayLength")) + } else if (!message_parts->at(4)->find("GetArrayLength")) { result->return_identifier = 0; // length is not an "identifier" - result->return_string->append(message_parts->at(5)); + result->return_string->append(*(message_parts->at(5))); result_ready = true; - } else if ((message_parts->at(4) == "SetField") || - (message_parts->at(4) == "SetObjectArrayElement")) + } else if (!message_parts->at(4)->find("SetField") || + !message_parts->at(4)->find("SetObjectArrayElement")) { // nothing to do @@ -163,13 +163,12 @@ JavaRequestProcessor::newMessageOnBus(co result_ready = true; } - delete message_parts; + IcedTeaPluginUtilities::freeStringPtrVector(message_parts); return true; } - delete message_parts; + IcedTeaPluginUtilities::freeStringPtrVector(message_parts); return false; - } /** diff -r 0235bfe1d08d -r c67ef4e93e63 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jun 02 19:56:03 2010 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Apr 07 14:49:04 2010 -0400 @@ -131,7 +131,7 @@ exception statement from your version. * #define PLUGIN_FILE_EXTS "class,jar,zip" #define PLUGIN_MIME_COUNT 1 -#define FAILURE_MESSAGE "gcjwebplugin error: Failed to run %s." \ +#define FAILURE_MESSAGE "icedteanp plugin error: Failed to run %s." \ " For more detail rerun \"firefox -g\" in a terminal window." #if MOZILLA_VERSION_COLLAPSED < 1090100 @@ -194,8 +194,8 @@ typedef union #endif // Static instance helper functions. -// Have the browser allocate a new GCJPluginData structure. -static void plugin_data_new (GCJPluginData** data); +// Have the browser allocate a new ITNPPluginData structure. +static void plugin_data_new (ITNPPluginData** data); // Retrieve the current document's documentbase. static gchar* plugin_get_documentbase (NPP instance); // Notify the user that the appletviewer is not installed correctly. @@ -208,11 +208,11 @@ static gboolean plugin_out_pipe_callback static gboolean plugin_out_pipe_callback (GIOChannel* source, GIOCondition condition, gpointer plugin_data); -static NPError plugin_start_appletviewer (GCJPluginData* data); +static NPError plugin_start_appletviewer (ITNPPluginData* data); static gchar* plugin_create_applet_tag (int16_t argc, char* argn[], char* argv[]); static void plugin_stop_appletviewer (); -// Uninitialize GCJPluginData structure +// Uninitialize ITNPPluginData structure static void plugin_data_destroy (NPP instance); NPError get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len); @@ -238,8 +238,8 @@ int plugin_debug = getenv ("ICEDTEAPLUGI pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER; -// Functions prefixed by GCJ_ are instance functions. They are called -// by the browser and operate on instances of GCJPluginData. +// Functions prefixed by ITNP_ are instance functions. They are called +// by the browser and operate on instances of ITNPPluginData. // Functions prefixed by plugin_ are static helper functions. // Functions prefixed by NP_ are factory functions. They are called // by the browser and provide functionality needed to create plugin @@ -247,22 +247,22 @@ pthread_cond_t cond_message_available = // INSTANCE FUNCTIONS -// Creates a new gcjwebplugin instance. This function creates a -// GCJPluginData* and stores it in instance->pdata. The following -// GCJPluginData fiels are initialized: instance_string, in_pipe_name, +// Creates a new icedtea np plugin instance. This function creates a +// ITNPPluginData* and stores it in instance->pdata. The following +// ITNPPluginData fiels are initialized: instance_string, in_pipe_name, // in_from_appletviewer, in_watch_source, out_pipe_name, // out_to_appletviewer, out_watch_source, appletviewer_mutex, owner, // appletviewer_alive. In addition two pipe files are created. All // of those fields must be properly destroyed, and the pipes deleted, -// by GCJ_Destroy. If an error occurs during initialization then this +// by ITNP_Destroy. If an error occurs during initialization then this // function will free anything that's been allocated so far, set // instance->pdata to NULL and return an error code. NPError -GCJ_New (NPMIMEType pluginType, NPP instance, uint16_t mode, +ITNP_New (NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved) { - PLUGIN_DEBUG_0ARG("GCJ_New\n"); + PLUGIN_DEBUG_0ARG("ITNP_New\n"); static NPObject *window_ptr; NPIdentifier identifier; @@ -280,7 +280,7 @@ GCJ_New (NPMIMEType pluginType, NPP inst NPError np_error = NPERR_NO_ERROR; - GCJPluginData* data = NULL; + ITNPPluginData* data = NULL; gchar* documentbase = NULL; gchar* read_message = NULL; @@ -401,7 +401,7 @@ GCJ_New (NPMIMEType pluginType, NPP inst g_hash_table_insert(id_to_instance_map, GINT_TO_POINTER(instance_counter), instance); instance_counter++; - PLUGIN_DEBUG_0ARG ("GCJ_New return\n"); + PLUGIN_DEBUG_0ARG ("ITNP_New return\n"); return np_error; } @@ -428,14 +428,14 @@ void start_jvm_if_needed() PLUGIN_DEBUG_0ARG("No JVM is running. Attempting to start one...\n"); NPError np_error = NPERR_NO_ERROR; - GCJPluginData* data = NULL; + ITNPPluginData* data = NULL; // Create appletviewer-to-plugin pipe which we refer to as the input // pipe. // in_pipe_name - in_pipe_name = g_strdup_printf ("%s/icedteanp-appletviewer-to-plugin", - data_directory); + in_pipe_name = g_strdup_printf ("%s/%d-icedteanp-appletviewer-to-plugin", + data_directory, getpid()); if (!in_pipe_name) { PLUGIN_ERROR ("Failed to create input pipe name."); @@ -448,21 +448,21 @@ void start_jvm_if_needed() // clean up any older pip unlink (in_pipe_name); - PLUGIN_DEBUG_1ARG ("GCJ_New: creating input fifo: %s\n", in_pipe_name); - if (mkfifo (in_pipe_name, 0700) == -1 && errno != EEXIST) + PLUGIN_DEBUG_1ARG ("ITNP_New: creating input fifo: %s\n", in_pipe_name); + if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST) { PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno)); np_error = NPERR_GENERIC_ERROR; goto cleanup_in_pipe_name; } - PLUGIN_DEBUG_1ARG ("GCJ_New: created input fifo: %s\n", in_pipe_name); + PLUGIN_DEBUG_1ARG ("ITNP_New: created input fifo: %s\n", in_pipe_name); // Create plugin-to-appletviewer pipe which we refer to as the // output pipe. // out_pipe_name - out_pipe_name = g_strdup_printf ("%s/icedteanp-plugin-to-appletviewer", - data_directory); + out_pipe_name = g_strdup_printf ("%s/%d-icedteanp-plugin-to-appletviewer", + data_directory, getpid()); if (!out_pipe_name) { @@ -474,14 +474,14 @@ void start_jvm_if_needed() // clean up any older pip unlink (out_pipe_name); - PLUGIN_DEBUG_1ARG ("GCJ_New: creating output fifo: %s\n", out_pipe_name); - if (mkfifo (out_pipe_name, 0700) == -1 && errno != EEXIST) + PLUGIN_DEBUG_1ARG ("ITNP_New: creating output fifo: %s\n", out_pipe_name); + if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST) { PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno)); np_error = NPERR_GENERIC_ERROR; goto cleanup_out_pipe_name; } - PLUGIN_DEBUG_1ARG ("GCJ_New: created output fifo: %s\n", out_pipe_name); + PLUGIN_DEBUG_1ARG ("ITNP_New: created output fifo: %s\n", out_pipe_name); // Start a separate appletviewer process for each applet, even if // there are multiple applets in the same page. We may need to @@ -572,9 +572,9 @@ void start_jvm_if_needed() // cleanup_out_pipe: // Delete output pipe. - PLUGIN_DEBUG_1ARG ("GCJ_New: deleting input fifo: %s\n", in_pipe_name); + PLUGIN_DEBUG_1ARG ("ITNP_New: deleting input fifo: %s\n", in_pipe_name); unlink (out_pipe_name); - PLUGIN_DEBUG_1ARG ("GCJ_New: deleted input fifo: %s\n", in_pipe_name); + PLUGIN_DEBUG_1ARG ("ITNP_New: deleted input fifo: %s\n", in_pipe_name); cleanup_out_pipe_name: g_free (out_pipe_name); @@ -582,9 +582,9 @@ void start_jvm_if_needed() // cleanup_in_pipe: // Delete input pipe. - PLUGIN_DEBUG_1ARG ("GCJ_New: deleting output fifo: %s\n", out_pipe_name); + PLUGIN_DEBUG_1ARG ("ITNP_New: deleting output fifo: %s\n", out_pipe_name); unlink (in_pipe_name); - PLUGIN_DEBUG_1ARG ("GCJ_New: deleted output fifo: %s\n", out_pipe_name); + PLUGIN_DEBUG_1ARG ("ITNP_New: deleted output fifo: %s\n", out_pipe_name); cleanup_in_pipe_name: g_free (in_pipe_name); @@ -598,9 +598,9 @@ void start_jvm_if_needed() } NPError -GCJ_GetValue (NPP instance, NPPVariable variable, void* value) +ITNP_GetValue (NPP instance, NPPVariable variable, void* value) { - PLUGIN_DEBUG_0ARG ("GCJ_GetValue\n"); + PLUGIN_DEBUG_0ARG ("ITNP_GetValue\n"); NPError np_error = NPERR_NO_ERROR; @@ -609,7 +609,7 @@ GCJ_GetValue (NPP instance, NPPVariable // This plugin needs XEmbed support. case NPPVpluginNeedsXEmbed: { - PLUGIN_DEBUG_0ARG ("GCJ_GetValue: returning TRUE for NeedsXEmbed.\n"); + PLUGIN_DEBUG_0ARG ("ITNP_GetValue: returning TRUE for NeedsXEmbed.\n"); bool* bool_value = (bool*) value; *bool_value = true; } @@ -625,17 +625,17 @@ GCJ_GetValue (NPP instance, NPPVariable break; } - PLUGIN_DEBUG_0ARG ("GCJ_GetValue return\n"); + PLUGIN_DEBUG_0ARG ("ITNP_GetValue return\n"); return np_error; } NPError -GCJ_Destroy (NPP instance, NPSavedData** save) +ITNP_Destroy (NPP instance, NPSavedData** save) { - PLUGIN_DEBUG_1ARG ("GCJ_Destroy %p\n", instance); + PLUGIN_DEBUG_1ARG ("ITNP_Destroy %p\n", instance); - GCJPluginData* data = (GCJPluginData*) instance->pdata; + ITNPPluginData* data = (ITNPPluginData*) instance->pdata; if (data) { @@ -650,15 +650,15 @@ GCJ_Destroy (NPP instance, NPSavedData** IcedTeaPluginUtilities::invalidateInstance(instance); - PLUGIN_DEBUG_0ARG ("GCJ_Destroy return\n"); + PLUGIN_DEBUG_0ARG ("ITNP_Destroy return\n"); return NPERR_NO_ERROR; } NPError -GCJ_SetWindow (NPP instance, NPWindow* window) +ITNP_SetWindow (NPP instance, NPWindow* window) { - PLUGIN_DEBUG_0ARG ("GCJ_SetWindow\n"); + PLUGIN_DEBUG_0ARG ("ITNP_SetWindow\n"); if (instance == NULL) { @@ -675,12 +675,12 @@ GCJ_SetWindow (NPP instance, NPWindow* w id = GPOINTER_TO_INT(id_ptr); } - GCJPluginData* data = (GCJPluginData*) instance->pdata; + ITNPPluginData* data = (ITNPPluginData*) instance->pdata; // Simply return if we receive a NULL window. if ((window == NULL) || (window->window == NULL)) { - PLUGIN_DEBUG_0ARG ("GCJ_SetWindow: got NULL window.\n"); + PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: got NULL window.\n"); return NPERR_NO_ERROR; } From bugzilla-daemon at icedtea.classpath.org Fri Jun 4 13:14:22 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 04 Jun 2010 20:14:22 +0000 Subject: [Bug 438] PulseAudioSourceDataLine falsely returns true to isControlSupported(Gain) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438 jon.vanalten at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #3 from jon.vanalten at redhat.com 2010-06-04 20:14 ------- Sorry for the slow reply. I've had a fix for a little while now, just committed it: http://icedtea.classpath.org/hg/icedtea6/rev/f08bf2c87805 Thanks for the reproducer example, it helped. Please reopen if this continues to be a problem for you (keeping in mind that it could be a little while before this makes it into your distro of choice). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Fri Jun 4 13:27:52 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 04 Jun 2010 20:27:52 +0000 Subject: /hg/release/icedtea6-1.7: 2 new changesets Message-ID: changeset f7bdd9aa57c1 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f7bdd9aa57c1 author: Matthias Klose date: Mon Apr 12 22:37:35 2010 +0200 Fix PR icedtea/461, plugin working for NSS enabled builds working together with firefox including a private NSS copy 2010-04-12 Matthias Klose PR icedtea/461 * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_ld_library_path): New, filter out paths in LD_LIBRARY_PATH which start with MOZILLA_FIVE_HOME. (plugin_filter_environment): New, build environment to pass to the appletviewer process. (plugin_test_appletviewer, plugin_start_appletviewer): Start the new process with the filtered environment. changeset cf888f068f5f in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cf888f068f5f author: Deepak Bhole date: Mon Apr 12 17:20:51 2010 -0400 Removed unncessary debug and trace output 2010-04-12 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf statement that didn't belong there. * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (createPanel): Don't print stack traces on InterruptedException. (handleMessage): Same. diffstat: 3 files changed, 109 insertions(+), 8 deletions(-) ChangeLog | 19 +++ plugin/icedteanp/IcedTeaNPPlugin.cc | 88 +++++++++++++- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10 - diffs (220 lines): diff -r c67ef4e93e63 -r cf888f068f5f ChangeLog --- a/ChangeLog Wed Apr 07 14:49:04 2010 -0400 +++ b/ChangeLog Mon Apr 12 17:20:51 2010 -0400 @@ -1,3 +1,22 @@ 2010-04-07 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf + statement that didn't belong there. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (createPanel): Don't print stack traces on InterruptedException. + (handleMessage): Same. + +2010-04-12 Matthias Klose + + PR icedtea/461 + * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_ld_library_path): + New, filter out paths in LD_LIBRARY_PATH which start with + MOZILLA_FIVE_HOME. + (plugin_filter_environment): New, build environment to pass to the + appletviewer process. + (plugin_test_appletviewer, plugin_start_appletviewer): Start the new + process with the filtered environment. + 2010-04-07 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with "ITNP", and diff -r c67ef4e93e63 -r cf888f068f5f plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Apr 07 14:49:04 2010 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Apr 12 17:20:51 2010 -0400 @@ -269,7 +269,6 @@ ITNP_New (NPMIMEType pluginType, NPP ins NPVariant member_ptr; browser_functions.getvalue(instance, NPNVWindowNPObject, &window_ptr); identifier = browser_functions.getstringidentifier("document"); - printf("Looking for %p %p %p (%s)\n", instance, window_ptr, identifier, "document"); if (!browser_functions.hasproperty(instance, window_ptr, identifier)) { printf("%s not found!\n", "document"); @@ -1412,6 +1411,78 @@ plugin_out_pipe_callback (GIOChannel* so return FALSE; } +// remove all components from LD_LIBRARY_PATH, which start with +// MOZILLA_FIVE_HOME; firefox has its own NSS based security provider, +// which conflicts with the one configured in nss.cfg. +static gchar* +plugin_filter_ld_library_path(gchar *path_old) +{ + gchar *moz_home = g_strdup (g_getenv ("MOZILLA_FIVE_HOME")); + gchar *moz_prefix; + gchar *path_new; + gchar** components; + int i1, i2; + + if (moz_home == NULL || path_old == NULL || strlen (path_old) == 0) + return path_old; + if (g_str_has_suffix (moz_home, "/")) + moz_home[strlen (moz_home - 1)] = '\0'; + moz_prefix = g_strconcat (moz_home, "/", NULL); + + components = g_strsplit (path_old, ":", -1); + for (i1 = 0, i2 = 0; components[i1] != NULL; i1++) + { + if (g_strcmp0 (components[i1], moz_home) == 0 + || g_str_has_prefix (components[i1], moz_home)) + components[i2] = components[i1]; + else + components[i2++] = components[i1]; + } + components[i2] = NULL; + + if (i1 > i2) + path_new = g_strjoinv (":", components); + g_strfreev (components); + g_free (moz_home); + g_free (moz_prefix); + g_free (path_old); + + if (path_new == NULL || strlen (path_new) == 0) + { + PLUGIN_DEBUG_0ARG("Unset LD_LIBRARY_PATH\n"); + return NULL; + } + else + { + PLUGIN_DEBUG_1ARG ("Set LD_LIBRARY_PATH: %s\n", path_new); + return path_new; + } +} + +// build the environment to pass to the external plugin process +static gchar** +plugin_filter_environment(void) +{ + gchar **var_names = g_listenv(); + gchar **new_env = (gchar**) malloc(sizeof(gchar*) * g_strv_length (var_names)); + int i_var, i_env; + + for (i_var = 0, i_env = 0; var_names[i_var] != NULL; i_var++) + { + gchar *env_value = g_strdup (g_getenv (var_names[i_var])); + + if (g_str_has_prefix (var_names[i_var], "LD_LIBRARY_PATH")) + env_value = plugin_filter_ld_library_path (env_value); + if (env_value != NULL) + { + new_env[i_env++] = g_strdup_printf ("%s=%s", var_names[i_var], env_value); + g_free (env_value); + } + } + new_env[i_env] = NULL; + return new_env; +} + static NPError plugin_test_appletviewer () { @@ -1419,13 +1490,16 @@ plugin_test_appletviewer () NPError error = NPERR_NO_ERROR; gchar* command_line[3] = { NULL, NULL, NULL }; + gchar** environment; command_line[0] = g_strdup (appletviewer_executable); command_line[1] = g_strdup("-version"); command_line[2] = NULL; + environment = plugin_filter_environment(); - if (!g_spawn_async (NULL, command_line, NULL, (GSpawnFlags) 0, + if (!g_spawn_async (NULL, command_line, environment, + (GSpawnFlags) 0, NULL, NULL, NULL, &channel_error)) { if (channel_error) @@ -1439,6 +1513,8 @@ plugin_test_appletviewer () PLUGIN_ERROR ("Failed to spawn applet viewer"); error = NPERR_GENERIC_ERROR; } + + g_strfreev (environment); g_free (command_line[0]); command_line[0] = NULL; @@ -1458,6 +1534,7 @@ plugin_start_appletviewer (ITNPPluginDat NPError error = NPERR_NO_ERROR; gchar** command_line; + gchar** environment; if (plugin_debug) { @@ -1480,7 +1557,10 @@ plugin_start_appletviewer (ITNPPluginDat command_line[4] = NULL; } - if (!g_spawn_async (NULL, command_line, NULL, (GSpawnFlags) G_SPAWN_DO_NOT_REAP_CHILD, + environment = plugin_filter_environment(); + + if (!g_spawn_async (NULL, command_line, environment, + (GSpawnFlags) G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &appletviewer_pid, &channel_error)) { if (channel_error) @@ -1494,6 +1574,8 @@ plugin_start_appletviewer (ITNPPluginDat PLUGIN_ERROR ("Failed to spawn applet viewer"); error = NPERR_GENERIC_ERROR; } + + g_strfreev (environment); g_free (command_line[0]); command_line[0] = NULL; diff -r c67ef4e93e63 -r cf888f068f5f plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Apr 07 14:49:04 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Apr 12 17:20:51 2010 -0400 @@ -184,7 +184,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; Thread.sleep(50); wait += 50; } catch (InterruptedException ie) { - ie.printStackTrace(); + // just wait } } @@ -196,7 +196,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; Thread.sleep(50); PluginDebug.debug("Waiting for applet to initialize..."); } catch (InterruptedException ie) { - ie.printStackTrace(); + // just wait } } @@ -629,7 +629,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; Thread.sleep(50); wait += 50; } catch (InterruptedException ie) { - ie.printStackTrace(); + // just wait } } @@ -674,7 +674,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; Thread.sleep(50); wait += 50; } catch (InterruptedException ie) { - ie.printStackTrace(); + // just wait } } @@ -747,7 +747,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; Thread.sleep(50); PluginDebug.debug("Waiting for applet to initialize..."); } catch (InterruptedException ie) { - ie.printStackTrace(); + // just wait } } From bugzilla-daemon at icedtea.classpath.org Fri Jun 4 13:53:54 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 04 Jun 2010 20:53:54 +0000 Subject: [Bug 477] NullPointerEx in swing class CompoundBorder method getBorderInsets Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=477 ------- Comment #1 from jon.vanalten at redhat.com 2010-06-04 20:53 ------- Opends have worked around this issue: https://opends.dev.java.net/issues/show_bug.cgi?id=4400 (leaving open because it's still an issue). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Fri Jun 4 14:38:27 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 04 Jun 2010 21:38:27 +0000 Subject: /hg/icedtea: 16 new changesets Message-ID: changeset b9d1edf5ac2c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b9d1edf5ac2c author: Deepak Bhole date: Mon Mar 22 15:34:55 2010 -0400 Changed FIFO file location from /tmp/$user-... to /tmp/icedteaplugin-$user/$pid-... 2010-03-22 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (start_jvm_if_needed): Change pipe file name format. (NP_Initialize): Put FIFO pipe in a separate per-user directory. changeset fbb21c9f53fe in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fbb21c9f53fe author: Andrew John Hughes date: Fri Jun 04 18:54:00 2010 +0100 Use ICEDTEA_RT in place of system rt.jar. Add additional bootstrap classes. 2010-03-29 Andrew John Hughes * Makefile.am: (NETX_BOOTSTRAP_CLASSES): Classes required to bootstrap NetX (only partial so far). (ICEDTEA_BOOTSTRAP_CLASSES): Include NETX_BOOTSTRAP_CLASSES. (extra-class-files.stamp): Use ICEDTEA_RT as bootclasspath. Drop use of SOURCEPATH_DIRS. (pulse-java-class.stamp): Use ICEDTEA_RT on bootclasspath. changeset c5f446ebb083 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c5f446ebb083 author: Matthias Klose date: Wed Mar 31 01:46:55 2010 +0200 acinclude.m4 (ENABLE_ZERO_BUILD): Depend on IT_SET_ARCH_SETTINGS 2010-03-31 Matthias Klose * acinclude.m4 (ENABLE_ZERO_BUILD): Depend on IT_SET_ARCH_SETTINGS. changeset 4b10f1a4dd35 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4b10f1a4dd35 author: Matthias Klose date: Wed Mar 31 10:30:18 2010 +0200 Fix typo in IcedTeaNPPlugin.cc. 2010-03-31 Matthias Klose * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer): Fix typo. changeset 2e07af30973e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2e07af30973e author: Matthias Klose date: Fri Jun 04 19:45:32 2010 +0100 Check for shared LLVM library. llvm-2.7 offers the option to build a shared LLVM library, unfortunately llvm-config --libs still returns the list of the static libraries. The function to check for is randomly choosen. Maybe there are better candidates, or check for functions for the required components. 2010-04-04 Matthias Klose * configure.ac: Check for shared LLVM library. changeset 5f9796fc1044 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5f9796fc1044 author: Deepak Bhole date: Tue Apr 06 14:17:02 2010 -0400 Profiled memory usage and implemented proper cleanup for C++ side. 2010-04-06 Deepak Bhole * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc (newMessageOnBus): Update to used string pointer vector (form strSplit) instead of a string vector. Correctly free memory. * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Initialize message_queue to be a string pointer vector vector instead of a string vector vector. (newMessageOnBus): Update to used string pointer vector (form strSplit) instead of a string vector. Correctly free memory. (sendWindow): Deal with string pointers instead of strings for message parts. (eval): Same. (call): Same. (sendString): Same. (setMember): Same. (sendMember): Same. (finalize): Same. (queue_processor): Same. Also, free message part memory after processing. * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Change method signatures to deal with string pointer vectors instead of string vectors. * plugin/icedteanp/IcedTeaPluginUtils.cc (stringToJSID): Added another signature that receives a string pointer. (strSplit): Return string pointer vector instead of string vector. (getUTF8String): Change signature to receive string pointer vector instead of string vector. Update function accordingly. (getUTF16LEString): Same. (subscribe): Make subscription atomic. (unSubscribe): Make unsubscription atomic, bound to same lock as subscribe(). (post): Make list iteration and processing atomic, bound to same lock as subscribe and unSubscribe. * plugin/icedteanp/IcedTeaPluginUtils.h: Added new signature for stringToJSID and updated signatures for strSplit, getUTF8String and getUTF16LEString. * plugin/icedteanp/IcedTeaScriptablePluginObject.cc (IcedTeaScriptableJavaPackageObject::deAllocate): Implemented method. (IcedTeaScriptableJavaPackageObject::invalidate): Same. (IcedTeaScriptableJavaObject::deAllocate): Same. (IcedTeaScriptableJavaObject::invalidate): Same. changeset 1a1eb2d55ea9 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1a1eb2d55ea9 author: Xerxes R?nby date: Wed Apr 07 14:50:34 2010 +0200 Updated check for shared LLVM library to include svn. 2010-04-07 Xerxes R?nby * configure.ac: Updated check for shared LLVM library to include svn. changeset 69c8a2f36bb0 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=69c8a2f36bb0 author: Deepak Bhole date: Wed Apr 07 14:49:04 2010 -0400 Update debug output string and function/structure names to change 'GCJ' references to ITNP/IcedTea NP Plugin Remove unnecessary trace print from proxy related code on Java side 2010-04-07 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with "ITNP", and change other strings to remove reference to GCJ. * plugin/icedteanp/IcedTeaNPPlugin.h : Renamed GCJPluginData to ITNPPluginData. * plugin/icedteanp/IcedTeaPluginUtils.h: Changed debug output to be prefixed with "ICEDTEA NP PLUGIN" instead of "GCJ PLUGIN". * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java: Don't print ArrayIndexOutOfBounds traces. Continue to print any others. changeset ae060fedf818 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ae060fedf818 author: Matthias Klose date: Fri Jun 04 20:39:48 2010 +0100 Always install nss.cfg, just disable the provider when not requested. 2010-04-08 Matthias Klose * Makefile.am (stamps/icedtea.stamp, stamps/icedtea- debug.stamp): Always install nss.cfg. * configure.ac: Always make nss.cfg a config file, always substitute NSS_LIBDIR. changeset 3977ba007dc7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3977ba007dc7 author: Andrew John Hughes date: Fri Apr 09 01:26:42 2010 +0100 Always attempt pkgconfig detection of NSS, only resulting to the system library directory hack when necessary. 2010-04-08 Andrew John Hughes * configure.ac: Move NSS detection to macros in acinclude.m4. * acinclude.m4: (IT_OBTAIN_DEFAULT_LIBDIR): Attempts to discover the system library directory (e.g /usr/lib64) (IT_LOCATE_NSS): Always try and detect NSS and only resort to using the system library directory detection if NSS is not detected. changeset 20309a51d2dd in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=20309a51d2dd author: Matthias Klose date: Fri Jun 04 21:09:06 2010 +0100 Be verbose whether the NSS-based security provider is enabled or disabled by default. 2010-04-10 Matthias Klose * Makefile.am (ICEDTEA_PATCHES): Always apply icedtea- nss-6763530.patch. Apply icedtea-nss-not-enabled-config.patch if the NSS-based security provider is disabled by default. * Makefile.am: Be verbose wether the NSS-based security provider is enabled or disabled by default. * patches/icedtea-nss-not-enabled-config.patch: New. changeset ad0c8b4a1952 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ad0c8b4a1952 author: Matthias Klose date: Sat Apr 10 18:00:32 2010 +0200 Fix last ChangeLog entry changeset 9eae341d6515 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9eae341d6515 author: Matthias Klose date: Mon Apr 12 13:40:58 2010 +0200 Clarify result message of the NSS check. 2010-04-12 Matthias Klose * configure.ac: Clarify result message of the NSS check. changeset 9756dc1e2307 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9756dc1e2307 author: Andrew John Hughes date: Fri Jun 04 21:16:46 2010 +0100 Use NETX_SRCDIR in EXTRA_DIST. 2010-04-12 Andrew John Hughes * Makefile.am: Use NETX_SRCDIR in EXTRA_DIST. changeset 23684054d4dc in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=23684054d4dc author: Matthias Klose date: Mon Apr 12 22:37:35 2010 +0200 Fix PR icedtea/461, plugin working for NSS enabled builds working together with firefox including a private NSS copy 2010-04-12 Matthias Klose PR icedtea/461 * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_ld_library_path): New, filter out paths in LD_LIBRARY_PATH which start with MOZILLA_FIVE_HOME. (plugin_filter_environment): New, build environment to pass to the appletviewer process. (plugin_test_appletviewer, plugin_start_appletviewer): Start the new process with the filtered environment. changeset 108556963776 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=108556963776 author: Deepak Bhole date: Mon Apr 12 17:20:51 2010 -0400 Removed unncessary debug and trace output 2010-04-12 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf statement that didn't belong there. * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (createPanel): Don't print stack traces on InterruptedException. (handleMessage): Same. diffstat: 15 files changed, 637 insertions(+), 302 deletions(-) ChangeLog | 141 ++++ Makefile.am | 28 acinclude.m4 | 41 + configure.ac | 39 - patches/icedtea-nss-not-enabled-config.patch | 13 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 97 +- plugin/icedteanp/IcedTeaNPPlugin.cc | 326 ++++++---- plugin/icedteanp/IcedTeaNPPlugin.h | 4 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 135 +--- plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 16 plugin/icedteanp/IcedTeaPluginUtils.cc | 61 + plugin/icedteanp/IcedTeaPluginUtils.h | 19 plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 7 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10 plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 2 diffs (truncated from 2105 to 500 lines): diff -r 788424aa74ed -r 108556963776 ChangeLog --- a/ChangeLog Fri Mar 19 15:50:36 2010 +0000 +++ b/ChangeLog Mon Apr 12 17:20:51 2010 -0400 @@ -1,3 +1,144 @@ 2010-03-19 Gary Benson + + * plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf + statement that didn't belong there. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (createPanel): Don't print stack traces on InterruptedException. + (handleMessage): Same. + +2010-04-12 Matthias Klose + + PR icedtea/461 + * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_ld_library_path): + New, filter out paths in LD_LIBRARY_PATH which start with + MOZILLA_FIVE_HOME. + (plugin_filter_environment): New, build environment to pass to the + appletviewer process. + (plugin_test_appletviewer, plugin_start_appletviewer): Start the new + process with the filtered environment. + +2010-04-12 Andrew John Hughes + + * Makefile.am: + Use NETX_SRCDIR in EXTRA_DIST. + +2010-04-12 Matthias Klose + + * configure.ac: Clarify result message of the NSS check. + +2010-04-10 Matthias Klose + + * Makefile.am (ICEDTEA_PATCHES): Always apply + icedtea-nss-6763530.patch. Apply icedtea-nss-not-enabled-config.patch + if the NSS-based security provider is disabled by default. + * configure.ac: Be verbose whether the NSS-based security provider + is enabled or disabled by default. + * patches/icedtea-nss-not-enabled-config.patch: New. + +2010-04-08 Andrew John Hughes + + * configure.ac: Move NSS detection to macros + in acinclude.m4. + * acinclude.m4: + (IT_OBTAIN_DEFAULT_LIBDIR): Attempts to discover the + system library directory (e.g /usr/lib64) + (IT_LOCATE_NSS): Always try and detect NSS + and only resort to using the system library directory + detection if NSS is not detected. + +2010-04-08 Matthias Klose + + * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): + Always install nss.cfg. + * configure.ac: Always make nss.cfg a config file, always + substitute NSS_LIBDIR. + +2010-04-07 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with "ITNP", and + change other strings to remove reference to GCJ. + * plugin/icedteanp/IcedTeaNPPlugin.h : Renamed GCJPluginData to + ITNPPluginData. + * plugin/icedteanp/IcedTeaPluginUtils.h: Changed debug output to be + prefixed with "ICEDTEA NP PLUGIN" instead of "GCJ PLUGIN". + * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java: Don't + print ArrayIndexOutOfBounds traces. Continue to print any others. + +2010-04-07 Xerxes R??nby + + * configure.ac: Updated check for shared LLVM library to include svn. + +2010-04-06 Deepak Bhole + + * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc + (newMessageOnBus): Update to used string pointer vector (form strSplit) + instead of a string vector. Correctly free memory. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Initialize + message_queue to be a string pointer vector vector instead of a string + vector vector. + (newMessageOnBus): Update to used string pointer vector (form strSplit) + instead of a string vector. Correctly free memory. + (sendWindow): Deal with string pointers instead of strings for message + parts. + (eval): Same. + (call): Same. + (sendString): Same. + (setMember): Same. + (sendMember): Same. + (finalize): Same. + (queue_processor): Same. Also, free message part memory after processing. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Change method + signatures to deal with string pointer vectors instead of string vectors. + * plugin/icedteanp/IcedTeaPluginUtils.cc + (stringToJSID): Added another signature that receives a string pointer. + (strSplit): Return string pointer vector instead of string vector. + (getUTF8String): Change signature to receive string pointer vector instead + of string vector. Update function accordingly. + (getUTF16LEString): Same. + (subscribe): Make subscription atomic. + (unSubscribe): Make unsubscription atomic, bound to same lock as + subscribe(). + (post): Make list iteration and processing atomic, bound to same lock as + subscribe and unSubscribe. + * plugin/icedteanp/IcedTeaPluginUtils.h: Added new signature for + stringToJSID and updated signatures for strSplit, getUTF8String and + getUTF16LEString. + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc + (IcedTeaScriptableJavaPackageObject::deAllocate): Implemented method. + (IcedTeaScriptableJavaPackageObject::invalidate): Same. + (IcedTeaScriptableJavaObject::deAllocate): Same. + (IcedTeaScriptableJavaObject::invalidate): Same. + +2010-04-04 Matthias Klose + + * configure.ac: Check for shared LLVM library. + +2010-03-31 Matthias Klose + + * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer): + Fix typo. + +2010-03-31 Matthias Klose + + * acinclude.m4 (ENABLE_ZERO_BUILD): Depend on IT_SET_ARCH_SETTINGS. + +2010-03-29 Andrew John Hughes + + * Makefile.am: + (NETX_BOOTSTRAP_CLASSES): Classes required to + bootstrap NetX (only partial so far). + (ICEDTEA_BOOTSTRAP_CLASSES): Include + NETX_BOOTSTRAP_CLASSES. + (extra-class-files.stamp): Use ICEDTEA_RT as bootclasspath. + Drop use of SOURCEPATH_DIRS. + (pulse-java-class.stamp): Use ICEDTEA_RT on bootclasspath. + +2010-03-22 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (start_jvm_if_needed): Change pipe file name format. + (NP_Initialize): Put FIFO pipe in a separate per-user directory. + 2010-03-19 Gary Benson * ports/hotspot/src/share/vm/shark/sharkBlock.cpp diff -r 788424aa74ed -r 108556963776 Makefile.am --- a/Makefile.am Fri Mar 19 15:50:36 2010 +0000 +++ b/Makefile.am Mon Apr 12 17:20:51 2010 -0400 @@ -136,11 +136,20 @@ ICEDTEA_BOOTSTRAP_RESOURCES = \ ICEDTEA_BOOTSTRAP_RESOURCES = \ $(LANGTOOLS)/com/sun/tools/javac/resources +# PR43578 - java.security.CodeSource.getCodeSigners() missing +# PR43582 - Missing javax.swing.JTable.setFillsViewportHeight +# PR43585 - java.security.KeyStore.TrustedCertificateEntry class missing +NETX_BOOTSTRAP_CLASSES = \ + $(SHARE)/java/security/CodeSource.java \ + $(SHARE)/javax/swing/JTable.java \ + $(SHARE)/java/security/KeyStore.java + # PR42003 - javax.swing.plaf.basic.BasicDirectoryModel # PR43389 - javax.management.StandardMBean ICEDTEA_BOOTSTRAP_CLASSES = \ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \ - $(SHARE)/javax/management/StandardMBean.java + $(SHARE)/javax/management/StandardMBean.java \ + $(NETX_BOOTSTRAP_CLASSES) endif @@ -371,6 +380,8 @@ endif if ENABLE_NSS ICEDTEA_PATCHES += patches/icedtea-nss-config.patch +else +ICEDTEA_PATCHES += patches/icedtea-nss-not-enabled-config.patch endif ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) @@ -721,7 +732,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr jconsole.desktop policytool.desktop \ $(JTREG_SRCS) \ HACKING $(PULSEAUDIO_SRCS) fsg.sh \ - $(abs_top_srcdir)/plugin $(top_srcdir)/netx \ + $(abs_top_srcdir)/plugin $(NETX_SRCDIR) \ hotspot.map autogen.sh \ tapset/hotspot.stp.in \ tapset/hotspot_jni.stp.in \ @@ -1838,10 +1849,8 @@ if ENABLE_SYSTEMTAP cp $(abs_top_builddir)/tapset/jstack.stp \ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp endif -if ENABLE_NSS cp $(abs_top_builddir)/nss.cfg \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; -endif if WITH_TZDATA_DIR cp $(abs_top_builddir)/tz.properties \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; @@ -1912,10 +1921,8 @@ if ENABLE_SYSTEMTAP cp $(abs_top_builddir)/tapset/jstack.stp \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp endif -if ENABLE_NSS cp $(abs_top_builddir)/nss.cfg \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; -endif if WITH_TZDATA_DIR cp $(abs_top_builddir)/tz.properties \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; @@ -2135,10 +2142,8 @@ stamps/extra-class-files.stamp: extra-so stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp mkdir -p extra-lib $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \ - -classpath $(ICEDTEA_RT):$(NETX_CLASSES) \ - -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \ - -bootclasspath \'\' \ - @extra-source-files.txt + -sourcepath $(abs_top_srcdir)/extra \ + -bootclasspath $(ICEDTEA_RT) @extra-source-files.txt cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';' @@ -2165,8 +2170,7 @@ stamps/pulse-java-class.stamp: $(INITIAL mkdir -p $(PULSE_JAVA_CLASS_DIR) (cd $(PULSE_JAVA_JAVA_SRCDIR); \ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \ - -bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \ - org/classpath/icedtea/pulseaudio/*.java\ + -bootclasspath $(ICEDTEA_RT) org/classpath/icedtea/pulseaudio/*.java \ ) cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR) chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF diff -r 788424aa74ed -r 108556963776 acinclude.m4 --- a/acinclude.m4 Fri Mar 19 15:50:36 2010 +0000 +++ b/acinclude.m4 Mon Apr 12 17:20:51 2010 -0400 @@ -712,6 +712,7 @@ AC_DEFUN([FIND_TOOL], AC_DEFUN([ENABLE_ZERO_BUILD], [ + AC_REQUIRE([IT_SET_ARCH_SETTINGS]) AC_MSG_CHECKING([whether to use the zero-assembler port]) use_zero=no AC_ARG_ENABLE([zero], @@ -1804,6 +1805,46 @@ fi fi ]) +AC_DEFUN_ONCE([IT_OBTAIN_DEFAULT_LIBDIR], +[ +dnl find the system library directory +AC_CACHE_CHECK([for system library directory], [it_cv_default_libdir], +[ +if test "x$LDD" = x; then + it_cv_default_libdir=/usr/lib +else + AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])]) + $CC conftest.c + syslibdir=`$LDD a.out | sed -n '/libc\.so./s,.*=> */\(@<:@^/@:>@*\)/.*,\1,p'` + rm -f a.out + case x${syslibdir} in + xlib|xlib64|xlib32|xlibn32) NSS_LIBDIR=/usr/${syslibdir};; + *) it_cv_default_libdir=/usr/lib + esac +fi +]) +AC_SUBST([DEFAULT_LIBDIR], $it_cv_default_libdir) +]) + +AC_DEFUN_ONCE([IT_LOCATE_NSS], +[ +AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR]) +PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no]) +if test "x${NSS_FOUND}" = xno +then + if test "x${ENABLE_NSS}" = "xyes" + then + AC_MSG_ERROR([Could not find NSS. Either install it or configure using --disable-nss.]) + else + AC_MSG_WARN([Could not find NSS; using $DEFAULT_LIBDIR as its location.]) + NSS_LIBDIR=$DEFAULT_LIBDIR + fi +else + NSS_LIBDIR=`$PKG_CONFIG --variable=libdir nss` +fi +AC_SUBST(NSS_LIBDIR) +AC_CONFIG_FILES([nss.cfg]) +]) AC_DEFUN([IT_DIAMOND_CHECK],[ AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [ CLASS=Test.java diff -r 788424aa74ed -r 108556963776 configure.ac --- a/configure.ac Fri Mar 19 15:50:36 2010 +0000 +++ b/configure.ac Mon Apr 12 17:20:51 2010 -0400 @@ -36,6 +36,7 @@ if test "x$FASTJAR" = x; then AC_MSG_ERROR([Can't find fastjar or jar]) fi AC_SUBST([FASTJAR]) +AC_CHECK_TOOL([LDD], [ldd]) dnl OpenJDK's README-builds.html lists gawk as a build dependency so we dnl check for it explicitly rather than using AC_PROG_AWK. FIND_TOOL([GAWK], [gawk]) @@ -124,13 +125,20 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) -AC_MSG_CHECKING([whether to include elliptic curve cryptography support via NSS]) +IT_LOCATE_NSS + +AC_MSG_CHECKING([whether to include the NSS-based security provider]) AC_ARG_ENABLE([nss], [AS_HELP_STRING([--enable-nss], [Enable inclusion of NSS security provider])], [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no']) AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes]) -AC_MSG_RESULT(${ENABLE_NSS}) +if test "x${ENABLE_NSS}" = "xyes" +then + AC_MSG_RESULT([enabled by default (edit java.security to disable)]) +else + AC_MSG_RESULT([disabled by default (edit java.security to enable)]) +fi IT_GET_PKGVERSION IT_GET_LSB_DATA @@ -414,18 +422,6 @@ then AC_SUBST(LIBPULSE_LIBS) fi -if test "x${ENABLE_NSS}" = "xyes" -then - PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no]) - if test "x${NSS_FOUND}" = xno - then - AC_MSG_ERROR([Could not find NSS. Either install it or configure using --disable-nss.]) - fi - NSS_LIBDIR=`$PKG_CONFIG --variable=libdir nss` - AC_SUBST(NSS_LIBDIR) - AC_CONFIG_FILES([nss.cfg]) -fi - if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then dnl Check for libffi headers and libraries. PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no]) @@ -446,7 +442,8 @@ AC_SUBST(LIBFFI_LIBS) if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then FIND_TOOL([LLVM_CONFIG], [llvm-config]) - llvm_components="engine nativecodegen" + llvm_components="jit engine nativecodegen" + LLVM_VERSION="`$LLVM_CONFIG --version`" dnl LLVM_CFLAGS LLVM_CFLAGS= for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do @@ -459,6 +456,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te fi fi done + LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`echo $LLVM_VERSION | sed 's/\.//;s/svn.*//'`" dnl LLVM_LDFLAGS LLVM_LDFLAGS= for flag in $($LLVM_CONFIG --ldflags $llvm_components); do @@ -470,8 +468,17 @@ if test "x${SHARK_BUILD_TRUE}" = x || te fi done dnl LLVM_LIBS + LIBS_SAVED=$LIBS + LDFLAGS_SAVED=$LDFLAGS + LDFLAGS=$LLVM_LDFLAGS + AC_CHECK_LIB(LLVM-$LLVM_VERSION, LLVMGetNextInstruction,LLVM_SHARED_LIB=" -lLLVM-$LLVM_VERSION") + LIBS=$LIBS_SAVED + LDFLAGS=$LDFLAGS_SAVED LLVM_LIBS= for flag in $($LLVM_CONFIG --libs $llvm_components); do + if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then + continue + fi if echo "$flag" | grep -q '^-l'; then if test "x$LLVM_LIBS" != "x"; then LLVM_LIBS="$LLVM_LIBS " @@ -479,7 +486,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te LLVM_LIBS="$LLVM_LIBS$flag" fi done - LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`" + LLVM_LIBS="$LLVM_LIBS$LLVM_SHARED_LIB" fi AC_SUBST(LLVM_CFLAGS) AC_SUBST(LLVM_LDFLAGS) diff -r 788424aa74ed -r 108556963776 patches/icedtea-nss-not-enabled-config.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-nss-not-enabled-config.patch Mon Apr 12 17:20:51 2010 -0400 @@ -0,0 +1,13 @@ +--- openjdk.orig/jdk/src/share/lib/security/java.security 2009-08-25 11:43:59.000000000 +0100 ++++ openjdk/jdk/src/share/lib/security/java.security 2009-08-27 14:23:54.000000000 +0100 +@@ -51,6 +51,10 @@ + security.provider.6=com.sun.security.sasl.Provider + security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI + security.provider.8=sun.security.smartcardio.SunPCSC ++# the NSS security provider was not enabled for this build; it can be enabled ++# if NSS (libnss3) is available on the machine. The nss.cfg file may need ++# editing to reflect the location of the NSS installation. ++#security.provider.9=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg + + # + # Select the source of seed data for SecureRandom. By default an diff -r 788424aa74ed -r 108556963776 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Mar 19 15:50:36 2010 +0000 +++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Mon Apr 12 17:20:51 2010 -0400 @@ -60,21 +60,21 @@ JavaRequestProcessor::newMessageOnBus(co { // Anything we are waiting for _MUST_ have and instance id and reference # - std::vector* message_parts = IcedTeaPluginUtilities::strSplit(message, " "); + std::vector* message_parts = IcedTeaPluginUtilities::strSplit(message, " "); - IcedTeaPluginUtilities::printStringVector("JavaRequest::newMessageOnBus:", message_parts); + IcedTeaPluginUtilities::printStringPtrVector("JavaRequest::newMessageOnBus:", message_parts); - if (message_parts->at(0) == "context" && message_parts->at(2) == "reference") - if (atoi(message_parts->at(1).c_str()) == this->instance && atoi(message_parts->at(3).c_str()) == this->reference) + if (*(message_parts->at(0)) == "context" && *(message_parts->at(2)) == "reference") + if (atoi(message_parts->at(1)->c_str()) == this->instance && atoi(message_parts->at(3)->c_str()) == this->reference) { // Gather the results // Let's get errors out of the way first - if (message_parts->at(4).find("Error") == 0) + if (!message_parts->at(4)->find("Error")) { for (int i=5; i < message_parts->size(); i++) { - result->error_msg->append(message_parts->at(i)); + result->error_msg->append(*(message_parts->at(i))); result->error_msg->append(" "); } @@ -83,78 +83,78 @@ JavaRequestProcessor::newMessageOnBus(co result->error_occurred = true; result_ready = true; } - else if (message_parts->at(4) == "GetStringUTFChars" || - message_parts->at(4) == "GetToStringValue") + else if (!message_parts->at(4)->find("GetStringUTFChars") || + !message_parts->at(4)->find("GetToStringValue")) { // first item is length, and it is radix 10 - int length = strtol(message_parts->at(5).c_str(), NULL, 10); + int length = strtol(message_parts->at(5)->c_str(), NULL, 10); IcedTeaPluginUtilities::getUTF8String(length, 6 /* start at */, message_parts, result->return_string); result_ready = true; } - else if (message_parts->at(4) == "GetStringChars") // GetStringChars (UTF-16LE/UCS-2) + else if (!message_parts->at(4)->find("GetStringChars")) // GetStringChars (UTF-16LE/UCS-2) { // first item is length, and it is radix 10 - int length = strtol(message_parts->at(5).c_str(), NULL, 10); + int length = strtol(message_parts->at(5)->c_str(), NULL, 10); IcedTeaPluginUtilities::getUTF16LEString(length, 6 /* start at */, message_parts, result->return_wstring); result_ready = true; - } else if ((message_parts->at(4) == "FindClass") || - (message_parts->at(4) == "GetClassName") || - (message_parts->at(4) == "GetClassID") || - (message_parts->at(4) == "GetMethodID") || - (message_parts->at(4) == "GetStaticMethodID") || - (message_parts->at(4) == "GetObjectClass") || - (message_parts->at(4) == "NewObject") || - (message_parts->at(4) == "NewStringUTF") || - (message_parts->at(4) == "HasPackage") || - (message_parts->at(4) == "HasMethod") || - (message_parts->at(4) == "HasField") || - (message_parts->at(4) == "GetStaticFieldID") || - (message_parts->at(4) == "GetFieldID") || - (message_parts->at(4) == "GetJavaObject") || - (message_parts->at(4) == "IsInstanceOf") || - (message_parts->at(4) == "NewArray")) + } else if (!message_parts->at(4)->find("FindClass") || + !message_parts->at(4)->find("GetClassName") || + !message_parts->at(4)->find("GetClassID") || + !message_parts->at(4)->find("GetMethodID") || + !message_parts->at(4)->find("GetStaticMethodID") || + !message_parts->at(4)->find("GetObjectClass") || + !message_parts->at(4)->find("NewObject") || + !message_parts->at(4)->find("NewStringUTF") || + !message_parts->at(4)->find("HasPackage") || + !message_parts->at(4)->find("HasMethod") || + !message_parts->at(4)->find("HasField") || + !message_parts->at(4)->find("GetStaticFieldID") || + !message_parts->at(4)->find("GetFieldID") || + !message_parts->at(4)->find("GetJavaObject") || + !message_parts->at(4)->find("IsInstanceOf") || + !message_parts->at(4)->find("NewArray")) { - result->return_identifier = atoi(message_parts->at(5).c_str()); - result->return_string->append(message_parts->at(5)); // store it as a string as well, for easy access From bugzilla-daemon at icedtea.classpath.org Sun Jun 6 13:40:56 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 06 Jun 2010 20:40:56 +0000 Subject: [Bug 505] New: double free crash in epiphany when viewing an image Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=505 Summary: double free crash in epiphany when viewing an image Product: IcedTea Version: 6-1.8 Platform: all OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: linas_fi at ymail.com Looks similar to Bug 378 but doesn't seem to be the same. At epiphany, going directly to an image in the url bar produces a double free with glibc killing epiphany (as opposed to the same image embedded in a web page, in which case it shows fine). Reproducible: Always How to reproduce: Paste an image url in the url bar. Eg. http://upload.wikimedia.org/wikipedia/commons/thumb/3/3e/Ip%C3%AA_%28Avar%C3%A9%29_REFON.jpg/300px-Ip%C3%AA_%28Avar%C3%A9%29_REFON.jpg java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (ArchLinux-6.b18_1.8-1-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) $ epiphany --version GNOME Web Browser 2.30.2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Jun 6 13:41:37 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 06 Jun 2010 20:41:37 +0000 Subject: [Bug 505] double free crash in epiphany when viewing an image Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=505 ------- Comment #1 from linas_fi at ymail.com 2010-06-06 20:41 ------- Created an attachment (id=355) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=355&action=view) glibc provided backtrace -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Jun 6 13:54:59 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 06 Jun 2010 20:54:59 +0000 Subject: [Bug 505] double free crash in epiphany when viewing an image Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=505 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea6 |NPPlugin Platform|all |x86_64 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Jun 6 13:55:31 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 06 Jun 2010 20:55:31 +0000 Subject: [Bug 505] double free crash in epiphany when viewing an image Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=505 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com |.org | ------- Comment #2 from gnu_andrew at member.fsf.org 2010-06-06 20:55 ------- Plugin issue. Reassigning to plugin maintainer. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Jun 7 01:40:24 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 07 Jun 2010 08:40:24 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 xerxes at zafena.se changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Platform|all |32-bit Resolution|WORKSFORME | Version|unspecified |6-hg ------- Comment #4 from xerxes at zafena.se 2010-06-07 08:40 ------- I have not been able to reproduce this bug using Ubuntu 10.04 x86_64 but this bug are still fully reproducable using the same icedtea version icedtea6-1.8 on 32bit systems. crashes on Ubuntu 10.04 ia32: java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8-0ubuntu1) OpenJDK Server VM (build 14.0-b16, mixed mode) xerxes at xerxes-J464X:Font2DTest$ java -jar Font2DTest.jar *** glibc detected *** java: free(): invalid next size (fast): 0x90be3fb0 *** ======= Backtrace: ========= /lib/tls/i686/cmov/libc.so.6(+0x6b591)[0xa85591] /lib/tls/i686/cmov/libc.so.6(+0x6cde8)[0xa86de8] /lib/tls/i686/cmov/libc.so.6(cfree+0x6d)[0xa89ecd] /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libfontmanager.so(+0x17da3)[0x48bda3] /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libfontmanager.so(+0x1dc50)[0x491c50] /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libfontmanager.so(+0x2018d)[0x49418d] /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libfontmanager.so(+0x2028d)[0x49428d] /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libfontmanager.so(+0x1d58d)[0x49158d] /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libfontmanager.so(Java_sun_font_SunLayoutEngine_nativeLayout+0x247)[0x493697] [0x33114aa] ... xerxes at xerxes-J464X:~/icedtea6-shark/openjdk/build/linux-i586/j2sdk-image/demo/jfc/Font2DTest$ ldd /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libfontmanager.so libfreetype.so.6 => /usr/lib/libfreetype.so.6 (0x00543000) libawt.so => /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libawt.so (0x00c31000) libm.so.6 => /lib/tls/i686/cmov/libm.so.6 (0x005d2000) libjava.so => /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libjava.so (0x00d07000) libjvm.so => not found libc.so.6 => /lib/tls/i686/cmov/libc.so.6 (0x009bc000) /lib/ld-linux.so.2 (0x00277000) libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00193000) libz.so.1 => /lib/libz.so.1 (0x00110000) libjvm.so => not found libdl.so.2 => /lib/tls/i686/cmov/libdl.so.2 (0x00f9a000) libjvm.so => not found libverify.so => /usr/lib/jvm/java-6-openjdk/jre/lib/i386/libverify.so (0x00125000) libnsl.so.1 => /lib/tls/i686/cmov/libnsl.so.1 (0x00133000) libjvm.so => not found xerxes at xerxes-J464X:~/icedtea6-shark/openjdk/build/linux-i586/j2sdk-image/demo/jfc/Font2DTest$ ls -la /usr/lib/libfreetype.so.6 lrwxrwxrwx 1 root root 21 2010-01-22 11:42 /usr/lib/libfreetype.so.6 -> libfreetype.so.6.3.22 Andrew Su please check if you can reproduce this bug on a 32bit Fedora version since I am only able to reproduce the bug on 32bit systems. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From vanaltj at icedtea.classpath.org Mon Jun 7 08:54:18 2010 From: vanaltj at icedtea.classpath.org (vanaltj at icedtea.classpath.org) Date: Mon, 07 Jun 2010 15:54:18 +0000 Subject: /hg/icedtea6: Fix path to src.zip when adding Pulse sources. Message-ID: changeset 2fd3953c1983 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2fd3953c1983 author: Jon VanAlten date: Mon Jun 07 11:49:53 2010 -0400 Fix path to src.zip when adding Pulse sources. * Makefile.am (stamps/icedtea.stamp): Use full path when adding PulseAudio sources to src.zip diffstat: 2 files changed, 6 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ Makefile.am | 2 +- diffs (24 lines): diff -r f08bf2c87805 -r 2fd3953c1983 ChangeLog --- a/ChangeLog Fri Jun 04 14:20:15 2010 -0400 +++ b/ChangeLog Mon Jun 07 11:49:53 2010 -0400 @@ -1,3 +1,8 @@ 2010-06-04 Jon VanAlten + + * Makefile.am + (stamps/icedtea.stamp): Use full path when adding PulseAudio sources to src.zip + 2010-06-04 Jon VanAlten * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java: diff -r f08bf2c87805 -r 2fd3953c1983 Makefile.am --- a/Makefile.am Fri Jun 04 14:20:15 2010 -0400 +++ b/Makefile.am Mon Jun 07 11:49:53 2010 -0400 @@ -1251,7 +1251,7 @@ if ENABLE_PULSE_JAVA cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ - $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) + $(ZIP) -qur $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif if WITH_VISUALVM mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ From andrew at icedtea.classpath.org Mon Jun 7 11:43:51 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 07 Jun 2010 18:43:51 +0000 Subject: /hg/icedtea6: Make {ECJ_,}BUILD_OUTPUT_DIR absolute and drop unn... Message-ID: changeset fa0ad887008c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fa0ad887008c author: Andrew John Hughes date: Mon Jun 07 19:43:40 2010 +0100 Make {ECJ_,}BUILD_OUTPUT_DIR absolute and drop unneeded ICEDTEA_BUILD_DIR{,_ECJ}. 2010-06-07 Andrew John Hughes Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR absolute and dispense with ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ. * Makefile.am: (BUILD_OUTPUT_DIR): Make absolute. (ICEDTEA_BUILD_DIR): Dropped. (ECJ_BUILD_OUTPUT_DIR): Likewise. (ICEDTEA_CLS_DIR): Make relative to BUILD_OUTPUT_DIR. (ICEDTEA_CLS_DIR): Likewise for ECJ_BUILD_OUTPUT_DIR. (ICEDTEA_BUILD_DIR_ECJ): Dropped. (ICEDTEA_ENV): Don't pass ICEDTEA_BUILD_DIR. (ICEDTEA_ENV_ECJ): Likewise. (bootstrap-directory.stamp): Use ECJ_BUILD_OUTPUT_DIR rather than ICEDTEA_BUILD_DIR_ECJ. Remove unneeded $(abs_top_builddir). (icedtea.stamp): Drop unneeded use of $(abs_top_builddir) from pulse java src.zip update. (icedtea-debug.stamp): Add pulse java src.zip update. (ADD_ZERO_CONFIGURE_ARGS): Drop unneeded $(abs_top_builddir). (ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR with BUILD_OUTPUT_DIR. (check-hotspot): Replace unneeded use of pwd. (check-jdk): Likewise. (check-langtools): Likewise. * patches/ecj/icedtea.patch: Use already defined CLASSBINDIR instead of passing in ICEDTEA_BUILD_DIR. diffstat: 3 files changed, 48 insertions(+), 26 deletions(-) ChangeLog | 29 +++++++++++++++++++++++++++++ Makefile.am | 41 +++++++++++++++++------------------------ patches/ecj/icedtea.patch | 4 ++-- diffs (180 lines): diff -r 2fd3953c1983 -r fa0ad887008c ChangeLog --- a/ChangeLog Mon Jun 07 11:49:53 2010 -0400 +++ b/ChangeLog Mon Jun 07 19:43:40 2010 +0100 @@ -1,3 +1,32 @@ 2010-06-07 Jon VanAlten + + Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR + absolute and dispense with ICEDTEA_BUILD_DIR and + ICEDTEA_BUILD_DIR_ECJ. + * Makefile.am: + (BUILD_OUTPUT_DIR): Make absolute. + (ICEDTEA_BUILD_DIR): Dropped. + (ECJ_BUILD_OUTPUT_DIR): Likewise. + (ICEDTEA_CLS_DIR): Make relative to BUILD_OUTPUT_DIR. + (ICEDTEA_CLS_DIR): Likewise for ECJ_BUILD_OUTPUT_DIR. + (ICEDTEA_BUILD_DIR_ECJ): Dropped. + (ICEDTEA_ENV): Don't pass ICEDTEA_BUILD_DIR. + (ICEDTEA_ENV_ECJ): Likewise. + (bootstrap-directory.stamp): Use ECJ_BUILD_OUTPUT_DIR + rather than ICEDTEA_BUILD_DIR_ECJ. Remove unneeded + $(abs_top_builddir). + (icedtea.stamp): Drop unneeded use of $(abs_top_builddir) + from pulse java src.zip update. + (icedtea-debug.stamp): Add pulse java src.zip update. + (ADD_ZERO_CONFIGURE_ARGS): Drop unneeded $(abs_top_builddir). + (ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR + with BUILD_OUTPUT_DIR. + (check-hotspot): Replace unneeded use of pwd. + (check-jdk): Likewise. + (check-langtools): Likewise. + * patches/ecj/icedtea.patch: Use already defined + CLASSBINDIR instead of passing in ICEDTEA_BUILD_DIR. + 2010-06-07 Jon VanAlten * Makefile.am diff -r 2fd3953c1983 -r fa0ad887008c Makefile.am --- a/Makefile.am Mon Jun 07 11:49:53 2010 -0400 +++ b/Makefile.am Mon Jun 07 19:43:40 2010 +0100 @@ -32,23 +32,17 @@ OPENJDK_HG_URL = http://hg.openjdk.java. # Build directories OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR) -BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR) +BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR) DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug -ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/build/$(OS_DIR) -ICEDTEA_BUILD_DIR = \ - $(abs_top_builddir)/$(BUILD_OUTPUT_DIR) -ICEDTEA_CLS_DIR = \ - $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes +ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj/build/$(OS_DIR) +ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes +ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes ICEDTEA_BOOT_DIR= \ $(abs_top_builddir)/bootstrap/jdk1.6.0 ICEDTEA_RT = \ $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar ICEDTEA_ENDORSED_DIR = \ $(ICEDTEA_BOOT_DIR)/lib/endorsed -ICEDTEA_BUILD_DIR_ECJ = \ - $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/ -ICEDTEA_CLS_DIR_ECJ = \ - $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/classes SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -422,7 +416,6 @@ ICEDTEA_ENV = \ PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \ ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \ BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ - ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR)" \ ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \ ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \ ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \ @@ -497,7 +490,6 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \ JAVA_TOOLS_DIR="$(ICEDTEA_BOOT_DIR)/bin" \ ICEDTEA_RT="$(ICEDTEA_RT)" \ - ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR_ECJ)" \ ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \ BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \ BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \ @@ -1176,10 +1168,9 @@ stamps/bootstrap-directory.stamp: stamps stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp rm -rf bootstrap/icedtea ln -s \ - $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/ \ - bootstrap/icedtea + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/ bootstrap/icedtea if ! test -d bootstrap/icedtea/include; then \ - ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \ + ln -sf $(ECJ_BUILD_OUTPUT_DIR)/include bootstrap/icedtea/include; \ fi mkdir -p stamps touch stamps/bootstrap-directory.stamp @@ -1251,7 +1242,7 @@ if ENABLE_PULSE_JAVA cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ - $(ZIP) -qur $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) + $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif if WITH_VISUALVM mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ @@ -1342,6 +1333,8 @@ if ENABLE_PULSE_JAVA $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext cp -pPRf pulse-java.jar \ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif if WITH_VISUALVM mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ @@ -1833,7 +1826,7 @@ endif # configure script arguments, quoted in single quotes CONFIGURE_ARGS = @CONFIGURE_ARGS@ ADD_ZERO_CONFIGURE_ARGS = \ - --with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + --with-openjdk=$(BUILD_OUTPUT_DIR)/j2sdk-image \ --enable-zero if ADD_SHARK_BUILD ADD_ZERO_CONFIGURE_ARGS += \ @@ -1855,10 +1848,10 @@ endif endif ADD_ZERO_EXTRA_BUILD_ENV = \ - BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \ - BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \ - BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \ - BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \ + BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \ + BUILD_JAXP=false ALT_JAXP_DIST=$(BUILD_OUTPUT_DIR)/jaxp/dist \ + BUILD_JAXWS=false ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \ + BUILD_CORBA=false ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \ BUILD_JDK=false \ DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))' @@ -1967,7 +1960,7 @@ check-hotspot: stamps/jtreg.stamp mkdir -p test/hotspot/JTwork test/hotspot/JTreport $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/hotspot/JTwork -r:test/hotspot/JTreport \ - -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/hotspot/test \ | tee test/$@.log @@ -1977,7 +1970,7 @@ check-langtools: stamps/jtreg.stamp $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/langtools/JTwork -r:test/langtools/JTreport \ $${ICEDTEA_JTREG_OTHERVM:--samevm} \ - -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/langtools/test \ | tee test/$@.log @@ -1987,7 +1980,7 @@ check-jdk: stamps/jtreg.stamp $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/jdk/JTwork -r:test/jdk/JTreport \ $${ICEDTEA_JTREG_OTHERVM:--samevm} \ - -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ -exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \ $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/jdk/test \ diff -r 2fd3953c1983 -r fa0ad887008c patches/ecj/icedtea.patch --- a/patches/ecj/icedtea.patch Mon Jun 07 11:49:53 2010 -0400 +++ b/patches/ecj/icedtea.patch Mon Jun 07 19:43:40 2010 +0100 @@ -336,9 +336,9 @@ diff -Nru openjdk-ecj.orig/corba/make/co $(ECHO) "# Running javac:"; \ - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ ++ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \ + -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \ ++ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \ + -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ fi @$(java-vm-cleanup) From andrew at icedtea.classpath.org Mon Jun 7 11:44:04 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 07 Jun 2010 18:44:04 +0000 Subject: /hg/release/icedtea6-1.7: 2 new changesets Message-ID: changeset 8b77407094df in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=8b77407094df author: Deepak Bhole date: Tue Apr 20 16:11:05 2010 -0400 PR icedtea/474: Commit patch from Paulo Cesar Pereira de Andrade, incrementing malloc size to account for NULL terminator. 2010-04-20 Deepak Bhole PR icedtea/474 * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_environment): Increment malloc size by one to account for NULL terminator. Bug# 474. changeset f779c58329e1 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f779c58329e1 author: Deepak Bhole date: Wed Apr 21 11:30:49 2010 -0400 Fixed typo in previous commit 2010-04-21 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_environment): Fix typo in previous commit diffstat: 2 files changed, 13 insertions(+), 1 deletion(-) ChangeLog | 12 ++++++++++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 2 +- diffs (31 lines): diff -r cf888f068f5f -r f779c58329e1 ChangeLog --- a/ChangeLog Mon Apr 12 17:20:51 2010 -0400 +++ b/ChangeLog Wed Apr 21 11:30:49 2010 -0400 @@ -1,3 +1,15 @@ 2010-04-12 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (plugin_filter_environment): Fix typo in previous commit + +2010-04-20 Deepak Bhole + + PR icedtea/474 + * plugin/icedteanp/IcedTeaNPPlugin.cc + (plugin_filter_environment): Increment malloc size by one to account for + NULL terminator. Bug# 474. + 2010-04-12 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf diff -r cf888f068f5f -r f779c58329e1 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Apr 12 17:20:51 2010 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Apr 21 11:30:49 2010 -0400 @@ -1464,7 +1464,7 @@ plugin_filter_environment(void) plugin_filter_environment(void) { gchar **var_names = g_listenv(); - gchar **new_env = (gchar**) malloc(sizeof(gchar*) * g_strv_length (var_names)); + gchar **new_env = (gchar**) malloc(sizeof(gchar*) * (g_strv_length (var_names) + 1)); int i_var, i_env; for (i_var = 0, i_env = 0; var_names[i_var] != NULL; i_var++) From andrew at icedtea.classpath.org Mon Jun 7 13:03:49 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 07 Jun 2010 20:03:49 +0000 Subject: /hg/icedtea: 8 new changesets Message-ID: changeset 3902402ed112 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3902402ed112 author: Andrew John Hughes date: Sun Apr 18 17:03:04 2010 +0100 Log all output from configure command invocations to config.log. 2010-04-18 Andrew John Hughes * acinclude.m4: (FIND_JAR): Log all output to config.log (AC_CHECK_WITH_HG_REVISION): Likewise. (IT_CHECK_PLUGIN_DEPENDENCIES): Likewise. changeset 47b2ef04fed4 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=47b2ef04fed4 author: Xerxes R?nby date: Mon Apr 19 16:50:36 2010 +0200 Update Shark for LLVM 2.8 API change r100304 2010-04-19 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::memset): Update Shark for LLVM 2.8 API change. LLVM 2.8 added a fifth isVolatile field for memset introduced with LLVM r100304. (SharkBuilder::CreateMemset): Likewise changeset 3e38b1e90480 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3e38b1e90480 author: Deepak Bhole date: Tue Apr 20 16:11:05 2010 -0400 PR icedtea/474: Commit patch from Paulo Cesar Pereira de Andrade, incrementing malloc size to account for NULL terminator. 2010-04-20 Deepak Bhole PR icedtea/474 * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_environment): Increment malloc size by one to account for NULL terminator. Bug# 474. changeset e32c0b73290f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e32c0b73290f author: Deepak Bhole date: Wed Apr 21 11:30:49 2010 -0400 Fixed typo in previous commit 2010-04-21 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_environment): Fix typo in previous commit changeset 33f2cabc6bca in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=33f2cabc6bca author: Xerxes R?nby date: Thu Apr 22 11:16:37 2010 +0200 Shark calling static jni methods jclass argument fix. 2010-04-22 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp (SharkNativeWrapper::initialize): Shark calling static jni methods jclass argument fix. changeset a7281252ac74 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a7281252ac74 author: Matthias Klose date: Mon Jun 07 17:28:39 2010 +0100 Allow overwriting -samevm in check-langtools, check-jdk targets. Running the testsuite in -samevm mode currently lets the harness crash when using shark or cacao as the harness VM. This provides a way to overwrite the default -samevm mode. 2010-04-24 Matthias Klose * Makefile.am (check-langtools, check-jdk): Allow overwriting -samevm with the environment variable ICEDTEA_JTREG_OTHERVM. changeset 1eaa1ce55902 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1eaa1ce55902 author: Andrew John Hughes date: Mon Jun 07 17:32:01 2010 +0100 Fix building with --enable-systemtap and GCC 4.5. 2010-04-28 Andrew John Hughes * Makefile.am: Add patch when SystemTap is enabled to support building with GCC 4.5. * patches/systemtap-gcc-4.5.patch: Add cast to NULL (doesn't apply to DTrace due to differences between SystemTap and DTrace macros). changeset 854406ecaf7f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=854406ecaf7f author: Andrew John Hughes date: Mon Jun 07 21:03:36 2010 +0100 Remove parts of systemtap patch upstreamed in S6893483. 2010-06-07 Andrew John Hughes * patches/icedtea-systemtap.patch: Remove parts upstreamed in 6893483: DTrace probe return values for a couple JNI methods are wrong diffstat: 8 files changed, 124 insertions(+), 71 deletions(-) ChangeLog | 53 ++++++++ Makefile.am | 9 - acinclude.m4 | 11 - patches/icedtea-systemtap.patch | 95 +++++---------- patches/systemtap-gcc-4.5.patch | 11 + plugin/icedteanp/IcedTeaNPPlugin.cc | 2 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 11 + ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 3 diffs (339 lines): diff -r 108556963776 -r 854406ecaf7f ChangeLog --- a/ChangeLog Mon Apr 12 17:20:51 2010 -0400 +++ b/ChangeLog Mon Jun 07 21:03:36 2010 +0100 @@ -1,3 +1,56 @@ 2010-04-12 Deepak Bhole + + * patches/icedtea-systemtap.patch: + Remove parts upstreamed in + 6893483: DTrace probe return values for a couple JNI methods are wrong + +2010-04-28 Andrew John Hughes + + * Makefile.am: + Add patch when SystemTap is enabled to support + building with GCC 4.5. + * patches/systemtap-gcc-4.5.patch: + Add cast to NULL (doesn't apply to DTrace due + to differences between SystemTap and DTrace macros). + +2010-04-24 Matthias Klose + + * Makefile.am (check-langtools, check-jdk): Allow overwriting -samevm + with the environment variable ICEDTEA_JTREG_OTHERVM. + +2010-04-22 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Shark calling static jni + methods jclass argument fix. + +2010-04-21 Deepak Bhole + + * plugin/icedteanp/IcedTeaNPPlugin.cc + (plugin_filter_environment): Fix typo in previous commit + +2010-04-20 Deepak Bhole + + PR icedtea/474 + * plugin/icedteanp/IcedTeaNPPlugin.cc + (plugin_filter_environment): Increment malloc size by one to account for + NULL terminator. Bug# 474. + +2010-04-19 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::memset): Update Shark for LLVM 2.8 API change. + LLVM 2.8 added a fifth isVolatile field for memset + introduced with LLVM r100304. + (SharkBuilder::CreateMemset): Likewise + +2010-04-18 Andrew John Hughes + + * acinclude.m4: + (FIND_JAR): Log all output to config.log + (AC_CHECK_WITH_HG_REVISION): Likewise. + (IT_CHECK_PLUGIN_DEPENDENCIES): Likewise. + 2010-04-12 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf diff -r 108556963776 -r 854406ecaf7f Makefile.am --- a/Makefile.am Mon Apr 12 17:20:51 2010 -0400 +++ b/Makefile.am Mon Jun 07 21:03:36 2010 +0100 @@ -370,7 +370,8 @@ endif endif if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += patches/icedtea-systemtap.patch +ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \ + patches/systemtap-gcc-4.5.patch endif if ENABLE_PLUGIN @@ -2546,7 +2547,8 @@ check-langtools: stamps/jtreg.stamp mkdir -p test/langtools/JTwork test/langtools/JTreport $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/langtools/JTwork -r:test/langtools/JTreport \ - -s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + $${ICEDTEA_JTREG_OTHERVM:--samevm} \ + -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ $(ICEDTEA_JTREG_OPTIONS) \ -exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \ `pwd`/openjdk/langtools/test \ @@ -2559,7 +2561,8 @@ endif endif $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/jdk/JTwork -r:test/jdk/JTreport \ - -s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + $${ICEDTEA_JTREG_OTHERVM:--samevm} \ + -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ $(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \ -exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \ `pwd`/openjdk/jdk/test \ diff -r 108556963776 -r 854406ecaf7f acinclude.m4 --- a/acinclude.m4 Mon Apr 12 17:20:51 2010 -0400 +++ b/acinclude.m4 Mon Jun 07 21:03:36 2010 +0100 @@ -366,7 +366,7 @@ AC_DEFUN([FIND_JAR], cat >_config.list <&AS_MESSAGE_LOG_FD; then + if $JAR cf _config.jar @_config.list >&AS_MESSAGE_LOG_FD 2>&1; then JAR_KNOWS_ATFILE=1 AC_MSG_RESULT(yes) else @@ -374,7 +374,7 @@ EOF AC_MSG_RESULT(no) fi AC_MSG_CHECKING([whether jar supports stdin file arguments]) - if cat _config.list | $JAR cf@ _config.jar 2>&AS_MESSAGE_LOG_FD; then + if cat _config.list | $JAR cf@ _config.jar >&AS_MESSAGE_LOG_FD 2>&1; then JAR_ACCEPTS_STDIN_LIST=1 AC_MSG_RESULT(yes) else @@ -383,7 +383,7 @@ EOF fi rm -f _config.list _config.jar AC_MSG_CHECKING([whether jar supports -J options at the end]) - if $JAR cf _config.jar _config.txt -J-Xmx896m 2>&AS_MESSAGE_LOG_FD; then + if $JAR cf _config.jar _config.txt -J-Xmx896m >&AS_MESSAGE_LOG_FD 2>&1; then JAR_KNOWS_J_OPTIONS=1 AC_MSG_RESULT(yes) else @@ -1687,7 +1687,7 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS], ICEDTEA_REVISION="none"; JDK_REVISION="none"; HOTSPOT_REVISION="none"; - if which ${HG} >/dev/null; then + if which ${HG} >&AS_MESSAGE_LOG_FD 2>&1; then AC_MSG_CHECKING([for IcedTea Mercurial revision ID]) if test -e ${abs_top_srcdir}/.hg ; then ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} tip --template '{node|short}')`" ; @@ -1734,8 +1734,7 @@ if test "x${enable_plugin}" = "xyes" ; t AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - - if $PKG_CONFIG --atleast-version 1.9.2 libxul 2>&AS_MESSAGE_LOG_FD ; then + if $PKG_CONFIG --atleast-version 1.9.2 libxul >&AS_MESSAGE_LOG_FD 2>&1; then xullibs=libxul else xullibs="libxul libxul-unstable" diff -r 108556963776 -r 854406ecaf7f patches/icedtea-systemtap.patch --- a/patches/icedtea-systemtap.patch Mon Apr 12 17:20:51 2010 -0400 +++ b/patches/icedtea-systemtap.patch Mon Jun 07 21:03:36 2010 +0100 @@ -1,6 +1,6 @@ diff -r 945bf7540697 make/linux/makefile -diff -r 945bf7540697 make/linux/makefiles/dtrace.make ---- openjdk/hotspot/make/linux/makefiles/dtrace.make Thu Jan 22 14:42:01 2009 -0800 -+++ openjdk/hotspot/make/linux/makefiles/dtrace.make Mon Feb 02 13:47:34 2009 +0100 +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/dtrace.make openjdk/hotspot/make/linux/makefiles/dtrace.make +--- openjdk.orig/hotspot/make/linux/makefiles/dtrace.make 2010-05-14 16:02:53.000000000 +0100 ++++ openjdk/hotspot/make/linux/makefiles/dtrace.make 2010-06-07 17:42:38.000000000 +0100 @@ -25,3 +25,7 @@ # Linux does not build jvm_db LIBJVM_DB = @@ -9,9 +9,10 @@ diff -r 945bf7540697 make/linux/makefile +CFLAGS += -DDTRACE_ENABLED + +# It doesn't support HAVE_DTRACE_H though. ---- openjdk/hotspot/src/share/vm/prims/jni.cpp 2009-10-13 15:34:52.499809508 +0200 -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2009-10-13 15:31:26.117823588 +0200 -@@ -1747,10 +1744,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp +--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2010-05-14 16:02:53.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2010-06-07 17:42:38.000000000 +0100 +@@ -1753,10 +1753,7 @@ JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \ JNIWrapper("Set" XSTR(Result) "Field"); \ \ @@ -23,7 +24,7 @@ diff -r 945bf7540697 make/linux/makefile \ oop o = JNIHandles::resolve_non_null(obj); \ klassOop k = o->klass(); \ -@@ -1924,10 +1918,7 @@ +@@ -1930,10 +1927,7 @@ \ JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \ JNIWrapper("SetStatic" XSTR(Result) "Field"); \ @@ -35,36 +36,33 @@ diff -r 945bf7540697 make/linux/makefile \ JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \ assert(id->is_static_field_id(), "invalid static field id"); \ -@@ -2116,7 +2101,7 @@ - DT_RETURN_MARK(GetObjectArrayElement, jobject, (const jobject&)ret); - objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array)); - if (a->is_within_bounds(index)) { -- jobject ret = JNIHandles::make_local(env, a->obj_at(index)); -+ ret = JNIHandles::make_local(env, a->obj_at(index)); - return ret; - } else { - char buf[jintAsStringSize]; -@@ -2150,14 +2150,14 @@ - - #define DEFINE_NEWSCALARARRAY(Return,Allocator,Result) \ - \ -- DT_RETURN_MARK_DECL_FOR(Result, New##Result##Array, Return);\ -+ DT_RETURN_MARK_DECL(New##Result##Array, Return);\ - \ - JNI_ENTRY(Return, \ - jni_New##Result##Array(JNIEnv *env, jsize len)) \ - JNIWrapper("New" XSTR(Result) "Array"); \ - DTRACE_PROBE2(hotspot_jni, New##Result##Array__entry, env, len);\ - Return ret = NULL;\ -- DT_RETURN_MARK_FOR(Result, New##Result##Array, Return, (const Return&)ret);\ -+ DT_RETURN_MARK(New##Result##Array, Return, (const Return&)ret);\ - \ - oop obj= oopFactory::Allocator(len, CHECK_0); \ - ret = (Return) JNIHandles::make_local(env, obj); \ - -diff -r 945bf7540697 src/share/vm/utilities/dtrace.hpp ---- openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Thu Jan 22 14:42:01 2009 -0800 -+++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Mon Feb 02 13:47:34 2009 +0100 +diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp +--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2010-06-07 17:41:12.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2010-06-07 17:42:38.000000000 +0100 +@@ -2441,16 +2441,16 @@ + FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); + FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true); + } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) { +-#ifdef SOLARIS ++#ifdef DTRACE_ENABLED + FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true); + FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true); + FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true); + FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true); +-#else // ndef SOLARIS ++#else // ndef DTRACE_ENABLED + jio_fprintf(defaultStream::error_stream(), +- "ExtendedDTraceProbes flag is only applicable on Solaris\n"); ++ "ExtendedDTraceProbes flag is only applicable on dtrace enabled builds\n"); + return JNI_EINVAL; +-#endif // ndef SOLARIS ++#endif // ndef DTRACE_ENABLED + #ifdef ASSERT + } else if (match_option(option, "-XX:+FullGCALot", &tail)) { + FLAG_SET_CMDLINE(bool, FullGCALot, true); +diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp openjdk/hotspot/src/share/vm/utilities/dtrace.hpp +--- openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp 2010-05-14 16:02:53.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2010-06-07 17:42:38.000000000 +0100 @@ -1,5 +1,6 @@ /* * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. @@ -157,26 +155,3 @@ diff -r 945bf7540697 src/share/vm/utilit +#define HS_DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\ + DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8) +#endif ---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-03-04 14:39:43.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-03-04 22:11:37.000000000 +0100 -@@ -2375,16 +2375,16 @@ - FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); - FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true); - } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) { --#ifdef SOLARIS -+#ifdef DTRACE_ENABLED - FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true); - FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true); - FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true); - FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true); --#else // ndef SOLARIS -+#else // ndef DTRACE_ENABLED - jio_fprintf(defaultStream::error_stream(), -- "ExtendedDTraceProbes flag is only applicable on Solaris\n"); -+ "ExtendedDTraceProbes flag is only applicable on dtrace enabled builds\n"); - return JNI_EINVAL; --#endif // ndef SOLARIS -+#endif // ndef DTRACE_ENABLED - #ifdef ASSERT - } else if (match_option(option, "-XX:+FullGCALot", &tail)) { - FLAG_SET_CMDLINE(bool, FullGCALot, true); diff -r 108556963776 -r 854406ecaf7f patches/systemtap-gcc-4.5.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/systemtap-gcc-4.5.patch Mon Jun 07 21:03:36 2010 +0100 @@ -0,0 +1,11 @@ +--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 08:51:29.000000000 +0100 ++++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2010-04-28 09:29:22.000000000 +0100 +@@ -2723,7 +2723,7 @@ + + if (!directBufferSupportInitializeEnded) { + if (!initializeDirectBufferSupport(env, thread)) { +- DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL); ++ DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL); + return NULL; + } + } diff -r 108556963776 -r 854406ecaf7f plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Apr 12 17:20:51 2010 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jun 07 21:03:36 2010 +0100 @@ -1464,7 +1464,7 @@ plugin_filter_environment(void) plugin_filter_environment(void) { gchar **var_names = g_listenv(); - gchar **new_env = (gchar**) malloc(sizeof(gchar*) * g_strv_length (var_names)); + gchar **new_env = (gchar**) malloc(sizeof(gchar*) * (g_strv_length (var_names) + 1)); int i_var, i_env; for (i_var = 0, i_env = 0; var_names[i_var] != NULL; i_var++) diff -r 108556963776 -r 854406ecaf7f ports/hotspot/src/share/vm/shark/sharkBuilder.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Mon Apr 12 17:20:51 2010 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Mon Jun 07 21:03:36 2010 +0100 @@ -399,7 +399,13 @@ Value* SharkBuilder::memory_barrier() { } Value* SharkBuilder::memset() { +#if SHARK_LLVM_VERSION >= 28 + // LLVM 2.8 added a fifth isVolatile field for memset + // introduced with LLVM r100304 + return make_function("llvm.memset.i32", "Cciii", "v"); +#else return make_function("llvm.memset.i32", "Ccii", "v"); +#endif } Value* SharkBuilder::unimplemented() { @@ -447,7 +453,12 @@ CallInst* SharkBuilder::CreateMemset(Val Value* value, Value* len, Value* align) { +#if SHARK_LLVM_VERSION >= 28 + return CreateCall5(memset(), dst, value, len, align, + LLVMValue::jint_constant(0)); +#else return CreateCall4(memset(), dst, value, len, align); +#endif } CallInst* SharkBuilder::CreateUnimplemented(const char* file, int line) { diff -r 108556963776 -r 854406ecaf7f ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp --- a/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Mon Apr 12 17:20:51 2010 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Mon Jun 07 21:03:36 2010 +0100 @@ -98,7 +98,8 @@ void SharkNativeWrapper::initialize(cons if (is_static()) { builder()->CreateStore( builder()->CreateInlineOop( - JNIHandles::make_local(target()->method_holder())), + JNIHandles::make_local( + target()->method_holder()->klass_part()->java_mirror())), oop_tmp_slot()); param_types.push_back(box_type); From bugzilla-daemon at icedtea.classpath.org Tue Jun 8 01:47:21 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 08 Jun 2010 08:47:21 +0000 Subject: [Bug 487] Shark Unable to Stroke shape (private data) Exception Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=487 ------- Comment #1 from xerxes at zafena.se 2010-06-08 08:47 ------- this bug passes a bogus jobject pointer (see sr and obj below) from jit code to jni code: in most cases this bogus pointer makes jni_GetLongField fail the lookup of the LongField and return a null, ... that will in turn eventually trigger a generation of a nullpointer exception in openjdk/jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c:311 in some cases this bogus jobject pointer triggers a sigsegv. #0 jni_GetLongField (env=, obj=0x0, fieldID=0x22) at /media/disk/icedtea6-shark/openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp:190 #1 0x56a01750 in Java_sun_java2d_pipe_ShapeSpanIterator_lineTo (env=0x1c7d38, sr=0x0, x1=0, y1=3.36247349) at ../../../src/share/native/sun/awt/../java2d/pipe/ShapeSpanIterator.c:309 #2 0x5668d600 in ?? () <---- sun.java2d.pipe.ShapeSpanIterator::lineTo [0x5668d560-0x5668d690): sun.java2d.pipe.ShapeSpanIterator::lineTo (304 bytes code) interestingly this bug only triggers after sun.java2d.pisces.PiscesRenderingEngine.lineTo have ben compiled. the chain of failure are (jit) sun.java2d.pisces.PiscesRenderingEngine.lineTo -> (jit jni wrapper) sun.java2d.pipe.ShapeSpanIterator::lineTo -> (jni) Java_sun_java2d_pipe_ShapeSpanIterator_lineTo and here the second jobject argument contains a bogus pointer. is it possible for target->method_holder()->klass_part()->java_mirror() in sharkNativeWrapper::initialize to return null? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From thierry.reding at avionic-design.de Tue Jun 8 05:08:55 2010 From: thierry.reding at avionic-design.de (Thierry Reding) Date: Tue, 8 Jun 2010 14:08:55 +0200 Subject: [PATCH] Add cross-compilation support Message-ID: <20100608120855.GA24522@avionic-design.de> The following patch adds rudimentary support for cross-compiling IcedTea 7. This only works for non-bootstrapped builds. I've also tested building IcedTea natively and it still works fine with this patch. The cross-compile was done with an ARM target, but I currently have no hardware to test this on. I may be able to runtime test the cross-compile on an i686 target later this week. Cross-compiling also requires a native build of IcedTea/OpenJDK, so you need to pass --with-jdk-home=/path/to/icedtea/or/openjdk and --disable-bootstrap for this to work. I have also not tested cross-building the plugin yet. Cheers, Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-cross-compile.patch Type: text/x-diff Size: 19979 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100608/0ec1698a/icedtea-cross-compile.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100608/0ec1698a/attachment.bin From bugzilla-daemon at icedtea.classpath.org Tue Jun 8 10:13:25 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 08 Jun 2010 17:13:25 +0000 Subject: [Bug 487] Shark Unable to Stroke shape (private data) Exception Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=487 xerxes at zafena.se changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED ------- Comment #2 from xerxes at zafena.se 2010-06-08 17:13 ------- narrowed testcase: java -XX:CompileOnly=sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo -jar JGears2.jar by making sure that I only jit compile sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo makes it clear that this bug orgin somewhere from the jiting/execution of this method. gdb -args /sd/icedtea6-shark/openjdk/build/linux-arm/j2sdk-image/bin/java -XX:+SharkTraceInstalls -XX:SharkPrintBitcodeOf=sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo -XX:CompileOnly=sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo -jar JGears2.jar GNU gdb 6.8 Copyright (C) 2008 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "arm-angstrom-linux-gnueabi"... (gdb) break java_md.c:652 Breakpoint 1 at 0xd9e4: file ../../../../src/solaris/bin/java_md.c, line 652. (gdb) run Starting program: /media/disk/icedtea6-shark/openjdk/build/linux-arm/j2sdk-image/bin/java -XX:+SharkTraceInstalls -XX:SharkPrintBitcodeOf=sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo -XX:CompileOnly=sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo -jar JGears2.jar [Thread debugging using libthread_db enabled] [New Thread 0x40020640 (LWP 20565)] [Switching to Thread 0x40020640 (LWP 20565)] Breakpoint 1, LoadJavaVM ( jvmpath=0xbebf317c "/media/disk/icedtea6-shark/openjdk/build/linux-arm/j2sdk-image/jre/lib/arm/server/libjvm.so", ifn=0xbebf51c4) at ../../../../src/solaris/bin/java_md.c:652 652 if (libjvm == NULL) { (gdb) break ShapeSpanIterator.c:312 No source file named ShapeSpanIterator.c. Make breakpoint pending on future shared library load? (y or [n]) y Breakpoint 2 (ShapeSpanIterator.c:312) pending. (gdb) c Continuing. ... [0x5668d010-0x5668d1f8): sun.java2d.pisces.PiscesRenderingEngine$2::lineTo (488 bytes code) [Switching to Thread 0x57531490 (LWP 20590)] Breakpoint 2, Java_sun_java2d_pipe_ShapeSpanIterator_lineTo (env=0x1c7c18, sr=, x1=78.8226624, y1=48.9294586) at ../../../src/share/native/sun/awt/../java2d/pipe/ShapeSpanIterator.c:312 warning: Source file is more recent than executable. 312 JNU_ThrowNullPointerException(env, "private data"); (gdb) bt #0 Java_sun_java2d_pipe_ShapeSpanIterator_lineTo (env=0x1c7c18, sr=, x1=78.8226624, y1=48.9294586) at ../../../src/share/native/sun/awt/../java2d/pipe/ShapeSpanIterator.c:312 #1 0x406ce720 in ffi_call_SYSV () from /usr/lib/libffi.so.5 #2 0x406cea1c in ffi_call () from /usr/lib/libffi.so.5 #3 0x402bfce4 in CppInterpreter::native_entry (method=0x406ceea0, UNUSED=, __the_thread__=0x1c7b08) at /media/disk/icedtea6-shark/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:298 #4 0x5668d164 in ?? () <---- sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo reduced chain of error: (jit) sun.java2d.pisces.PiscesRenderingEngine\$2::lineTo -> static native libfficall -> (static native) Java_sun_java2d_pipe_ShapeSpanIterator_lineTo -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 8 10:16:55 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 08 Jun 2010 17:16:55 +0000 Subject: [Bug 487] Shark Unable to Stroke shape (private data) Exception Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=487 ------- Comment #3 from xerxes at zafena.se 2010-06-08 17:16 ------- Created an attachment (id=359) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=359&action=view) sun.java2d.pisces.PiscesRenderingEngine$2::lineTosun.java2d.pisces.PiscesRenderingEngine$2::lineTosun.java2d.pisces.PiscesRenderingEngine$2::lineTo -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 8 10:21:36 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 08 Jun 2010 17:21:36 +0000 Subject: [Bug 487] Shark Unable to Stroke shape (private data) Exception Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=487 xerxes at zafena.se changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #359|sun.java2d.pisces.PiscesRend|sun.java2d.pisces.PiscesRend description|eringEngine$2::lineTosun.jav|eringEngine$2::lineTo.ll |a2d.pisces.PiscesRenderingEn| |gine$2::lineTosun.java2d.pis| |ces.PiscesRenderingEngine$2:| |:lineTo | Attachment #359|application/octet-stream |text/plain mime type| | Attachment #359|renderingengine.ll |renderingengine.lineto.ll filename| | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 8 10:23:48 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 08 Jun 2010 17:23:48 +0000 Subject: [Bug 487] Shark Unable to Stroke shape (private data) Exception Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=487 xerxes at zafena.se changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|xerxes at zafena.se |.org | ------- Comment #4 from xerxes at zafena.se 2010-06-08 17:23 ------- Created an attachment (id=360) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=360&action=view) ARM JIT disassembly of renderingengine.lineto.ll -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Tue Jun 8 10:27:52 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 8 Jun 2010 18:27:52 +0100 Subject: [PATCH] Add cross-compilation support In-Reply-To: <20100608120855.GA24522@avionic-design.de> References: <20100608120855.GA24522@avionic-design.de> Message-ID: On 8 June 2010 13:08, Thierry Reding wrote: > The following patch adds rudimentary support for cross-compiling IcedTea 7. > This only works for non-bootstrapped builds. I've also tested building IcedTea > natively and it still works fine with this patch. The cross-compile was done > with an ARM target, but I currently have no hardware to test this on. I may > be able to runtime test the cross-compile on an i686 target later this week. > > Cross-compiling also requires a native build of IcedTea/OpenJDK, so you need > to pass --with-jdk-home=/path/to/icedtea/or/openjdk and --disable-bootstrap > for this to work. I have also not tested cross-building the plugin yet. > > Cheers, > Thierry > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.10 (GNU/Linux) > > iEYEARECAAYFAkwOMtcACgkQZ+BJyKLjJp9BtACgl4gbPauTVwgT0U6DeokFIhbq > IHcAn21GYiURLUtsHwu9fbTlbpfyJfkg > =ZESt > -----END PGP SIGNATURE----- > > While you say it works, you don't really explain what this patch changes and why. It's quite a big change and I don't really understand the reason for most of them. Before I go into specifics about the patch, the primary issue is with maintaining this. Upstream OpenJDK7 moves on rapidly. It's no good dumping a patch like this into IcedTea7 where it rapidly bit rots. If we're going to add this, there needs to be someone maintaining it and doing regular cross-compiles. A big part of that is that it needs to be enabled on normal builds as well, otherwise this patch is liable to get broken every time there is a new build drop (which is weekly). It also means we have a chance of getting it upstreamed. IcedTea6 may be an easy target with less turbulence, but there still needs to be ongoing maintenance. We already have a half-hearted attempt in IcedTea6 from a patch that was never approved on the list but was committed anyway. I doubt it works now given things have changed quite a bit since and no-one has maintained it. I'm worried the ARM assembler port is also headed down that road. There aren't that many people working on IcedTea (and only me on IcedTea7), so if you want to add something that's not going to be tested regularly by normal usage like this, you need to step up to maintain and support it. With that out of the way, some comments on the patch: Makefile.am changes: * Why are we changing the names of the FREETYPE variables? It adds clarity but should be in a separate patch. It's unnecessary for cross-compile support. * The cross-compile patch is added in the wrong place. It needs to be on the end of the big ICEDTEA_PATCHES definition if it's a non-conditional patch. * Same applies with ICEDTEA_ENV. Please extend the main definition for non-conditional additions. * The if CROSS_COMPILING additions; can these not be applied generally? Why are these cross-compilation specific? If they are not generally applied, they will rarely be tested. There is no reason to change ALT_OUTPUTDIR to its already default setting. Can you explain the other changes in that block? configure.ac changes * Please don't add yet another option. autoconf has support for cross-compiling with host, target, build hosts. Please use that. Again, an option will never get used. corba-bootstrap.patch: * What is this for? None of these changes seem to be cross-compilation related. icedtea-cross-compile.patch (can we not just call this cross-compile.patch? I've been dropping the icedtea- prefix, there seems to be no need for it) - gcc.make: The CC and CPP changes make sense, but won't these fail given you only pass in CC for CROSS_COMPILATION builds? Checking if $(CC) and $(CPP) are empty and setting them if they are would be better. There seems to be a redundant change to AS. - rules.make: This seems to rename variables for no reason. If there are really changes drowning in this sea of renaming, I can't see them. - vm.make: Same as rules.make. - stubRoutines_zero.hpp: What is this? Why are you extending the Zero assembler port? - freetypecheck: Aren't the CFLAGS changes already covered by icedtea-headers.patch? The test turn-off seems correct. - jdk/make/common/Defs.gmk - what are EXTRA_{CFLAGS,CPPFLAGS,LDFLAGS}? - java/nio/Makefile: Makes sense, similar to BOOT_JAVAC and JAVAC. Can we not thus use BOOT_CC rather than CC_FOR_BUILD? - sun/xawt/Makefile: + ifeq ($(PLATFORM), solaris) +-CPPFLAGS += -DFUNCPROTO=15 ++DEFINES += -DFUNCPROTO=15 + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif Have you tested on Solaris? Again, why all the renaming? - sun/font/Makefile: does icedtea-headers not cover these FT changes? - openjdk/Makefile: seems to be no reason for this - openjdk/corba/make/common/Defs-linux.gmk: This is the same as corba-bootstrap.patch! adlc.make: Again spurious renaming. platform_zero.in: why is @ZERO_ARCHDEF@ removed? In summary, the only viable changes I see are a few changes from $(CC) to $(BOOT_CC) and the conditional running of the FreeType test. Can you explain the need for the rest, if any? Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From thierry.reding at avionic-design.de Tue Jun 8 23:54:40 2010 From: thierry.reding at avionic-design.de (Thierry Reding) Date: Wed, 9 Jun 2010 08:54:40 +0200 Subject: [PATCH] Add cross-compilation support In-Reply-To: References: <20100608120855.GA24522@avionic-design.de> Message-ID: <20100609065440.GA530@avionic-design.de> * Andrew John Hughes wrote: > On 8 June 2010 13:08, Thierry Reding wrote: > > The following patch adds rudimentary support for cross-compiling IcedTea 7. > > This only works for non-bootstrapped builds. I've also tested building IcedTea > > natively and it still works fine with this patch. The cross-compile was done > > with an ARM target, but I currently have no hardware to test this on. I may > > be able to runtime test the cross-compile on an i686 target later this week. > > > > Cross-compiling also requires a native build of IcedTea/OpenJDK, so you need > > to pass --with-jdk-home=/path/to/icedtea/or/openjdk and --disable-bootstrap > > for this to work. I have also not tested cross-building the plugin yet. > > > > Cheers, > > Thierry > > > > -----BEGIN PGP SIGNATURE----- > > Version: GnuPG v1.4.10 (GNU/Linux) > > > > iEYEARECAAYFAkwOMtcACgkQZ+BJyKLjJp9BtACgl4gbPauTVwgT0U6DeokFIhbq > > IHcAn21GYiURLUtsHwu9fbTlbpfyJfkg > > =ZESt > > -----END PGP SIGNATURE----- > > > > > > While you say it works, you don't really explain what this patch > changes and why. It's quite a big change and I don't really > understand the reason for most of them. > > Before I go into specifics about the patch, the primary issue is with > maintaining this. Upstream OpenJDK7 moves on rapidly. It's no good > dumping a patch like this into IcedTea7 where it rapidly bit rots. If > we're going to add this, there needs to be someone maintaining it and > doing regular cross-compiles. A big part of that is that it needs to > be enabled on normal builds as well, otherwise this patch is liable to > get broken every time there is a new build drop (which is weekly). It > also means we have a chance of getting it upstreamed. IcedTea6 may be > an easy target with less turbulence, but there still needs to be > ongoing maintenance. We already have a half-hearted attempt in > IcedTea6 from a patch that was never approved on the list but was > committed anyway. I doubt it works now given things have changed > quite a bit since and no-one has maintained it. I'm worried the ARM > assembler port is also headed down that road. There aren't that many > people working on IcedTea (and only me on IcedTea7), so if you want to > add something that's not going to be tested regularly by normal usage > like this, you need to step up to maintain and support it. Unfortunately this is pretty much out of my hands. I've been working on this for a project where I need to cross-compile Java, so I was thinking IcedTea was my best bet. After the project I cannot give any guarantees. That is the reason why I wanted to share this patch and try to get as much of it upstreamed as possible so others can profit from it and in the hopes that the patch will "maintain itself". I realize that this may require some more work on my part, but once cross-compilation support goes into the mainline IcedTea tree, I think perhaps others may chime in and fix things if they should break. > With that out of the way, some comments on the patch: > > Makefile.am changes: > > * Why are we changing the names of the FREETYPE variables? It adds > clarity but should be in a separate patch. It's unnecessary for > cross-compile support. I agree that this should be a separate patch but I wanted to dump this all here so we could discuss all of it together. The FREETYPE variable changes are for consistency only and IMO makes the parts where they are referenced easier to understand. > * The cross-compile patch is added in the wrong place. It needs to be > on the end of the big ICEDTEA_PATCHES definition if it's a > non-conditional patch. I applied it at the very end because it makes working on it easier and because it won't disturb any other patches in between. Before this is mainlined, I'm all in favour of putting this in the right place. > * Same applies with ICEDTEA_ENV. Please extend the main definition > for non-conditional additions. > * The if CROSS_COMPILING additions; can these not be applied > generally? Why are these cross-compilation specific? If they are not > generally applied, they will rarely be tested. I think most of them can be generally applied. In particular those setting the tools and variables CC, EXTRA_CFLAGS, and friends should always be applicable because they force the compiler as detected by configure to be used. > There is no reason to change ALT_OUTPUTDIR to its already default setting. Then the ALT_OUTPUTDIR default doesn't seem to be correct. In a cross-compile it would always end up putting files into linux-amd64 instead of linux-arm. > Can you explain the other changes in that block? BUILD_ARCH_DIR and LIBARCH need to be set because otherwise the OpenJDK makefiles will set it to autodetected values that are plain wrong for cross-compiling. CROSS_COMPILING is obvious. I think all of those variables could be added unconditionally if we change CROSS_COMPILING to be set to @CROSS_COMPILING@ and AC_SUBST it in the configure script. > configure.ac changes > > * Please don't add yet another option. autoconf has support for > cross-compiling with host, target, build hosts. Please use that. > Again, an option will never get used. I don't understand. No option is added. This is just the standard code to check for the build compiler. > corba-bootstrap.patch: > > * What is this for? None of these changes seem to be cross-compilation related. This is actually required in order to undo a change from the icedtea-cross-compile patch that is applied to the openjdk subtree but will not work correctly for the openjdk-boot tree, or rather break one of the bootstrap patches. > icedtea-cross-compile.patch (can we not just call this > cross-compile.patch? I've been dropping the icedtea- prefix, there > seems to be no need for it) Certainly. > - gcc.make: The CC and CPP changes make sense, but won't these fail > given you only pass in CC for CROSS_COMPILATION builds? Checking if > $(CC) and $(CPP) are empty and setting them if they are would be > better. Right. If we always set CC and CPP in Makefile.am, this should be okay. Oddly enough even non-cross-compiles worked for me. Possibly because make uses the defaults for CC and CPP. > There seems to be a redundant change to AS. Yes, this doesn't need to change. Optionally we could drop this and also set it in Makefile.am, but then again, configure's definition of AS would more likely default to just plain 'as'. > - rules.make: This seems to rename variables for no reason. If there > are really changes drowning in this sea of renaming, I can't see them. > - vm.make: Same as rules.make. This is just to make the usage of the C++ compiler consistent. I find it confusing that there are 3 different variables for one and the same tool. But you are right. We can get away with less changes if we define CCC to equal CXX at the top of that file and leave the COMPILE.CC and friends untouched. > - stubRoutines_zero.hpp: What is this? Why are you extending the Zero > assembler port? Those changes actually come from a more recent version of hotspot which in the current IcedTea seems broken. The original change comes from hotspot changeset 1346:47742b654fcb. For some reason that snippet is missing from the tree built by IcedTea. > - freetypecheck: Aren't the CFLAGS changes already covered by > icedtea-headers.patch? The test turn-off seems correct. Not quite. When building I would always get errors about wrong flags. If I remember correctly FREETYPE_HEADERS_PATH wasn't set correctly. > - jdk/make/common/Defs.gmk - what are EXTRA_{CFLAGS,CPPFLAGS,LDFLAGS}? Those are set in Makefile.am and are flags either detected by configure or set by the user when calling configure. Usually for cross-compiles, only CFLAGS, CPPFLAGS and LDFLAGS would be set but that doesn't work with OpenJDK because setting CFLAGS et al. directly would override any changes to them by OpenJDK's makefiles. > - java/nio/Makefile: Makes sense, similar to BOOT_JAVAC and JAVAC. > Can we not thus use BOOT_CC rather than CC_FOR_BUILD? Fine with me. CC_FOR_BUILD is the standard name with autotools, but if you prefer BOOT_CC and BOOT_CFLAGS, that's just as well. > - sun/xawt/Makefile: > > + ifeq ($(PLATFORM), solaris) > +-CPPFLAGS += -DFUNCPROTO=15 > ++DEFINES += -DFUNCPROTO=15 > + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) > + endif > > Have you tested on Solaris? > Again, why all the renaming? Nope, I have no Solaris box. But as you can see at the end of that block, DEFINES and INCLUDES are both added to CPPFLAGS again. This is important for building the sizer tools later on. They need those defines and includes but *not* all other CPPFLAGS. That's why they are separated like this. > - sun/font/Makefile: does icedtea-headers not cover these FT changes? See my comments above about freetypecheck. > - openjdk/Makefile: seems to be no reason for this There is a very good reason for this. Corba (specifically libioser12.so) links against libjvm.so and libjava.so. But libjvm.so and libjava.so are built *after* corba, namely during the hotspot and jdk targets respectively. In bootstrapped, non-cross-compiled builds, this is worked around by linking libioser12.so against the libraries from the gcj installation, which obviously doesn't work for cross-compiles. It strikes me as odd that this is even done like this. Shouldn't corba really require the libraries as built in the current configuration. In other words, is it not an error to link against the gcj libjvm.so and libjava.so? > - openjdk/corba/make/common/Defs-linux.gmk: This is the same as > corba-bootstrap.patch! This is actually the patch that I was talking about earlier. These changes are incompatible with the bootstrap stage. That is why the corba-bootstrap patch reverts them. > adlc.make: Again spurious renaming. Yes, obviously required by those earlier changes. If you'd rather have this as a separate patch or don't like it at all I can probably work around this by defining CCC to CXX and drop the other changes. > platform_zero.in: why is @ZERO_ARCHDEF@ removed? This is necessary because the libffi headers already define the same symbols, therefore resulting in an error when they are defined on the command-line. I don't understand why nobody else has seen this, though. > In summary, the only viable changes I see are a few changes from $(CC) > to $(BOOT_CC) and the conditional running of the FreeType test. Can > you explain the need for the rest, if any? I should really have explained these changes in more detail to start with. But I hope this clears things up a little. Cheers, Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100609/1cfd3e37/attachment.bin From ahughes at redhat.com Wed Jun 9 02:50:57 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 9 Jun 2010 10:50:57 +0100 Subject: Release Schedule Message-ID: I have a number of new IcedTea releases in planning: * IcedTea6 1.6 branch: http://icedtea.classpath.org/hg/release/icedtea6-1.6/shortlog/ There will be a 1.6.3 release as the branch has a lot of patches not yet released including security updates. It is ready for testing now. I have a few more patches to look into, but it's otherwise ready. doko reported an issue with Zero a while back, but I've not heard anything since. * IcedTea6 1.7 branch: http://icedtea.classpath.org/hg/release/icedtea6-1.7/shortlog/ There will be a 1.7.4 release to update the plugin with recent bug fixes in 1.8 and beyond. This will be a plugin-only release. Most of the patches have been backported (up to 1.8) and so this is also eligible for testing now. * IcedTea7: http://icedtea.classpath.org/hg/release/icedtea/shortlog There will be based on b89 (Milestone 7). I see from http://openjdk.java.net/projects/jdk7/milestones/ that we've apparently just reached Milestone 8, but I've seen nothing from Oracle on either milestone 6, 7 or 8 and I don't believe 8 is feature complete; I've seen no commits relating to closures for one thing. As you may have seen from the IcedTea7 commits, I've been backporting over six months worth of work on IcedTea6 to IcedTea7 over the last few weeks. There's still some to go, so I'll let the list know when it's worth testing. But it should be soon. A couple of changes I plan for this release are updating the CACAO build to use the development branch: see http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=139 and dropping VisualVM, which I believe is broken anyway. VisualVM will be migrated to its own repository. I'd like to make the same VisualVM change with IcedTea6 HEAD in due course. As to IcedTea6 HEAD generally, I don't think we're ready for another release yet so I doubt we'll have a release based on b19. The only major change there was an upgrade to hs16, which we provided as an option in 1.8 anyway. I'd rather we wait for b20 and then begin preparing a release, stabilising on hs17, which will bring us in line with the proprietary JDK6. For 1.8, I will backport any plugin fixes that are post-1.8 as I do them for 1.7, but I'll leave releases up to the release manager, doko. Comments welcome and testing encouraged, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Wed Jun 9 06:38:33 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 09 Jun 2010 13:38:33 +0000 Subject: /hg/icedtea: 8 new changesets Message-ID: changeset 66b4c5ea2c8a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=66b4c5ea2c8a author: Pavel Tisnovsky date: Wed Jun 09 13:18:34 2010 +0100 Remove local copy of Gervill tests. 2010-04-29 Pavel Tisnovsky * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatCo nverter/GetFormat.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/To FloatArray.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ Available.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ Close.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ GetFormat.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ GetFrameLength.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ MarkSupported.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ Read.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ ReadFloatArray.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ ReadFloatArrayIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ Reset.java, * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ Skip.java, * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/Tes tGetSoundbankFile.java, * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/Tes tGetSoundbankInputStream.java, * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/Tes tGetSoundbankInputStream2.java, * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/Tes tGetSoundbankUrl.java, * overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/Tes tCreateSoundbank.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetInp utStream.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetRoo t.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Load.j ava, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/LoadAl l.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewMod elByteBufferByteArray.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewMod elByteBufferByteArrayIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewMod elByteBufferFile.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewMod elByteBufferFileLongLong.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/Available.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/Close.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/MarkReset.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/MarkSupported.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/Read.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/ReadByte.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/ReadByteIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Random FileInputStream/Skip.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Subbuf ferLong.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Subbuf ferLongLong.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Subbuf ferLongLongBoolean.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Unload .java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/WriteT o.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/GetAttenuation.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/GetChannels.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/GetLoopLength.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/GetLoopStart.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/GetPitchCorrection.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/NewModelByteBufferWavetableModelByteBuffer.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/NewModelByteBufferWavetableModelByteBufferAudioFormat.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/NewModelByteBufferWavetableModelByteBufferFloat.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/Open.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/Set8BitExtensionBuffer.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetab le/SetLoopType.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewMo delDestination.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewMo delDestinationModelIdentifier.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetId entifier.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetTr ansform.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/Equals Object.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewMod elIdentifierString.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewMod elIdentifierStringInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewMod elIdentifierStringString.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewMod elIdentifierStringStringInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetIns tance.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetObj ect.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetVar iable.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/GetOsci llators.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetConn ectionBlocks.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetDefa ultConnectionsEnabled.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetExcl usiveClass.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyF rom.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyT o.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetName .java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetSelf NonExclusive.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelF rom.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelT o.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSo urce.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSo urceModelIdentifier.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSo urceModelIdentifierBoolean.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSo urceModelIdentifierBooleanBoolean.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSo urceModelIdentifierBooleanBooleanInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSo urceModelIdentifierModelTransform.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetIdentif ier.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetTransfo rm.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /NewModelStandardTransform.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /NewModelStandardTransformBoolean.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /NewModelStandardTransformBooleanBoolean.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /NewModelStandardTransformBooleanBooleanInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /SetDirection.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /SetPolarity.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /SetTransform.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /TransformAbsolute.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /TransformConcave.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /TransformConvex.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /TransformLinear.java, * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform /TransformSwitch.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Avail able.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Close .java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetFi lePointer.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetSi ze.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/HasNe xtChunk.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Read. java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadB yte.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadB yteArrayIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadI nt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadL ong.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadS hort.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadS tring.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadU nsignedByte.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadU nsignedInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadU nsignedShort.java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Skip. java, * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Write OutputStream.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/Tes tGetSoundbankFile.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/Tes tGetSoundbankInputStream.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/Tes tGetSoundbankInputStream2.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/Tes tGetSoundbankUrl.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delInstrument.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delInstrumentIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delInstrumentIntIntIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delInstrumentIntIntIntIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformer.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformerArray.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformerArrayIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformerArrayIntIntIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformerArrayIntIntIntIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformerIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformerIntIntIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddMo delPerformerIntIntIntIntInt.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/Clear .java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetNa me.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetPa tch.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddIns trument.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddRes ource.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/GetIns trument.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/Remove Instrument.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetDes cription.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetNam e.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVen dor.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVer sion.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Array. java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Clear. java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Get.ja va, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/NewSof tAudioBuffer.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/D ummySourceDataLine.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/G etFormat.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/G etPropertyInfo.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/O pen.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/O penStream.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllNotesOf f.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllSoundOf f.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ChannelPre ssure.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Controller .java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/LocalContr ol.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mono.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mute.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff.ja va, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff2.j ava, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOn.jav a, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Omni.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PitchBend. java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PolyPressu re.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ProgramCha nge.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ResetAllCo ntrollers.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/SoftTestUt ils.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Solo.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Int erpolate.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcess Audio.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLanczosResampler/I nterpolate.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_mix.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_mix_mono.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_mix_mono_overdrive.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_mix_overdrive.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_normal.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_normal_mono.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_overdrive.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAud io_replace_overdrive_mono.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler/In terpolate.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler2/I nterpolate.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscill ator/TestProcessControlLogic.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftPointResampler/Int erpolate.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftProvider/GetDevice .java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Close.jav a, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Acti veSense.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllN otesOff.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllS oundOff.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Chan nelPressure.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Cont roller.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Mono .java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Note Off.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Note On.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Note On_AllChannels.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Note On_Delayed.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Note On_Multiple.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Omni .java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Pitc hBend.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Poly Pressure.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Prog ramChange.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Rese tAllControllers.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/SoftTestU tils.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSincResampler/Inte rpolate.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Close. java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummyS ourceDataLine.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetAva ilableInstruments.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetCha nnels.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDef aultSoundbank.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDev iceInfo.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLat ency.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLoa dedInstruments.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMax Polyphony.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMax Receivers.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMax Transmitters.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMic rosecondPosition.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetRec eiver.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetRec eiver2.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetRec eivers.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTra nsmitter.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTra nsmitters.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetVoi ceStatus.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Implic itOpenClose.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsOpen .java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsSoun dbankSupported.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadAl lInstruments.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadIn strument.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadIn struments.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Open.j ava, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/OpenSt ream.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/RemapI nstrument.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRe nder1.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Unload AllInstruments.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Unload Instrument.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Unload Instruments.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetName.jav a, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuning.j ava, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuningIn t.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load1.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load2.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load4.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load5.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load6.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load7.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load8.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load9.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuni ng.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuni ngByteArray.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuni ngPatch.java, * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuni ngPatchByteArray.java: Removed, upstream versions are now used. * AUTHORS: Add myself. changeset 68790c7c4ff7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=68790c7c4ff7 author: Gary Benson date: Fri Apr 30 10:24:39 2010 +0100 PR icedtea/324: Cope with cases where the array's type is unknown. 2010-04-30 Gary Benson PR icedtea/324 * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::do_aload): Cope with cases where the array's type is unknown. (SharkTopLevelBlock::do_astore): Likewise. changeset 586b58d937ca in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=586b58d937ca author: Gary Benson date: Wed May 05 11:28:27 2010 +0100 PR IcedTea/481: Disable use of arbitrary deoptimisation which we can't currently support. 2010-05-05 Gary Benson PR icedtea/481 * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::improve_virtual_call): Disable an optimization that cannot currently be supported. changeset 03a30accd9b2 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=03a30accd9b2 author: Deepak Bhole date: Thu May 06 17:35:36 2010 -0400 Fix rhbz# 524387 (javax.net.ssl.SSLKeyException: RSA premaster secret error) 2010-05-06 Deepak Bhole * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (checkPermission): Allow Runtime and Security permission (for putProvider.SunJCE) if initiated for an https connection. (inTrustedCallChain): New method. Returns if given class/method is in the call chain, and everything upto there is trusted. changeset f63d6531fb12 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f63d6531fb12 author: Deepak Bhole date: Wed Jun 09 14:06:55 2010 +0100 Add imports missed in previous commit 2010-05-06 Deepak Bhole * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Add imports missed in last commit. changeset 106b3c0d72ff in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=106b3c0d72ff author: Gary Benson date: Fri May 07 12:02:50 2010 +0100 Remove a stray semicolon in JNLPSecurityManager.java. 2010-05-07 Gary Benson * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Removed a stray semicolon. changeset dce7057cefef in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dce7057cefef author: Deepak Bhole date: Fri May 07 16:41:14 2010 -0400 Set context classloader for all threads in an applet's threadgroup 2010-05-07 Deepak Bhole * netx/net/sourceforge/jnlp/Launcher.java (setContextClassLoaderForAllThreads): Change to set context CL only for given threadgroup. (launchApplication): Supply threadgroup to setContextClassLoaderForAllThreads. (createApplet): Same. changeset b645643e700f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b645643e700f author: Deepak Bhole date: Wed Jun 09 14:26:24 2010 +0100 PR IcedTea/436: Close all applet threads on exit 2010-05-07 Deepak Bhole PR icedtea/436: * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (handleMessage): Don't print stack trace on InterruptedException. (appletClose): Kill misbehaving applets that don't shut down properly. diffstat: 249 files changed, 394 insertions(+), 18440 deletions(-) AUTHORS | 1 ChangeLog | 297 ++++++++++ netx/net/sourceforge/jnlp/Launcher.java | 28 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 48 + overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/GetFormat.java | 41 - overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/ToFloatArray.java | 162 ----- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Available.java | 81 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Close.java | 72 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFormat.java | 74 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFrameLength.java | 74 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/MarkSupported.java | 74 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Read.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArray.java | 81 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArrayIntInt.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Reset.java | 87 -- overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Skip.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 52 - overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 119 ---- overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetInputStream.java | 91 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetRoot.java | 82 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Load.java | 89 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/LoadAll.java | 93 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArray.java | 84 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java | 86 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFile.java | 88 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFileLongLong.java | 88 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java | 107 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java | 104 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java | 129 ---- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java | 106 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java | 117 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java | 118 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java | 118 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java | 131 ---- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLong.java | 92 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLong.java | 92 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLongBoolean.java | 98 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Unload.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/WriteTo.java | 92 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetAttenuation.java | 97 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetChannels.java | 97 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopLength.java | 96 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopStart.java | 96 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetPitchCorrection.java | 97 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java | 94 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java | 94 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java | 94 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java | 96 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Open.java | 92 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Set8BitExtensionBuffer.java | 119 ---- overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/SetLoopType.java | 96 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestination.java | 46 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestinationModelIdentifier.java | 46 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetIdentifier.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetTransform.java | 46 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/EqualsObject.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierString.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringInt.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringString.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringStringInt.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetInstance.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetObject.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetVariable.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/GetOscillators.java | 44 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetConnectionBlocks.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetDefaultConnectionsEnabled.java | 49 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetExclusiveClass.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyFrom.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyTo.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetName.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetSelfNonExclusive.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelFrom.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelTo.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSource.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifier.java | 46 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBoolean.java | 49 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java | 51 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java | 56 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierModelTransform.java | 47 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetIdentifier.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetTransform.java | 46 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransform.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBoolean.java | 48 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java | 50 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java | 51 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetDirection.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetPolarity.java | 45 - overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetTransform.java | 74 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformAbsolute.java | 73 -- overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConcave.java | 98 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConvex.java | 98 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformLinear.java | 90 --- overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformSwitch.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Available.java | 78 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Close.java | 72 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetFilePointer.java | 78 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetSize.java | 77 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/HasNextChunk.java | 85 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Read.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByte.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByteArrayIntInt.java | 81 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadInt.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadLong.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadShort.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadString.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedByte.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedInt.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedShort.java | 79 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Skip.java | 78 -- overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/WriteOutputStream.java | 81 -- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 52 - overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 119 ---- overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrument.java | 86 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntInt.java | 91 --- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntInt.java | 97 --- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java | 97 --- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformer.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArray.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntInt.java | 89 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntInt.java | 89 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntInt.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/Clear.java | 73 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetName.java | 72 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetPatch.java | 75 -- overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddInstrument.java | 51 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddResource.java | 52 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/GetInstrument.java | 50 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/RemoveInstrument.java | 58 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetDescription.java | 47 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetName.java | 47 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVendor.java | 47 - overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVersion.java | 47 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Array.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Clear.java | 56 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Get.java | 68 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/NewSoftAudioBuffer.java | 55 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java | 232 ------- overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetFormat.java | 61 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetPropertyInfo.java | 53 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/Open.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/OpenStream.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllNotesOff.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllSoundOff.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ChannelPressure.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Controller.java | 62 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/LocalControl.java | 60 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mono.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mute.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff2.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOn.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Omni.java | 61 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PitchBend.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PolyPressure.java | 61 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ProgramChange.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ResetAllControllers.java | 132 ---- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/SoftTestUtils.java | 111 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Solo.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java | 113 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java | 99 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLanczosResampler/Interpolate.java | 113 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java | 96 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java | 84 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java | 83 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler/Interpolate.java | 113 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler2/Interpolate.java | 113 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java | 106 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftPointResampler/Interpolate.java | 113 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftProvider/GetDevice.java | 70 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Close.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ActiveSense.java | 82 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllNotesOff.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllSoundOff.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ChannelPressure.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Controller.java | 66 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Mono.java | 75 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOff.java | 65 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn.java | 65 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_AllChannels.java | 71 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Delayed.java | 67 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Multiple.java | 76 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Omni.java | 74 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PitchBend.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PolyPressure.java | 65 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ProgramChange.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ResetAllControllers.java | 136 ---- overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/SoftTestUtils.java | 111 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSincResampler/Interpolate.java | 113 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Close.java | 58 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java | 232 ------- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetAvailableInstruments.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetChannels.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDefaultSoundbank.java | 58 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDeviceInfo.java | 56 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLatency.java | 58 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLoadedInstruments.java | 65 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxPolyphony.java | 58 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxReceivers.java | 56 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxTransmitters.java | 56 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMicrosecondPosition.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver2.java | 62 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceivers.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitter.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitters.java | 58 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetVoiceStatus.java | 61 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/ImplicitOpenClose.java | 105 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsOpen.java | 59 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsSoundbankSupported.java | 95 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadAllInstruments.java | 73 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstrument.java | 73 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstruments.java | 73 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Open.java | 64 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/OpenStream.java | 58 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/RemapInstrument.java | 76 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java | 214 ------- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadAllInstruments.java | 69 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstrument.java | 75 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstruments.java | 75 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetName.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuning.java | 56 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuningInt.java | 53 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load1.java | 101 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load2.java | 71 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load4.java | 104 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load5.java | 87 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load6.java | 91 --- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load7.java | 72 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load8.java | 65 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load9.java | 69 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuning.java | 56 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningByteArray.java | 63 -- overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatch.java | 54 - overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatchByteArray.java | 65 -- plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 9 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 44 + diffs (truncated from 19958 to 500 lines): diff -r 854406ecaf7f -r b645643e700f AUTHORS --- a/AUTHORS Mon Jun 07 21:03:36 2010 +0100 +++ b/AUTHORS Wed Jun 09 14:26:24 2010 +0100 @@ -31,6 +31,7 @@ Marc Schoenefeld Marc Schoenefeld Keith Seitz Joshua Sumali +Pavel Tisnovsky Christian Thalinger Dalibor Topic Arnaud Vandyck diff -r 854406ecaf7f -r b645643e700f ChangeLog --- a/ChangeLog Mon Jun 07 21:03:36 2010 +0100 +++ b/ChangeLog Wed Jun 09 14:26:24 2010 +0100 @@ -1,3 +1,300 @@ 2010-06-07 Andrew John Hughes + + PR icedtea/436: + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (handleMessage): Don't print stack trace on InterruptedException. + (appletClose): Kill misbehaving applets that don't shut down properly. + +2010-05-07 Deepak Bhole + + * netx/net/sourceforge/jnlp/Launcher.java + (setContextClassLoaderForAllThreads): Change to set context CL only for + given threadgroup. + (launchApplication): Supply threadgroup to + setContextClassLoaderForAllThreads. + (createApplet): Same. + +2010-05-07 Gary Benson + + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + Removed a stray semicolon. + +2010-05-06 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + Add imports missed in last commit. + +2010-05-06 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (checkPermission): Allow Runtime and Security permission (for + putProvider.SunJCE) if initiated for an https connection. + (inTrustedCallChain): New method. Returns if given class/method is + in the call chain, and everything upto there is trusted. + +2010-05-05 Gary Benson + + PR icedtea/481 + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::improve_virtual_call): Disable an + optimization that cannot currently be supported. + +2010-04-30 Gary Benson + + PR icedtea/324 + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::do_aload): Cope with cases where + the array's type is unknown. + (SharkTopLevelBlock::do_astore): Likewise. + +2010-04-29 Pavel Tisnovsky + + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/GetFormat.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/ToFloatArray.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Available.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Close.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFormat.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFrameLength.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/MarkSupported.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Read.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArray.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArrayIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Reset.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Skip.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetInputStream.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetRoot.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Load.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/LoadAll.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArray.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFile.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFileLongLong.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLong.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLong.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLongBoolean.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Unload.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/WriteTo.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetAttenuation.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetChannels.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopLength.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopStart.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetPitchCorrection.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Open.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Set8BitExtensionBuffer.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/SetLoopType.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestination.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestinationModelIdentifier.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetIdentifier.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetTransform.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/EqualsObject.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierString.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringString.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringStringInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetInstance.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetObject.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetVariable.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/GetOscillators.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetConnectionBlocks.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetDefaultConnectionsEnabled.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetExclusiveClass.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyFrom.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyTo.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetName.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetSelfNonExclusive.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelFrom.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelTo.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSource.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifier.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBoolean.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierModelTransform.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetIdentifier.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetTransform.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransform.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBoolean.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetDirection.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetPolarity.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetTransform.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformAbsolute.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConcave.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConvex.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformLinear.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformSwitch.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Available.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Close.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetFilePointer.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetSize.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/HasNextChunk.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Read.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByte.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByteArrayIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadLong.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadShort.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadString.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedByte.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedShort.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Skip.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/WriteOutputStream.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrument.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformer.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArray.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/Clear.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetName.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetPatch.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddInstrument.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddResource.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/GetInstrument.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/RemoveInstrument.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetDescription.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetName.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVendor.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVersion.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Array.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Clear.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Get.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/NewSoftAudioBuffer.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetFormat.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetPropertyInfo.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/Open.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/OpenStream.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllNotesOff.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllSoundOff.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ChannelPressure.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Controller.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/LocalControl.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mono.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mute.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff2.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOn.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Omni.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PitchBend.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PolyPressure.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ProgramChange.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ResetAllControllers.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/SoftTestUtils.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Solo.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLanczosResampler/Interpolate.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler/Interpolate.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler2/Interpolate.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftPointResampler/Interpolate.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftProvider/GetDevice.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Close.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ActiveSense.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllNotesOff.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllSoundOff.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ChannelPressure.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Controller.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Mono.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOff.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_AllChannels.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Delayed.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Multiple.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Omni.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PitchBend.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PolyPressure.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ProgramChange.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ResetAllControllers.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/SoftTestUtils.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSincResampler/Interpolate.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Close.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetAvailableInstruments.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetChannels.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDefaultSoundbank.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDeviceInfo.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLatency.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLoadedInstruments.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxPolyphony.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxReceivers.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxTransmitters.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMicrosecondPosition.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver2.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceivers.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitter.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitters.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetVoiceStatus.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/ImplicitOpenClose.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsOpen.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsSoundbankSupported.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadAllInstruments.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstrument.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstruments.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Open.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/OpenStream.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/RemapInstrument.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadAllInstruments.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstrument.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstruments.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetName.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuning.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuningInt.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load1.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load2.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load4.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load5.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load6.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load7.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load8.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load9.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuning.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningByteArray.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatch.java, + * overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatchByteArray.java: + Removed, upstream versions are now used. + * AUTHORS: Add myself. + 2010-06-07 Andrew John Hughes * patches/icedtea-systemtap.patch: diff -r 854406ecaf7f -r b645643e700f netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Mon Jun 07 21:03:36 2010 +0100 +++ b/netx/net/sourceforge/jnlp/Launcher.java Wed Jun 09 14:26:24 2010 +0100 @@ -440,7 +440,7 @@ public class Launcher { Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); String args[] = file.getApplication().getArguments(); - setContextClassLoaderForAllThreads(app.getClassLoader()); + setContextClassLoaderForAllThreads(app.getThreadGroup(), app.getClassLoader()); if (splashScreen != null) { if (splashScreen.isSplashScreenValid()) { @@ -462,30 +462,24 @@ public class Launcher { } /** - * Set the classloader as the context classloader for all threads. This is - * required to make some applications work. For example, an application that - * provides a custom Swing LnF may ask the swing thread to load resources - * from their JNLP, which would only work if the Swing thread knows about - * the JNLPClassLoader. + * Set the classloader as the context classloader for all threads in + * the given threadgroup. This is required to make some applications + * work. For example, an application that provides a custom Swing LnF + * may ask the swing thread to load resources from their JNLP, which + * would only work if the Swing thread knows about the JNLPClassLoader. * + * @param tg The threadgroup for which the context classloader should be set * @param classLoader the classloader to set as the context classloader */ - private void setContextClassLoaderForAllThreads(ClassLoader classLoader) { - ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); - ThreadGroup root; - - root = Thread.currentThread().getThreadGroup(); - while (root.getParent() != null) { - root = root.getParent(); - } + private void setContextClassLoaderForAllThreads(ThreadGroup tg, ClassLoader classLoader) { /* be prepared for change in thread size */ - int threadCountGuess = threadBean.getThreadCount(); + int threadCountGuess = tg.activeCount(); Thread[] threads; do { threadCountGuess = threadCountGuess * 2; threads = new Thread[threadCountGuess]; - root.enumerate(threads, true); + tg.enumerate(threads, true); } while (threads[threadCountGuess-1] != null); @@ -593,7 +587,7 @@ public class Launcher { group.setApplication(appletInstance); loader.setApplication(appletInstance); - setContextClassLoaderForAllThreads(appletInstance.getClassLoader()); + setContextClassLoaderForAllThreads(appletInstance.getThreadGroup(), appletInstance.getClassLoader()); return appletInstance; } diff -r 854406ecaf7f -r b645643e700f netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Mon Jun 07 21:03:36 2010 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed Jun 09 14:26:24 2010 +0100 @@ -23,10 +23,12 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowEvent; import java.lang.ref.WeakReference; import java.net.SocketPermission; +import java.security.AllPermission; import java.security.AccessControlException; import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; +import java.security.SecurityPermission; import java.util.PropertyPermission; import javax.swing.JWindow; @@ -395,6 +397,24 @@ class JNLPSecurityManager extends Securi // Everything else is denied throw se; + } else if (perm instanceof SecurityPermission) { + + // JCE's initialization requires putProviderProperty permission + if (perm.equals(new SecurityPermission("putProviderProperty.SunJCE"))) { + if (inTrustedCallChain("com.sun.crypto.provider.SunJCE", "run")) { + return; + } + } + + } else if (perm instanceof RuntimePermission) { + + // KeyGenerator's init method requires internal spec access + if (perm.equals(new SecurityPermission("accessClassInPackage.sun.security.internal.spec"))) { + if (inTrustedCallChain("javax.crypto.KeyGenerator", "init")) { + return; + } + } + } else { tmpPerm = perm; } @@ -419,6 +439,34 @@ class JNLPSecurityManager extends Securi } } + /** + * Returns weather the given class and method are in the current stack, + * and whether or not everything upto then is trusted + * + * @param className The name of the class to look for in the stack + * @param methodName The name of the method for the given class to look for in the stack + * @return Weather or not class::method() are in the chain, and everything upto there is trusted + */ + private boolean inTrustedCallChain(String className, String methodName) { + + StackTraceElement[] stack = Thread.currentThread().getStackTrace(); + + for (int i=0; i < stack.length; i++) { + + // Everything up to the desired class/method must be trusted + if (!stack[i].getClass().getProtectionDomain().implies(new AllPermission())) { + return false; + } + + if (stack[i].getClassName().equals(className) && + stack[i].getMethodName().equals(methodName)) { + return true; + } + } + + return false; + } + /** * Asks the user whether or not to grant permission. * @param perm the permission to be granted diff -r 854406ecaf7f -r b645643e700f overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/GetFormat.java --- a/overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/GetFormat.java Mon Jun 07 21:03:36 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* - * 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. - */ - -/* @test - @summary Test AudioFloatConverter getFormat method */ - -import javax.sound.sampled.*; -import com.sun.media.sound.*; - -public class GetFormat { - - public static void main(String[] args) throws Exception { - AudioFormat frm = new AudioFormat(8000, 16, 1, true, false); - AudioFloatConverter conv = AudioFloatConverter.getConverter(frm); - if(!conv.getFormat().matches(frm)) - throw new RuntimeException("Incorrect audio format returned."); - } - -} diff -r 854406ecaf7f -r b645643e700f overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/ToFloatArray.java --- a/overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/ToFloatArray.java Mon Jun 07 21:03:36 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 From andrew at icedtea.classpath.org Wed Jun 9 06:38:38 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 09 Jun 2010 13:38:38 +0000 Subject: /hg/release/icedtea6-1.8: 5 new changesets Message-ID: changeset 8598039e2a62 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=8598039e2a62 author: Deepak Bhole date: Thu May 06 17:35:36 2010 -0400 Fix rhbz# 524387 (javax.net.ssl.SSLKeyException: RSA premaster secret error) 2010-05-06 Deepak Bhole * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (checkPermission): Allow Runtime and Security permission (for putProvider.SunJCE) if initiated for an https connection. (inTrustedCallChain): New method. Returns if given class/method is in the call chain, and everything upto there is trusted. changeset c73b1bd761e0 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=c73b1bd761e0 author: Deepak Bhole date: Wed Jun 09 14:06:55 2010 +0100 Add imports missed in previous commit 2010-05-06 Deepak Bhole * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Add imports missed in last commit. changeset 00a1c76d0040 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=00a1c76d0040 author: Gary Benson date: Fri May 07 12:02:50 2010 +0100 Remove a stray semicolon in JNLPSecurityManager.java. 2010-05-07 Gary Benson * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Removed a stray semicolon. changeset f5dc22b0171b in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=f5dc22b0171b author: Deepak Bhole date: Fri May 07 16:41:14 2010 -0400 Set context classloader for all threads in an applet's threadgroup 2010-05-07 Deepak Bhole * netx/net/sourceforge/jnlp/Launcher.java (setContextClassLoaderForAllThreads): Change to set context CL only for given threadgroup. (launchApplication): Supply threadgroup to setContextClassLoaderForAllThreads. (createApplet): Same. changeset a59c9d0cda71 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=a59c9d0cda71 author: Deepak Bhole date: Fri May 07 16:57:27 2010 -0400 PR IcedTea/436: Close all applet threads on exit 2010-05-07 Deepak Bhole PR icedtea/436: * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (handleMessage): Don't print stack trace on InterruptedException. (appletClose): Kill misbehaving applets that don't shut down properly. diffstat: 4 files changed, 100 insertions(+), 19 deletions(-) ChangeLog | 34 ++++++++ netx/net/sourceforge/jnlp/Launcher.java | 28 ++----- netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 48 ++++++++++++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 9 +- diffs (211 lines): diff -r ecef93c7fbb6 -r a59c9d0cda71 ChangeLog --- a/ChangeLog Wed May 05 11:28:27 2010 +0100 +++ b/ChangeLog Fri May 07 16:57:27 2010 -0400 @@ -1,3 +1,37 @@ 2010-05-05 Gary Benson + + PR icedtea/436: + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (handleMessage): Don't print stack trace on InterruptedException. + (appletClose): Kill misbehaving applets that don't shut down properly. + +2010-05-07 Deepak Bhole + + * netx/net/sourceforge/jnlp/Launcher.java + (setContextClassLoaderForAllThreads): Change to set context CL only for + given threadgroup. + (launchApplication): Supply threadgroup to + setContextClassLoaderForAllThreads. + (createApplet): Same. + +2010-05-07 Gary Benson + + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + Removed a stray semicolon. + +2010-05-06 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + Add imports missed in last commit. + +2010-05-06 Deepak Bhole + + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (checkPermission): Allow Runtime and Security permission (for + putProvider.SunJCE) if initiated for an https connection. + (inTrustedCallChain): New method. Returns if given class/method is + in the call chain, and everything upto there is trusted. + 2010-05-05 Gary Benson PR icedtea/481 diff -r ecef93c7fbb6 -r a59c9d0cda71 netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Wed May 05 11:28:27 2010 +0100 +++ b/netx/net/sourceforge/jnlp/Launcher.java Fri May 07 16:57:27 2010 -0400 @@ -442,7 +442,7 @@ public class Launcher { Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); String args[] = file.getApplication().getArguments(); - setContextClassLoaderForAllThreads(app.getClassLoader()); + setContextClassLoaderForAllThreads(app.getThreadGroup(), app.getClassLoader()); if (splashScreen != null) { if (splashScreen.isSplashScreenValid()) { @@ -464,30 +464,24 @@ public class Launcher { } /** - * Set the classloader as the context classloader for all threads. This is - * required to make some applications work. For example, an application that - * provides a custom Swing LnF may ask the swing thread to load resources - * from their JNLP, which would only work if the Swing thread knows about - * the JNLPClassLoader. + * Set the classloader as the context classloader for all threads in + * the given threadgroup. This is required to make some applications + * work. For example, an application that provides a custom Swing LnF + * may ask the swing thread to load resources from their JNLP, which + * would only work if the Swing thread knows about the JNLPClassLoader. * + * @param tg The threadgroup for which the context classloader should be set * @param classLoader the classloader to set as the context classloader */ - private void setContextClassLoaderForAllThreads(ClassLoader classLoader) { - ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); - ThreadGroup root; - - root = Thread.currentThread().getThreadGroup(); - while (root.getParent() != null) { - root = root.getParent(); - } + private void setContextClassLoaderForAllThreads(ThreadGroup tg, ClassLoader classLoader) { /* be prepared for change in thread size */ - int threadCountGuess = threadBean.getThreadCount(); + int threadCountGuess = tg.activeCount(); Thread[] threads; do { threadCountGuess = threadCountGuess * 2; threads = new Thread[threadCountGuess]; - root.enumerate(threads, true); + tg.enumerate(threads, true); } while (threads[threadCountGuess-1] != null); @@ -595,7 +589,7 @@ public class Launcher { group.setApplication(appletInstance); loader.setApplication(appletInstance); - setContextClassLoaderForAllThreads(appletInstance.getClassLoader()); + setContextClassLoaderForAllThreads(appletInstance.getThreadGroup(), appletInstance.getClassLoader()); return appletInstance; } diff -r ecef93c7fbb6 -r a59c9d0cda71 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed May 05 11:28:27 2010 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Fri May 07 16:57:27 2010 -0400 @@ -23,10 +23,12 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowEvent; import java.lang.ref.WeakReference; import java.net.SocketPermission; +import java.security.AllPermission; import java.security.AccessControlException; import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; +import java.security.SecurityPermission; import java.util.PropertyPermission; import javax.swing.JWindow; @@ -395,6 +397,24 @@ class JNLPSecurityManager extends Securi // Everything else is denied throw se; + } else if (perm instanceof SecurityPermission) { + + // JCE's initialization requires putProviderProperty permission + if (perm.equals(new SecurityPermission("putProviderProperty.SunJCE"))) { + if (inTrustedCallChain("com.sun.crypto.provider.SunJCE", "run")) { + return; + } + } + + } else if (perm instanceof RuntimePermission) { + + // KeyGenerator's init method requires internal spec access + if (perm.equals(new SecurityPermission("accessClassInPackage.sun.security.internal.spec"))) { + if (inTrustedCallChain("javax.crypto.KeyGenerator", "init")) { + return; + } + } + } else { tmpPerm = perm; } @@ -419,6 +439,34 @@ class JNLPSecurityManager extends Securi } } + /** + * Returns weather the given class and method are in the current stack, + * and whether or not everything upto then is trusted + * + * @param className The name of the class to look for in the stack + * @param methodName The name of the method for the given class to look for in the stack + * @return Weather or not class::method() are in the chain, and everything upto there is trusted + */ + private boolean inTrustedCallChain(String className, String methodName) { + + StackTraceElement[] stack = Thread.currentThread().getStackTrace(); + + for (int i=0; i < stack.length; i++) { + + // Everything up to the desired class/method must be trusted + if (!stack[i].getClass().getProtectionDomain().implies(new AllPermission())) { + return false; + } + + if (stack[i].getClassName().equals(className) && + stack[i].getMethodName().equals(methodName)) { + return true; + } + } + + return false; + } + /** * Asks the user whether or not to grant permission. * @param perm the permission to be granted diff -r ecef93c7fbb6 -r a59c9d0cda71 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed May 05 11:28:27 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 07 16:57:27 2010 -0400 @@ -1,4 +1,4 @@ -/* VoidPluginCallRequest -- represent Java-to-JavaScript requests +/* PluginAppletViewer -- Handles embedding of the applet panel Copyright (C) 2008 Red Hat This file is part of IcedTea. @@ -735,7 +735,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; Thread.sleep(50); wait += 50; } catch (InterruptedException ie) { - ie.printStackTrace(); + // just wait } } @@ -1605,9 +1605,14 @@ import com.sun.jndi.toolkit.url.UrlUtil; { public void run() { + ThreadGroup tg = ((JNLPClassLoader) p.applet.getClass().getClassLoader()).getApplication().getThreadGroup(); + appletShutdown(p); appletPanels.removeElement(p); dispose(); + + if (tg.activeCount() > 0) + tg.stop(); if (countApplets() == 0) { appletSystemExit(); From andrew at icedtea.classpath.org Wed Jun 9 06:38:43 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 09 Jun 2010 13:38:43 +0000 Subject: /hg/release/icedtea6-1.7: 6 new changesets Message-ID: changeset 812896ea3e87 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=812896ea3e87 author: Deepak Bhole date: Thu May 06 17:35:36 2010 -0400 Fix rhbz# 524387 (javax.net.ssl.SSLKeyException: RSA premaster secret error) 2010-05-06 Deepak Bhole * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (checkPermission): Allow Runtime and Security permission (for putProvider.SunJCE) if initiated for an https connection. (inTrustedCallChain): New method. Returns if given class/method is in the call chain, and everything upto there is trusted. changeset 4789ea2af9b8 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=4789ea2af9b8 author: Deepak Bhole date: Wed Jun 09 14:06:55 2010 +0100 Add imports missed in previous commit 2010-05-06 Deepak Bhole * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Add imports missed in last commit. changeset eb89812dff3e in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=eb89812dff3e author: Andrew John Hughes date: Wed Jun 09 14:09:37 2010 +0100 Fix path to JNLPSecurityManager in ChangeLog entry. 2010-06-09 Andrew John Hughes * ChangeLog: Fix path of JNLPSecurityManager in last-but-one entry. changeset 24d8829cb8bc in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=24d8829cb8bc author: Gary Benson date: Fri May 07 12:02:50 2010 +0100 Remove a stray semicolon in JNLPSecurityManager.java. 2010-05-07 Gary Benson * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Removed a stray semicolon. changeset f407c48f5947 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f407c48f5947 author: Deepak Bhole date: Fri May 07 16:41:14 2010 -0400 Set context classloader for all threads in an applet's threadgroup 2010-05-07 Deepak Bhole * rt/net/sourceforge/jnlp/Launcher.java (setContextClassLoaderForAllThreads): Change to set context CL only for given threadgroup. (launchApplication): Supply threadgroup to setContextClassLoaderForAllThreads. (createApplet): Same. changeset 848713f58719 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=848713f58719 author: Deepak Bhole date: Fri May 07 16:57:27 2010 -0400 PR IcedTea/436: Close all applet threads on exit 2010-05-07 Deepak Bhole PR icedtea/436: * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (handleMessage): Don't print stack trace on InterruptedException. (appletClose): Kill misbehaving applets that don't shut down properly. diffstat: 4 files changed, 105 insertions(+), 19 deletions(-) ChangeLog | 39 +++++++++++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 9 ++ rt/net/sourceforge/jnlp/Launcher.java | 28 +++----- rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 48 ++++++++++++++ diffs (216 lines): diff -r f779c58329e1 -r 848713f58719 ChangeLog --- a/ChangeLog Wed Apr 21 11:30:49 2010 -0400 +++ b/ChangeLog Fri May 07 16:57:27 2010 -0400 @@ -1,3 +1,42 @@ 2010-04-21 Deepak Bhole + + PR icedtea/436: + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (handleMessage): Don't print stack trace on InterruptedException. + (appletClose): Kill misbehaving applets that don't shut down properly. + +2010-05-07 Deepak Bhole + + * rt/net/sourceforge/jnlp/Launcher.java + (setContextClassLoaderForAllThreads): Change to set context CL only for + given threadgroup. + (launchApplication): Supply threadgroup to + setContextClassLoaderForAllThreads. + (createApplet): Same. + +2010-05-07 Gary Benson + + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + Removed a stray semicolon. + +2010-06-09 Andrew John Hughes + + * ChangeLog: + Fix path of JNLPSecurityManager in last-but-one entry. + +2010-05-06 Deepak Bhole + + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: + Add imports missed in last commit. + +2010-05-06 Deepak Bhole + + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (checkPermission): Allow Runtime and Security permission (for + putProvider.SunJCE) if initiated for an https connection. + (inTrustedCallChain): New method. Returns if given class/method is + in the call chain, and everything upto there is trusted. + 2010-04-21 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc diff -r f779c58329e1 -r 848713f58719 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Apr 21 11:30:49 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 07 16:57:27 2010 -0400 @@ -1,4 +1,4 @@ -/* VoidPluginCallRequest -- represent Java-to-JavaScript requests +/* PluginAppletViewer -- Handles embedding of the applet panel Copyright (C) 2008 Red Hat This file is part of IcedTea. @@ -735,7 +735,7 @@ import com.sun.jndi.toolkit.url.UrlUtil; Thread.sleep(50); wait += 50; } catch (InterruptedException ie) { - ie.printStackTrace(); + // just wait } } @@ -1605,9 +1605,14 @@ import com.sun.jndi.toolkit.url.UrlUtil; { public void run() { + ThreadGroup tg = ((JNLPClassLoader) p.applet.getClass().getClassLoader()).getApplication().getThreadGroup(); + appletShutdown(p); appletPanels.removeElement(p); dispose(); + + if (tg.activeCount() > 0) + tg.stop(); if (countApplets() == 0) { appletSystemExit(); diff -r f779c58329e1 -r 848713f58719 rt/net/sourceforge/jnlp/Launcher.java --- a/rt/net/sourceforge/jnlp/Launcher.java Wed Apr 21 11:30:49 2010 -0400 +++ b/rt/net/sourceforge/jnlp/Launcher.java Fri May 07 16:57:27 2010 -0400 @@ -442,7 +442,7 @@ public class Launcher { Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); String args[] = file.getApplication().getArguments(); - setContextClassLoaderForAllThreads(app.getClassLoader()); + setContextClassLoaderForAllThreads(app.getThreadGroup(), app.getClassLoader()); if (splashScreen != null) { if (splashScreen.isSplashScreenValid()) { @@ -464,30 +464,24 @@ public class Launcher { } /** - * Set the classloader as the context classloader for all threads. This is - * required to make some applications work. For example, an application that - * provides a custom Swing LnF may ask the swing thread to load resources - * from their JNLP, which would only work if the Swing thread knows about - * the JNLPClassLoader. + * Set the classloader as the context classloader for all threads in + * the given threadgroup. This is required to make some applications + * work. For example, an application that provides a custom Swing LnF + * may ask the swing thread to load resources from their JNLP, which + * would only work if the Swing thread knows about the JNLPClassLoader. * + * @param tg The threadgroup for which the context classloader should be set * @param classLoader the classloader to set as the context classloader */ - private void setContextClassLoaderForAllThreads(ClassLoader classLoader) { - ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); - ThreadGroup root; - - root = Thread.currentThread().getThreadGroup(); - while (root.getParent() != null) { - root = root.getParent(); - } + private void setContextClassLoaderForAllThreads(ThreadGroup tg, ClassLoader classLoader) { /* be prepared for change in thread size */ - int threadCountGuess = threadBean.getThreadCount(); + int threadCountGuess = tg.activeCount(); Thread[] threads; do { threadCountGuess = threadCountGuess * 2; threads = new Thread[threadCountGuess]; - root.enumerate(threads, true); + tg.enumerate(threads, true); } while (threads[threadCountGuess-1] != null); @@ -595,7 +589,7 @@ public class Launcher { group.setApplication(appletInstance); loader.setApplication(appletInstance); - setContextClassLoaderForAllThreads(appletInstance.getClassLoader()); + setContextClassLoaderForAllThreads(appletInstance.getThreadGroup(), appletInstance.getClassLoader()); return appletInstance; } diff -r f779c58329e1 -r 848713f58719 rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Wed Apr 21 11:30:49 2010 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Fri May 07 16:57:27 2010 -0400 @@ -23,10 +23,12 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowEvent; import java.lang.ref.WeakReference; import java.net.SocketPermission; +import java.security.AllPermission; import java.security.AccessControlException; import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; +import java.security.SecurityPermission; import java.util.PropertyPermission; import javax.swing.JWindow; @@ -395,6 +397,24 @@ class JNLPSecurityManager extends Securi // Everything else is denied throw se; + } else if (perm instanceof SecurityPermission) { + + // JCE's initialization requires putProviderProperty permission + if (perm.equals(new SecurityPermission("putProviderProperty.SunJCE"))) { + if (inTrustedCallChain("com.sun.crypto.provider.SunJCE", "run")) { + return; + } + } + + } else if (perm instanceof RuntimePermission) { + + // KeyGenerator's init method requires internal spec access + if (perm.equals(new SecurityPermission("accessClassInPackage.sun.security.internal.spec"))) { + if (inTrustedCallChain("javax.crypto.KeyGenerator", "init")) { + return; + } + } + } else { tmpPerm = perm; } @@ -419,6 +439,34 @@ class JNLPSecurityManager extends Securi } } + /** + * Returns weather the given class and method are in the current stack, + * and whether or not everything upto then is trusted + * + * @param className The name of the class to look for in the stack + * @param methodName The name of the method for the given class to look for in the stack + * @return Weather or not class::method() are in the chain, and everything upto there is trusted + */ + private boolean inTrustedCallChain(String className, String methodName) { + + StackTraceElement[] stack = Thread.currentThread().getStackTrace(); + + for (int i=0; i < stack.length; i++) { + + // Everything up to the desired class/method must be trusted + if (!stack[i].getClass().getProtectionDomain().implies(new AllPermission())) { + return false; + } + + if (stack[i].getClassName().equals(className) && + stack[i].getMethodName().equals(methodName)) { + return true; + } + } + + return false; + } + /** * Asks the user whether or not to grant permission. * @param perm the permission to be granted From bugzilla-daemon at icedtea.classpath.org Wed Jun 9 07:29:17 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 09 Jun 2010 14:29:17 +0000 Subject: [Bug 488] Question mark changing into underscore in URLs directed from an applet. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=488 omajid at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|omajid at redhat.com |.org | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 9 13:03:39 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 09 Jun 2010 20:03:39 +0000 Subject: [Bug 376] Cannot create GC thread. Out of system resources. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=376 ------- Comment #2 from asu at redhat.com 2010-06-09 20:03 ------- Hello, I am unable to reproduce this error. Is this site still causing issues for you? java version "1.6.0_17" OpenJDK Runtime Environment (IcedTea6 1.7.1) (fedora-37.b17.fc13-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) -Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 05:06:58 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 12:06:58 +0000 Subject: [Bug 359] Firefox crashed on Bandwidth Speed Test plugin Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=359 ------- Comment #6 from ptisnovs at redhat.com 2010-06-10 12:06 ------- I have successfully ran this applet on these configurations: Fedora11 i386 Firefox 3.5.9 OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-35.b18.fc11-i386) Fedora11 x86_64 Firefox 3.5.9 OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-35.b18.fc11-x86_64) Fedora12 i386 Firefox 3.5.9 OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-38.b18.fc12-i386) Fedora12 x86_64 Firefox 3.5.9 OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-38.b18.fc12-x86_64) Fedora13 i386 Firefox 3.6.3 OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-38.b18.fc13-i386) Fedora13 x86_64 Firefox 3.6.3 OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-38.b18.fc13-x86_64) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 07:36:23 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 14:36:23 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #5 from asu at redhat.com 2010-06-10 14:36 ------- Created an attachment (id=363) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=363&action=view) jvm output This is done on F13-32bit. Using icedtea6. I will provide the result from icedtea7 in a bit. java version "1.6.0_19" OpenJDK Runtime Environment (IcedTea6 1.9pre+rfa0ad887008c) (linux-gnu build 1.6.0_19-b19) OpenJDK Server VM (build 16.0-b13, mixed mode) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 07:39:14 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 14:39:14 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #6 from asu at redhat.com 2010-06-10 14:39 ------- well, scratch that idea about testing with icedtea7, nullpointer exception in main.. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gbenson at redhat.com Thu Jun 10 08:03:25 2010 From: gbenson at redhat.com (Gary Benson) Date: Thu, 10 Jun 2010 16:03:25 +0100 Subject: Shark build passes TCK Message-ID: <20100610150324.GE3279@redhat.com> For the past few months the OpenJDK team at Red Hat has been working to stabilize the Shark JIT compiler for HotSpot to the point where IcedTea builds of OpenJDK using Shark are capable of passing the Java SE 6 TCK. As a result of this work I am pleased to announce that an IcedTea build of OpenJDK using Shark has passed the Java SE 6 TCK and is compatible with the Java SE 6 platform. The test system was as follows: Operating system: Fedora 12, x86_64 LLVM: http://llvm.org/releases/2.6/llvm-2.6.tar.gz, configured with: --with-pic --enable-pic IcedTea: http://icedtea.classpath.org/hg/icedtea6 revision: 7674917fa451 configured with: --enable-shark This work was funded by Red Hat. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 09:03:22 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 16:03:22 +0000 Subject: [Bug 359] Firefox crashed on Bandwidth Speed Test plugin Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=359 ------- Comment #7 from gnu_andrew at member.fsf.org 2010-06-10 16:03 ------- I believe this bug is against the old plugin which has now been removed as of 1.8 and on. If it can not be reproduced with the new plugin, please close. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 09:19:33 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 16:19:33 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #7 from gnu_andrew at member.fsf.org 2010-06-10 16:19 ------- Xerxes, by 32-bit do you mean just x86 or does it also fail on e.g. arm & ppc32? Andrew, there are some freetype fixes I just backported for OpenJDK6 b20. So it may be worth trying to build icedtea6-hg: http://icedtea.classpath.org/people/andrew/icedtea6-hg -- but I need to check it builds first... -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 09:26:37 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 16:26:37 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #8 from asu at redhat.com 2010-06-10 16:26 ------- I meant x86, I'll run a build of icedtea6-hg get back to you when it finishes -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 10:38:31 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 17:38:31 +0000 Subject: [Bug 359] Firefox crashed on Bandwidth Speed Test plugin Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=359 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME ------- Comment #8 from asu at redhat.com 2010-06-10 17:38 ------- Closing as it is no longer supported and works with new plugin -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 10:38:57 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 17:38:57 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #9 from xerxes at zafena.se 2010-06-10 17:38 ------- Created an attachment (id=364) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=364&action=view) jvm output ARM (In reply to comment #7) > Xerxes, by 32-bit do you mean just x86 or does it also fail on e.g. arm & > ppc32? I can confirm that this bug still crashes on ARM. java version "1.6.0_19" OpenJDK Runtime Environment (IcedTea6 1.9pre+r58764093660f) (Ubuntu build 1.6.0_19-b19) OpenJDK Shark VM (build 16.0-b13, mixed mode) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 10:47:53 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 17:47:53 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #10 from asu at redhat.com 2010-06-10 17:47 ------- (In reply to comment #7) > it may be worth trying to build icedtea6-hg: > http://icedtea.classpath.org/people/andrew/icedtea6-hg -- but I need to check > it builds first... nope cannot build it error with a patch --snip-- Checking patches/icedtea-jdk-use-ssize_t.patch Applying patches/icedtea-jdk-use-ssize_t.patch Checking patches/icedtea-use-idx_t.patch Applying patches/icedtea-use-idx_t.patch Checking patches/params-cast-size_t.patch Applying patches/params-cast-size_t.patch Checking patches/icedtea-clean-crypto.patch 1 out of 1 hunk FAILED -- saving rejects to file openjdk/jdk/src/share/classes/javax/crypto/JarVerifier.java.rej 1 out of 1 hunk FAILED -- saving rejects to file openjdk/jdk/src/share/classes/javax/crypto/JceSecurityManager.java.rej ERROR patch patches/icedtea-clean-crypto.patch FAILED! WARNING make clean-patch before retrying a fix make: *** [stamps/patch.stamp] Error 2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 13:08:14 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 20:08:14 +0000 Subject: [Bug 503] Dashed lines with with certain kinds of scaling aren't drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=503 dlila at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|dlila at redhat.com |unassigned at icedtea.classpath | |.org ------- Comment #4 from dlila at redhat.com 2010-06-10 20:08 ------- Apparently this bug is a duplicate of an upstream bug. It was fixed in jdk7 and backported this morning. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 13:08:36 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 20:08:36 +0000 Subject: [Bug 503] Dashed lines with with certain kinds of scaling aren't drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=503 dlila at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #5 from dlila at redhat.com 2010-06-10 20:08 ------- See previous comment. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 14:11:00 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 21:11:00 +0000 Subject: [Bug 477] NullPointerEx in swing class CompoundBorder method getBorderInsets Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=477 jon.vanalten at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|jon.vanalten at redhat.com |.org | Status|NEW |ASSIGNED ------- Comment #2 from jon.vanalten at redhat.com 2010-06-10 21:10 ------- Created an attachment (id=365) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=365&action=view) Fixes NPE This patch prevents NPE by checking for null Insets objects when computing its own insets. I've also posted this for discussion upstream. http://mail.openjdk.java.net/pipermail/swing-dev/2010-June/001073.html -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 15:20:26 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 22:20:26 +0000 Subject: [Bug 503] Dashed lines with with certain kinds of scaling aren't drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=503 ------- Comment #6 from gnu_andrew at member.fsf.org 2010-06-10 22:20 ------- $ hg log -k 6829678 changeset: 366:22532d2b3378 user: jgodinez date: Tue Apr 21 09:43:49 2009 -0700 summary: 6829678: StrokeShapeTest: createStrokedShape() behaves differently Will appear in OpenJDK6 b20. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 10 15:23:25 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Jun 2010 22:23:25 +0000 Subject: [Bug 503] Dashed lines with with certain kinds of scaling aren't drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=503 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |6-1.9 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Thu Jun 10 17:47:47 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 11 Jun 2010 00:47:47 +0000 Subject: /hg/icedtea6-hg: Drop upstreamed patches and update to new drop ... Message-ID: changeset c8a3736ab6de in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c8a3736ab6de author: Andrew John Hughes date: Fri Jun 11 01:47:22 2010 +0100 Drop upstreamed patches and update to new drop tarballs. 2010-06-10 Andrew John Hughes * patches/icedtea-doc-headers.patch: Dropped, upstream file has completely changed. May need to be recreated, may not. * patches/icedtea-java2d-dasher.patch: Upstreamed by Omair as 6793344. Now in OpenJDK6. * Makefile.am: Remove above patches. (JAXWS_DROP_URL): Updated. (JAXWS_DROP_ZIP): Likewise. (JAXWS_DROP_SHA256SUM): Likewise. (JAF_DROP_URL): Added. (JAF_DROP_ZIP): Updated. (JAF_DROP_SHA256SUM): Likewise. (JAXP_DROP_URL): Updated. (JAXP_DROP_ZIP): Likewise. (JAXP_DROP_SHA256SUM): Likewise. (download-jaf-drop): Use specific JAF_DROP_URL, not JAXWS_DROP_URL. * patches/icedtea-nio2.patch: Converted to use new doc generation makefile. diffstat: 5 files changed, 126 insertions(+), 281 deletions(-) ChangeLog | 23 ++++ Makefile.am | 21 +--- patches/icedtea-doc-headers.patch | 181 ----------------------------------- patches/icedtea-java2d-dasher.patch | 11 -- patches/icedtea-nio2.patch | 171 +++++++++++++++++---------------- diffs (truncated from 638 to 500 lines): diff -r f93e99e857af -r c8a3736ab6de ChangeLog --- a/ChangeLog Tue Jun 08 23:57:58 2010 +0100 +++ b/ChangeLog Fri Jun 11 01:47:22 2010 +0100 @@ -1,3 +1,26 @@ 2010-06-08 Andrew John Hughes + + * patches/icedtea-doc-headers.patch: + Dropped, upstream file has completely changed. + May need to be recreated, may not. + * patches/icedtea-java2d-dasher.patch: + Upstreamed by Omair as 6793344. Now in OpenJDK6. + * Makefile.am: + Remove above patches. + (JAXWS_DROP_URL): Updated. + (JAXWS_DROP_ZIP): Likewise. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAF_DROP_URL): Added. + (JAF_DROP_ZIP): Updated. + (JAF_DROP_SHA256SUM): Likewise. + (JAXP_DROP_URL): Updated. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (download-jaf-drop): Use specific JAF_DROP_URL, + not JAXWS_DROP_URL. + * patches/icedtea-nio2.patch: Converted to use + new doc generation makefile. + 2010-06-08 Andrew John Hughes Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ diff -r f93e99e857af -r c8a3736ab6de Makefile.am --- a/Makefile.am Tue Jun 08 23:57:58 2010 +0100 +++ b/Makefile.am Fri Jun 11 01:47:22 2010 +0100 @@ -18,14 +18,15 @@ VISUALVM_URL = https://visualvm.dev.java VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/ VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz -JAXWS_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download -JAXWS_DROP_ZIP = jdk6-jaxws-2009_10_27.zip -JAXWS_DROP_SHA256SUM = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2 -JAF_DROP_ZIP = jdk6-jaf-2009_10_27.zip -JAF_DROP_SHA256SUM = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f -JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147491 -JAXP_DROP_ZIP = jdk6-jaxp-2010_01_15.zip -JAXP_DROP_SHA256SUM = 181615cfec1c3721a7d8f278fa25b392be4247a496c7774a10cb9df37684f94f +JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724 +JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip +JAXWS_DROP_SHA256SUM = 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb +JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725 +JAF_DROP_ZIP = jdk6-jaf-b20.zip +JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 +JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648 +JAXP_DROP_ZIP = jdk6-jaxp-b20.zip +JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6 @@ -265,14 +266,12 @@ ICEDTEA_PATCHES = \ patches/icedtea-testenv.patch \ patches/icedtea-samejvm-safe.patch \ patches/icedtea-pr261.patch \ - patches/icedtea-doc-headers.patch \ patches/icedtea-sparc-buildfixes.patch \ patches/icedtea-sparc64-linux.patch \ patches/icedtea-sparc-ptracefix.patch \ patches/icedtea-sparc-trapsfix.patch \ patches/icedtea-demo-swingapplet.patch \ patches/icedtea-awt-window-size.patch \ - patches/icedtea-java2d-dasher.patch \ patches/icedtea-jtreg-6592792.patch \ patches/icedtea-s390-noinline.patch \ patches/icedtea-jtreg-dnd.patch \ @@ -642,7 +641,7 @@ endif then \ mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \ fi ; \ - $(WGET) $(JAXWS_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \ + $(WGET) $(JAF_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \ if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \ | $(SHA256SUM) --check ; \ then echo "ERROR: Bad download of jaf drop zip"; false; \ diff -r f93e99e857af -r c8a3736ab6de patches/icedtea-doc-headers.patch --- a/patches/icedtea-doc-headers.patch Tue Jun 08 23:57:58 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile ---- openjdk.orig/jdk/make/docs/Makefile 2009-02-03 13:34:38.000000000 +0000 -+++ openjdk/jdk/make/docs/Makefile 2009-02-03 16:11:08.000000000 +0000 -@@ -99,36 +99,20 @@ - - TAGS = $(IGNORED_TAGS:%=-tag %:X) $(TAG_JLS3) - --ifeq ($(MILESTONE), fcs) -- DOCTITLE_SWITCH = $(JAVADOCTITLE) -- WINDOWTITLE_SWITCH = $(JAVADOCWINDOWTITLE) -- HEADER_SWITCH = $(JAVADOCHEADER) -- TOPOPTION= -- JAVADOCBOTTOM_SWITCH= $(JAVADOCBOTTOM) -- OVERVIEW_OPTION = -overview $(JAVADOCOVERVIEW) --else -- DOCTITLE_SWITCH = $(JAVADOCTITLE_EARLYACCESS)$(DRAFT) -- WINDOWTITLE_SWITCH = $(JAVADOCWINDOWTITLE)" $(BUILD_NUMBER)" -- HEADER_SWITCH = $(JAVADOCHEADER)$(DRAFT) -- JAVADOCBOTTOM_SWITCH= $(JAVADOCBOTTOM_EARLYACCESS) -- TOPOPTION= -top $(JAVADOCTOP_EARLYACCESS) -- OVERVIEW_OPTION = --endif -+DOCTITLE_SWITCH = $(JAVADOCTITLE) -+WINDOWTITLE_SWITCH = $(JAVADOCWINDOWTITLE)" $(BUILD_NUMBER)" -+HEADER_SWITCH = $(JAVADOCHEADER) -+TOPOPTION= -+JAVADOCBOTTOM_SWITCH= $(JAVADOCBOTTOM) -+OVERVIEW_OPTION = -overview $(JAVADOCOVERVIEW) - - JAVADOCTITLE = 'Java$(TRADEMARK) Platform, Standard Edition $(JDK_MINOR_VERSION)
API Specification' - JAVADOCWINDOWTITLE = 'Java Platform SE $(JDK_MINOR_VERSION)' - JAVADOCHEADER = 'Java$(TRADEMARK) Platform
Standard Ed. $(JDK_MINOR_VERSION)
' --JAVADOCBOTTOM = 'Submit a bug or feature
For further API reference and developer documentation, see Java SE Developer Documentation. That documentation contains more detailed, developer-targeted descriptions, with conceptual overviews, definitions of terms, workarounds, and working code examples.

Copyright $(THIS_YEAR) Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Also see the documentation redistribution policy.' -+JAVADOCBOTTOM = 'Submit a bug or feature

Copyright $(THIS_YEAR) Sun Microsystems, Inc. All rights reserved. Use is subject to the terms of the GNU General Public License.' - JAVADOCOVERVIEW = $(SHARE_SRC)/classes/overview-core.html - - # --# Early access top and bottom text (for snapshots, beta and rc) --# --JAVADOCTOP_EARLYACCESS = '

Please note that this documentation is not final and is subject to change.
' --JAVADOCBOTTOM_EARLYACCESS = 'Submit a bug or feature

Copyright $(THIS_YEAR) Sun Microsystems, Inc. All rights reserved. Use is subject to the terms of the GNU General Public License.' --JAVADOCTITLE_EARLYACCESS = $(subst Specification,Documentation,$(JAVADOCTITLE)) -- --# - # Variables used by domapidocs target - # - -@@ -138,12 +122,11 @@ - -doctitle $(DOMAPI_JAVADOCTITLE) \ - -windowtitle $(DOMAPI_JAVADOCWINDOWTITLE) \ - -header $(DOMAPI_JAVADOCHEADER) \ -- -bottom $(DOMAPI_JAVADOCBOTTOM) \ -+ -bottom $(JAVADOCBOTTOM) \ - -group $(DOMAPI_GROUPNAME) $(DOMAPI_REGEXP) - DOMAPI_JAVADOCTITLE = 'Common DOM API' - DOMAPI_JAVADOCWINDOWTITLE = 'Common DOM API' - DOMAPI_JAVADOCHEADER = 'Common DOM API' --DOMAPI_JAVADOCBOTTOM = 'Submit a bug or feature
Java is a trademark or registered trademark of Sun Microsystems, Inc. in the US and other countries.
Copyright $(THIS_YEAR) Sun Microsystems, Inc. 4150 Network Circle
Santa Clara, California, 95054, U.S.A. All Rights Reserved.
' - DOMAPI_GROUPNAME = "Packages" - DOMAPI_REGEXP = "com.sun.java.browser.dom:org.w3c.dom*" - # DOMAPI_PKGS is located in NON_CORE_PKGS.gmk -@@ -157,13 +140,12 @@ - -doctitle $(MIRROR_JAVADOCTITLE) \ - -windowtitle $(MIRROR_JAVADOCWINDOWTITLE) \ - -header $(MIRROR_JAVADOCHEADER) \ -- -bottom $(MIRROR_JAVADOCBOTTOM) \ -+ -bottom $(JAVADOCBOTTOM) \ - -group $(MIRROR_GROUPNAME) $(MIRROR_REGEXP) \ - -overview $(MIRROR_OVERVIEW) - MIRROR_JAVADOCTITLE = 'Mirror API' - MIRROR_JAVADOCWINDOWTITLE = 'Mirror API' - MIRROR_JAVADOCHEADER = 'Mirror API' --MIRROR_JAVADOCBOTTOM = 'Report a bug or request a feature.
Copyright $(THIS_YEAR) Sun Microsystems, Inc. All Rights Reserved. Use is subject to license terms.
' - MIRROR_GROUPNAME = "Packages" - MIRROR_OVERVIEW = $(IMPORTSRCDIR)/com/sun/mirror/overview.html - MIRROR_REGEXP = "com.sun.mirror.*" -@@ -181,12 +163,11 @@ - -doctitle $(DOCLETAPI_JAVADOCTITLE) \ - -windowtitle $(DOCLETAPI_JAVADOCWINDOWTITLE) \ - -header $(DOCLETAPI_JAVADOCHEADER) \ -- -bottom $(DOCLETAPI_JAVADOCBOTTOM) \ -+ -bottom $(JAVADOCBOTTOM) \ - -group $(DOCLETAPI_GROUPNAME) $(DOCLETAPI_REGEXP) - DOCLETAPI_JAVADOCTITLE = 'Doclet API' - DOCLETAPI_JAVADOCWINDOWTITLE = 'Doclet API' - DOCLETAPI_JAVADOCHEADER = 'Doclet API' --DOCLETAPI_JAVADOCBOTTOM = 'Submit a bug or feature
Java is a trademark or registered trademark of Sun Microsystems, Inc. in the US and other countries.
Copyright 1993-$(THIS_YEAR) Sun Microsystems, Inc. 4150 Network Circle
Santa Clara, California, 95054, U.S.A. All Rights Reserved.
' - DOCLETAPI_GROUPNAME = "Packages" - DOCLETAPI_REGEXP = "com.sun.javadoc" - DOCLETAPI_LINKOPT = -linkoffline ../../../../api $(DOCSDIR)/api/ -@@ -200,8 +181,7 @@ - -encoding ascii \ - -nonavbar \ - -noindex \ -- -bottom $(TAGLETAPI_JAVADOCBOTTOM) --TAGLETAPI_JAVADOCBOTTOM = 'Submit a bug or feature
Java is a trademark or registered trademark of Sun Microsystems, Inc. in the US and other countries.
Copyright 1993-$(THIS_YEAR) Sun Microsystems, Inc. 4150 Network Circle
Santa Clara, California, 95054, U.S.A. All Rights Reserved.
' -+ -bottom $(JAVADOCBOTTOM) - # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk - - # -@@ -218,6 +198,7 @@ - -windowtitle $(JDI_WINDOWTITLE) \ - -doctitle $(JDI_DOCTITLE) \ - -header $(JDI_HEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../api $(DOCSDIR)/api/ \ - -overview $(JPDA_SOURCEPATH)/jdi-overview.html - JDI_WINDOWTITLE = "Java Debug Interface" -@@ -242,6 +223,7 @@ - -windowtitle $(JAAS_WINDOWTITLE) \ - -doctitle $(JAAS_DOCTITLE) \ - -header $(JAAS_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../../api $(DOCSDIR)/api/ \ - -overview $(TOPDIR)/src/share/classes/com/sun/security/auth/jaas-overview.html - JAAS_WINDOWTITLE = "Java Authentication and Authorization Service " -@@ -264,6 +246,7 @@ - -windowtitle $(JGSS_WINDOWTITLE) \ - -doctitle $(JGSS_DOCTITLE) \ - -header $(JGSS_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../../api $(DOCSDIR)/api/ \ - -overview $(JGSS_SOURCEPATH)/com/sun/security/jgss/jgss-overview.html - -@@ -287,6 +270,7 @@ - -windowtitle $(SMARTCARDIO_WINDOWTITLE) \ - -doctitle $(SMARTCARDIO_DOCTITLE) \ - -header $(SMARTCARDIO_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../../api $(DOCSDIR)/api/ - - SMARTCARDIO_WINDOWTITLE = "Java Smart Card I/O" -@@ -309,6 +293,7 @@ - -windowtitle $(HTTPSERVER_WINDOWTITLE) \ - -doctitle $(HTTPSERVER_DOCTITLE) \ - -header $(HTTPSERVER_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../../api $(DOCSDIR)/api/ - - HTTPSERVER_WINDOWTITLE = "Java HTTP Server" -@@ -344,6 +329,7 @@ - -windowtitle $(MGMT_WINDOWTITLE) \ - -doctitle $(MGMT_DOCTITLE) \ - -header $(MGMT_HEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../api $(DOCSDIR)/api/ \ - -overview $(MGMT_SOURCEPATH)/com/sun/management/mgmt-overview.html - MGMT_WINDOWTITLE = "Monitoring and Management Interface for the Java Platform" -@@ -365,6 +351,7 @@ - -windowtitle $(ATTACH_WINDOWTITLE) \ - -doctitle $(ATTACH_DOCTITLE) \ - -header $(ATTACH_HEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../api $(DOCSDIR)/api/ - ATTACH_WINDOWTITLE = "Attach API" - ATTACH_DOCTITLE = "Attach API" -@@ -385,6 +372,7 @@ - -windowtitle $(JCONSOLE_WINDOWTITLE) \ - -doctitle $(JCONSOLE_DOCTITLE) \ - -header $(JCONSOLE_HEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ - -linkoffline ../../../../api $(DOCSDIR)/api/ - JCONSOLE_WINDOWTITLE = "JConsole API" - JCONSOLE_DOCTITLE = "JConsole API" -@@ -400,7 +388,7 @@ - -doctitle $(TREEAPI_JAVADOCTITLE) \ - -windowtitle $(TREEAPI_JAVADOCWINDOWTITLE) \ - -header $(TREEAPI_JAVADOCHEADER) \ -- -bottom $(TREEAPI_JAVADOCBOTTOM) \ -+ -bottom $(JAVADOCBOTTOM) \ - -group $(TREEAPI_GROUPNAME) $(TREEAPI_REGEXP) - # - # -overview $(TREEAPI_OVERVIEW) -@@ -408,7 +396,6 @@ - TREEAPI_JAVADOCTITLE = 'Compiler Tree API' - TREEAPI_JAVADOCWINDOWTITLE = 'Compiler Tree API' - TREEAPI_JAVADOCHEADER = 'Compiler Tree API' --TREEAPI_JAVADOCBOTTOM = 'Report a bug or request a feature.
Copyright $(THIS_YEAR) Sun Microsystems, Inc. All Rights Reserved. Use is subject to license terms.
' - TREEAPI_GROUPNAME = "Packages" - TREEAPI_OVERVIEW = $(SHARE_SRC)/classes/com/sun/source/overview.html - TREEAPI_REGEXP = "com.sun.source.*" diff -r f93e99e857af -r c8a3736ab6de patches/icedtea-java2d-dasher.patch --- a/patches/icedtea-java2d-dasher.patch Tue Jun 08 23:57:58 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java.orig 2009-01-13 12:14:53.000000000 -0500 -+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java 2009-01-13 12:15:09.000000000 -0500 -@@ -120,7 +120,7 @@ - - // Normalize so 0 <= phase < dash[0] - int idx = 0; -- dashOn = false; -+ dashOn = true; - int d; - while (phase >= (d = dash[idx])) { - phase -= d; diff -r f93e99e857af -r c8a3736ab6de patches/icedtea-nio2.patch --- a/patches/icedtea-nio2.patch Tue Jun 08 23:57:58 2010 +0100 +++ b/patches/icedtea-nio2.patch Fri Jun 11 01:47:22 2010 +0100 @@ -1,6 +1,17 @@ diff -Nru openjdk.orig/jdk/make/docs/COR +diff -Nru openjdk.orig/jdk/make/common/shared/Defs-javadoc.gmk openjdk/jdk/make/common/shared/Defs-javadoc.gmk +--- openjdk.orig/jdk/make/common/shared/Defs-javadoc.gmk 2010-06-10 23:04:50.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Defs-javadoc.gmk 2010-06-11 00:44:42.000000000 +0100 +@@ -41,6 +41,7 @@ + TREEAPI_FIRST_COPYRIGHT_YEAR = 2005 + JNLP_FIRST_COPYRIGHT_YEAR = 1998 + PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007 ++NIO2_FIRST_COPYRIGHT_YEAR = 2007 + + # Oracle name + COMPANY_NAME = Oracle and/or its affiliates diff -Nru openjdk.orig/jdk/make/docs/CORE_PKGS.gmk openjdk/jdk/make/docs/CORE_PKGS.gmk --- openjdk.orig/jdk/make/docs/CORE_PKGS.gmk 2010-05-26 09:32:35.000000000 +0100 -+++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2010-05-26 14:21:37.000000000 +0100 ++++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2010-06-11 00:35:39.000000000 +0100 @@ -36,6 +36,7 @@ sunw.* \ com.sun.* \ @@ -10,66 +21,70 @@ diff -Nru openjdk.orig/jdk/make/docs/COR org.w3c.dom.css \ org.w3c.dom.html \ diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile ---- openjdk.orig/jdk/make/docs/Makefile 2010-05-26 14:20:55.000000000 +0100 -+++ openjdk/jdk/make/docs/Makefile 2010-05-26 14:21:37.000000000 +0100 -@@ -405,6 +405,29 @@ - # TREEAPI_PKGS is located in NON_CORE_PKGS.gmk +--- openjdk.orig/jdk/make/docs/Makefile 2010-06-10 23:04:50.000000000 +0100 ++++ openjdk/jdk/make/docs/Makefile 2010-06-11 00:42:38.000000000 +0100 +@@ -1076,6 +1076,58 @@ + ############################################################# # -+# Variables used by nio2docs target ++# nio2docs +# + -+NIO2_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \ -+ -encoding ascii \ -+ -d $(NIO2_DOCDIR) \ -+ -sourcepath $(NIO2_SOURCEPATH) \ -+ -splitIndex \ -+ -doctitle $(NIO2_JAVADOCTITLE) \ -+ -windowtitle $(NIO2_JAVADOCWINDOWTITLE) \ -+ -header $(NIO2_JAVADOCHEADER) \ -+ -bottom $(JAVADOCBOTTOM) \ -+ -group $(NIO2_GROUPNAME) $(NIO2_REGEXP) -+NIO2_JAVADOCTITLE = 'NIO2 API' -+NIO2_JAVADOCWINDOWTITLE = 'NIO2 API' -+NIO2_JAVADOCHEADER = 'NIO2 API' -+NIO2_GROUPNAME = "Packages" -+NIO2_REGEXP = "org.classpath.icedtea.*" -+NIO2_DOCDIR = $(DOCSDIR)/jre/api/nio2 -+NIO2_SOURCEPATH = $(TOPDIR)/src/share/classes ++ALL_OTHER_TARGETS += nio2docs ++ ++NIO2_DOCDIR := $(JRE_API_DOCSDIR)/nio2 ++NIO22COREAPI := ../../$(JDKJRE2COREAPI) ++NIO2_DOCTITLE := NIO2 API ++NIO2_WINDOWTITLE := NIO2 API ++NIO2_HEADER := NIO2 API ++NIO2_BOTTOM := $(call CommonBottom,$(NIO2_FIRST_COPYRIGHT_YEAR)) ++NIO2_GROUPNAME := Packages ++NIO2_REGEXP := org.classpath.icedtea.* +# NIO2_PKGS is located in NON_CORE_PKGS.gmk + ++NIO2_INDEX_HTML = $(NIO2_DOCDIR)/index.html ++NIO2_OPTIONS_FILE = $(DOCSTMPDIR)/nio2.options ++NIO2_PACKAGES_FILE = $(DOCSTMPDIR)/nio2.packages ++ ++nio2docs: $(NIO2_INDEX_HTML) ++ ++# Set relative location to core api document root ++$(NIO2_INDEX_HTML): GET2DOCSDIR=$(NIO22COREAPI)/.. ++ ++# Run javadoc if the index file is out of date or missing ++$(NIO2_INDEX_HTML): $(NIO2_OPTIONS_FILE) $(NIO2_PACKAGES_FILE) ++ $(prep-javadoc) ++ $(call JavadocSummary,$(NIO2_OPTIONS_FILE),$(NIO2_PACKAGES_FILE)) ++ $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \ ++ @$(NIO2_OPTIONS_FILE) @$(NIO2_PACKAGES_FILE) ++ ++# Create file with javadoc options in it ++$(NIO2_OPTIONS_FILE): ++ $(prep-target) ++ @($(ECHO) "$(COMMON_JAVADOCFLAGS)" ; \ ++ $(ECHO) "-sourcepath \"$(RELEASEDOCS_SOURCEPATH)\"" ; \ ++ $(ECHO) "-encoding ascii" ; \ ++ $(ECHO) "-doctitle '$(NIO2_DOCTITLE)'" ; \ ++ $(ECHO) "-windowtitle '$(NIO2_WINDOWTITLE) $(DRAFT_WINTITLE)'";\ ++ $(ECHO) "-header '$(NIO2_HEADER)$(DRAFT_HEADER)'" ; \ ++ $(ECHO) "-bottom '$(NIO2_BOTTOM)$(DRAFT_BOTTOM)'" ; \ ++ $(ECHO) "-group $(NIO2_GROUPNAME) $(NIO2_REGEXP)" ; \ ++ $(ECHO) "-linkoffline $(NIO22COREAPI) $(COREAPI_DOCSDIR)/" ; \ ++ ) >> $@ ++ ++# Create a file with the package names in it ++$(NIO2_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(NIO2_PKGS)) ++ $(prep-target) ++ $(call PackageFilter,$(NIO2_PKGS)) ++ ++############################################################# +# - # Path where javadoc should find source files for release docs - # - RELEASEDOCS_SRCPATH = "$(SHARE_SRC)/classes$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/doc/stub$(CLASSPATH_SEPARATOR)$(CLOSED_SRC)/share/classes$(CLASSPATH_SEPARATOR)$(IMPORTSRCDIR)" -@@ -430,7 +453,8 @@ - httpserverdocs \ - mgmtdocs \ - attachdocs \ -- jconsoledocs -+ jconsoledocs \ -+ nio2docs + # Get a cache of all the directories - ifdef LANGTOOLS_DIST - ALL_OTHER_TARGETS += \ -@@ -647,6 +671,14 @@ - $(TREEAPI_LINKOPT) \ - $(TREEAPI_PKGS) - -+.PHONY: nio2docs -+nio2docs: -+ @# ######## api-nio2 ############################ -+ $(RM) -r $(NIO2_DOCDIR) -+ $(MKDIR) -p $(NIO2_DOCDIR) -+ $(JAVADOC_CMD) $(NIO2_JAVADOCFLAGS) \ -+ $(NIO2_PKGS) -+ - # DEBUG TARGET - # List the values defined in the makefile hierarchy, to make sure everything - # is set properly, and to help identify values we can use instead of making new ones. + $(DIRECTORY_CACHE): $(ALL_SOURCE_DIRS) diff -Nru openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk openjdk/jdk/make/docs/NON_CORE_PKGS.gmk ---- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2010-05-26 14:20:57.000000000 +0100 -+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2010-05-26 14:21:37.000000000 +0100 +--- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2010-06-11 00:14:21.000000000 +0100 ++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2010-06-11 00:35:39.000000000 +0100 @@ -65,6 +65,16 @@ HTTPSERVER_PKGS = com.sun.net.httpserver \ com.sun.net.httpserver.spi @@ -87,7 +102,7 @@ diff -Nru openjdk.orig/jdk/make/docs/NON DOCLETAPI_PKGS = com.sun.javadoc TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java -@@ -91,6 +101,7 @@ +@@ -93,6 +103,7 @@ $(MGMT_PKGS) \ $(JAAS_PKGS) \ $(JGSS_PKGS) \ @@ -96,8 +111,8 @@ diff -Nru openjdk.orig/jdk/make/docs/NON $(HTTPSERVER_PKGS) \ $(SMARTCARDIO_PKGS) \ diff -Nru openjdk.orig/jdk/make/java/java/FILES_java.gmk openjdk/jdk/make/java/java/FILES_java.gmk ---- openjdk.orig/jdk/make/java/java/FILES_java.gmk 2010-05-26 14:20:55.000000000 +0100 -+++ openjdk/jdk/make/java/java/FILES_java.gmk 2010-05-26 14:21:37.000000000 +0100 +--- openjdk.orig/jdk/make/java/java/FILES_java.gmk 2010-06-11 00:14:20.000000000 +0100 ++++ openjdk/jdk/make/java/java/FILES_java.gmk 2010-06-11 00:35:39.000000000 +0100 @@ -517,6 +517,13 @@ sun/misc/JavaLangAccess.java \ sun/misc/JavaIOAccess.java \ @@ -114,8 +129,8 @@ diff -Nru openjdk.orig/jdk/make/java/jav FILES_java = $(JAVA_JAVA_java) diff -Nru openjdk.orig/jdk/make/java/nio/FILES_java.gmk openjdk/jdk/make/java/nio/FILES_java.gmk ---- openjdk.orig/jdk/make/java/nio/FILES_java.gmk 2010-05-26 14:20:55.000000000 +0100 -+++ openjdk/jdk/make/java/nio/FILES_java.gmk 2010-05-26 14:21:37.000000000 +0100 +--- openjdk.orig/jdk/make/java/nio/FILES_java.gmk 2010-06-11 00:14:21.000000000 +0100 ++++ openjdk/jdk/make/java/nio/FILES_java.gmk 2010-06-11 00:35:39.000000000 +0100 @@ -75,12 +75,13 @@ sun/nio/ch/DefaultSelectorProvider.java \ sun/nio/ch/DirectBuffer.java \ @@ -315,8 +330,8 @@ diff -Nru openjdk.orig/jdk/make/java/nio FILES_java = $(FILES_src) $(FILES_gen) diff -Nru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile ---- openjdk.orig/jdk/make/java/nio/Makefile 2010-05-26 14:20:55.000000000 +0100 -+++ openjdk/jdk/make/java/nio/Makefile 2010-05-26 14:21:37.000000000 +0100 +--- openjdk.orig/jdk/make/java/nio/Makefile 2010-06-11 00:14:21.000000000 +0100 ++++ openjdk/jdk/make/java/nio/Makefile 2010-06-11 00:35:39.000000000 +0100 @@ -40,6 +40,11 @@ SNIO_SRC = $(SHARE_SRC)/classes/sun/nio SNIO_GEN = $(GENSRCDIR)/sun/nio @@ -664,7 +679,7 @@ diff -Nru openjdk.orig/jdk/make/java/nio .PHONY: sources diff -Nru openjdk.orig/jdk/make/java/nio/mapfile-linux openjdk/jdk/make/java/nio/mapfile-linux --- openjdk.orig/jdk/make/java/nio/mapfile-linux 2010-04-06 17:51:43.000000000 +0100 -+++ openjdk/jdk/make/java/nio/mapfile-linux 2010-05-26 14:21:37.000000000 +0100 ++++ openjdk/jdk/make/java/nio/mapfile-linux 2010-06-11 00:35:39.000000000 +0100 @@ -20,6 +20,14 @@ Java_sun_nio_ch_EPollArrayWrapper_interrupt; Java_sun_nio_ch_EPollArrayWrapper_offsetofData; @@ -782,7 +797,7 @@ diff -Nru openjdk.orig/jdk/make/java/nio *; diff -Nru openjdk.orig/jdk/make/java/nio/mapfile-solaris openjdk/jdk/make/java/nio/mapfile-solaris --- openjdk.orig/jdk/make/java/nio/mapfile-solaris 2010-04-06 17:51:43.000000000 +0100 -+++ openjdk/jdk/make/java/nio/mapfile-solaris 2010-05-26 14:21:37.000000000 +0100 ++++ openjdk/jdk/make/java/nio/mapfile-solaris 2010-06-11 00:35:39.000000000 +0100 @@ -73,6 +73,75 @@ Java_sun_nio_ch_ServerSocketChannelImpl_listen; Java_sun_nio_ch_SocketChannelImpl_checkConnect; @@ -861,7 +876,7 @@ diff -Nru openjdk.orig/jdk/make/java/nio *; diff -Nru openjdk.orig/jdk/make/mkdemo/Makefile openjdk/jdk/make/mkdemo/Makefile --- openjdk.orig/jdk/make/mkdemo/Makefile 2010-05-26 09:32:36.000000000 +0100 -+++ openjdk/jdk/make/mkdemo/Makefile 2010-05-26 14:21:37.000000000 +0100 ++++ openjdk/jdk/make/mkdemo/Makefile 2010-06-11 00:35:39.000000000 +0100 @@ -31,7 +31,7 @@ PRODUCT = demos include $(BUILDDIR)/common/Defs.gmk @@ -873,7 +888,7 @@ diff -Nru openjdk.orig/jdk/make/mkdemo/M $(SUBDIRS-loop) diff -Nru openjdk.orig/jdk/make/mksample/nio/Makefile openjdk/jdk/make/mksample/nio/Makefile --- openjdk.orig/jdk/make/mksample/nio/Makefile 2010-05-26 09:32:36.000000000 +0100 -+++ openjdk/jdk/make/mksample/nio/Makefile 2010-05-26 14:21:37.000000000 +0100 ++++ openjdk/jdk/make/mksample/nio/Makefile 2010-06-11 00:35:39.000000000 +0100 From doko at ubuntu.com Fri Jun 11 01:29:19 2010 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 11 Jun 2010 10:29:19 +0200 Subject: Shark build passes TCK In-Reply-To: <20100610150324.GE3279@redhat.com> References: <20100610150324.GE3279@redhat.com> Message-ID: <4C11F3DF.2060308@ubuntu.com> On 10.06.2010 17:03, Gary Benson wrote: > As a result of this work I am pleased to announce that an IcedTea > build of OpenJDK using Shark has passed the Java SE 6 TCK and is > compatible with the Java SE 6 platform. nice! > IcedTea: http://icedtea.classpath.org/hg/icedtea6 > revision: 7674917fa451 > configured with: --enable-shark is this corresponding to some branch/trunk? From gbenson at redhat.com Fri Jun 11 01:38:24 2010 From: gbenson at redhat.com (Gary Benson) Date: Fri, 11 Jun 2010 09:38:24 +0100 Subject: Shark build passes TCK In-Reply-To: <4C11F3DF.2060308@ubuntu.com> References: <20100610150324.GE3279@redhat.com> <4C11F3DF.2060308@ubuntu.com> Message-ID: <20100611083823.GB3674@redhat.com> Matthias Klose wrote: > On 10.06.2010 17:03, Gary Benson wrote: > > As a result of this work I am pleased to announce that an IcedTea > > build of OpenJDK using Shark has passed the Java SE 6 TCK and is > > compatible with the Java SE 6 platform. > > nice! > > > IcedTea: http://icedtea.classpath.org/hg/icedtea6 > > revision: 7674917fa451 > > configured with: --enable-shark > > is this corresponding to some branch/trunk? No, just whatever was icedtea6 HEAD at the time I thought I had a passer. Cheers, Gary -- http://gbenson.net/ From doko at ubuntu.com Fri Jun 11 01:41:05 2010 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 11 Jun 2010 10:41:05 +0200 Subject: Release Schedule In-Reply-To: References: Message-ID: <4C11F6A1.7070305@ubuntu.com> On 09.06.2010 11:50, Andrew John Hughes wrote: > I have a number of new IcedTea releases in planning: > > * IcedTea6 1.6 branch: > http://icedtea.classpath.org/hg/release/icedtea6-1.6/shortlog/ > > There will be a 1.6.3 release as the branch has a lot of patches not > yet released including security updates. It is ready for testing now. > I have a few more patches to look into, but it's otherwise ready. > doko reported an issue with Zero a while back, but I've not heard > anything since. I didn't look at these anymore. For my liking, the 1.6 branch has too many build system patches backported, which apparently did break some configurations. I'd like to avoid these kind of backports for more recent branches. > * IcedTea6 1.7 branch: > http://icedtea.classpath.org/hg/release/icedtea6-1.7/shortlog/ > > There will be a 1.7.4 release to update the plugin with recent bug > fixes in 1.8 and beyond. This will be a plugin-only release. Most of > the patches have been backported (up to 1.8) and so this is also > eligible for testing now. > > * IcedTea7: http://icedtea.classpath.org/hg/release/icedtea/shortlog > > There will be based on b89 (Milestone 7). I see from > http://openjdk.java.net/projects/jdk7/milestones/ that we've > apparently just reached Milestone 8, but I've seen nothing from Oracle > on either milestone 6, 7 or 8 and I don't believe 8 is feature > complete; I've seen no commits relating to closures for one thing. As > you may have seen from the IcedTea7 commits, I've been backporting > over six months worth of work on IcedTea6 to IcedTea7 over the last > few weeks. There's still some to go, so I'll let the list know when > it's worth testing. But it should be soon. Build patches are likely needed for some of the more obscure Debian builds. if "soon" is too soon, then I'd like to make these build changes on a 1.7 branch as well. A release date after the IcedTea6 releases would be appreciated. > A couple of changes I plan for this release are updating the CACAO > build to use the development branch: see > http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=139 > and dropping VisualVM, which I believe is broken anyway. VisualVM > will be migrated to its own repository. > > I'd like to make the same VisualVM change with IcedTea6 HEAD in due > course. agreed. Did we hear back from VisualVM upstream to provide a visualvm project on IcedTea.classpath.org? Is there some comittment from the CACAO project to keep the OpenJDK build working? > As to IcedTea6 HEAD generally, I don't think we're ready for > another release yet so I doubt we'll have a release based on b19. The > only major change there was an upgrade to hs16, which we provided as > an option in 1.8 anyway. I'd rather we wait for b20 and then begin > preparing a release, stabilising on hs17, which will bring us in line > with the proprietary JDK6. skipping b20 sounds fine. I personally do not want to work on b19 anymore. > For 1.8, I will backport any plugin fixes that are post-1.8 as I do > them for 1.7, but I'll leave releases up to the release manager, doko. please feel free to apply these to the 1.8 branch. Trying for a 1.8.1 release around the same time as for the 1.7.4 release. Matthias From ahughes at redhat.com Fri Jun 11 03:12:45 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 11:12:45 +0100 Subject: Release Schedule In-Reply-To: <4C11F6A1.7070305@ubuntu.com> References: <4C11F6A1.7070305@ubuntu.com> Message-ID: On 11 June 2010 09:41, Matthias Klose wrote: > On 09.06.2010 11:50, Andrew John Hughes wrote: >> >> I have a number of new IcedTea releases in planning: >> >> * IcedTea6 1.6 branch: >> http://icedtea.classpath.org/hg/release/icedtea6-1.6/shortlog/ >> >> There will be a 1.6.3 release as the branch has a lot of patches not >> yet released including security updates. ?It is ready for testing now. >> ?I have a few more patches to look into, but it's otherwise ready. >> doko reported an issue with Zero a while back, but I've not heard >> anything since. > > I didn't look at these anymore. ?For my liking, the 1.6 branch has too many > build system patches backported, which apparently did break some > configurations. ?I'd like to avoid these kind of backports for more recent > branches. > Can you be more specific? The only build changes added to that branch were necessary fixes to make it build (including updating hs11 support which was broken with the initial release). >> * IcedTea6 1.7 branch: >> http://icedtea.classpath.org/hg/release/icedtea6-1.7/shortlog/ >> >> There will be a 1.7.4 release to update the plugin with recent bug >> fixes in 1.8 and beyond. ?This will be a plugin-only release. ?Most of >> the patches have been backported (up to 1.8) and so this is also >> eligible for testing now. >> >> * IcedTea7: http://icedtea.classpath.org/hg/release/icedtea/shortlog >> >> There will be based on b89 (Milestone 7). ?I see from >> http://openjdk.java.net/projects/jdk7/milestones/ that we've >> apparently just reached Milestone 8, but I've seen nothing from Oracle >> on either milestone 6, 7 or 8 and I don't believe 8 is feature >> complete; I've seen no commits relating to closures for one thing. ?As >> you may have seen from the IcedTea7 commits, I've been backporting >> over six months worth of work on IcedTea6 to IcedTea7 over the last >> few weeks. ?There's still some to go, so I'll let the list know when >> it's worth testing. ? But it should be soon. > > Build patches are likely needed for some of the more obscure Debian builds. > if "soon" is too soon, then I'd like to make these build changes on a 1.7 > branch as well. A release date after the IcedTea6 releases would be > appreciated. 'Soon' is referring to the backporting of patches from IcedTea6, not the release. There are now just five left to check (some of which may not be forwardported). All the plugin and Shark stuff is done, but I've no idea how well this works in practice because Shark changes were bundled together with Zero changes, with no bug IDs (if they were even upstreamed at all). Zero is upstream in both OpenJDK6 and OpenJDK7 now, so local copies should preferably be dropped. The IcedTea7 release will be when it's ready, and I certainly prefer we ship something that works for you as well. That said, I'd prefer it to be sooner rather than later, as both IcedTea6 and OpenJDK7 will move forward while we stabilise, and we don't want to release something too outdated. This note was to say we are (just about) ready for testing rather than release. I still have to make the CACAO and VisualVM changes as mentioned below. I expect Zero to be building by release. Shark has never done a full bootstrap on any IcedTea7 release (in fact, I only think I've seen it done once on any version of IcedTea) so, while it would be nice to have, it's not a regression and thus not a release blocker. > >> A couple of changes I plan for this release are updating the CACAO >> build to use the development branch: see >> http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=139 >> and dropping VisualVM, which I believe is broken anyway. ?VisualVM >> will be migrated to its own repository. >> >> I'd like to make the same VisualVM change with IcedTea6 HEAD in due >> course. > > agreed. Did we hear back from VisualVM upstream to provide a visualvm > project on IcedTea.classpath.org? I haven't heard anything. > > Is there some commitment from the CACAO project to keep the OpenJDK build > working? > They suggested bumping to the development line, if you read the bug. Hopefully us testing it will push them into doing a new release. 0.99.4 is becoming more and more unmaintainable. I got it to build, but not bootstrap. The fix for that issue is apparently in the rewrite. >> As to IcedTea6 HEAD generally, I don't think we're ready for >> another release yet so I doubt we'll have a release based on b19. ?The >> only major change there was an upgrade to hs16, which we provided as >> an option in 1.8 anyway. ?I'd rather we wait for b20 and then begin >> preparing a release, stabilising on hs17, which will bring us in line >> with the proprietary JDK6. > > skipping b20 sounds fine. I personally do not want to work on b19 anymore. > We're skipping b19 (I imagine you meant 'skipping to b20'), the current IcedTea6 HEAD and moving to the new b20 release. >> For 1.8, I will backport any plugin fixes that are post-1.8 as I do >> them for 1.7, but I'll leave releases up to the release manager, doko. > > please feel free to apply these to the 1.8 branch. Trying for a 1.8.1 > release around the same time as for the 1.7.4 release. > Done (I took your questions on IRC about them the other day as indication that you wanted them too). The 1.7 branch is ready for testing and will be released as soon as it seems ready. > ?Matthias > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Jun 11 03:13:36 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 11:13:36 +0100 Subject: Release Schedule In-Reply-To: References: <4C11F6A1.7070305@ubuntu.com> Message-ID: On 11 June 2010 11:12, Andrew John Hughes wrote: > On 11 June 2010 09:41, Matthias Klose wrote: >> On 09.06.2010 11:50, Andrew John Hughes wrote: >>> >>> I have a number of new IcedTea releases in planning: >>> >>> * IcedTea6 1.6 branch: >>> http://icedtea.classpath.org/hg/release/icedtea6-1.6/shortlog/ >>> >>> There will be a 1.6.3 release as the branch has a lot of patches not >>> yet released including security updates. ?It is ready for testing now. >>> ?I have a few more patches to look into, but it's otherwise ready. >>> doko reported an issue with Zero a while back, but I've not heard >>> anything since. >> >> I didn't look at these anymore. ?For my liking, the 1.6 branch has too many >> build system patches backported, which apparently did break some >> configurations. ?I'd like to avoid these kind of backports for more recent >> branches. >> > > Can you be more specific? ?The only build changes added to that branch > were necessary fixes to make it build (including updating hs11 support > which was broken with the initial release). > >>> * IcedTea6 1.7 branch: >>> http://icedtea.classpath.org/hg/release/icedtea6-1.7/shortlog/ >>> >>> There will be a 1.7.4 release to update the plugin with recent bug >>> fixes in 1.8 and beyond. ?This will be a plugin-only release. ?Most of >>> the patches have been backported (up to 1.8) and so this is also >>> eligible for testing now. >>> >>> * IcedTea7: http://icedtea.classpath.org/hg/release/icedtea/shortlog >>> >>> There will be based on b89 (Milestone 7). ?I see from >>> http://openjdk.java.net/projects/jdk7/milestones/ that we've >>> apparently just reached Milestone 8, but I've seen nothing from Oracle >>> on either milestone 6, 7 or 8 and I don't believe 8 is feature >>> complete; I've seen no commits relating to closures for one thing. ?As >>> you may have seen from the IcedTea7 commits, I've been backporting >>> over six months worth of work on IcedTea6 to IcedTea7 over the last >>> few weeks. ?There's still some to go, so I'll let the list know when >>> it's worth testing. ? But it should be soon. >> >> Build patches are likely needed for some of the more obscure Debian builds. >> if "soon" is too soon, then I'd like to make these build changes on a 1.7 >> branch as well. A release date after the IcedTea6 releases would be >> appreciated. > > 'Soon' is referring to the backporting of patches from IcedTea6, not > the release. ?There are now just five left to check (some of which may > not be forwardported). ?All the plugin and Shark stuff is done, but > I've no idea how well this works in practice because Shark changes > were bundled together with Zero changes, with no bug IDs (if they were > even upstreamed at all). ?Zero is upstream in both OpenJDK6 and > OpenJDK7 now, so local copies should preferably be dropped. > > The IcedTea7 release will be when it's ready, and I certainly prefer > we ship something that works for you as well. ?That said, I'd prefer > it to be sooner rather than later, as both IcedTea6 and OpenJDK7 will > move forward while we stabilise, and we don't want to release > something too outdated. > > This note was to say we are (just about) ready for testing rather than > release. ?I still have to make the CACAO and VisualVM changes as > mentioned below. ?I expect Zero to be building by release. ?Shark has > never done a full bootstrap on any IcedTea7 release (in fact, I only > think I've seen it done once on any version of IcedTea) so, while it > would be nice to have, it's not a regression and thus not a release > blocker. > >> >>> A couple of changes I plan for this release are updating the CACAO >>> build to use the development branch: see >>> http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=139 >>> and dropping VisualVM, which I believe is broken anyway. ?VisualVM >>> will be migrated to its own repository. >>> >>> I'd like to make the same VisualVM change with IcedTea6 HEAD in due >>> course. >> >> agreed. Did we hear back from VisualVM upstream to provide a visualvm >> project on IcedTea.classpath.org? > > I haven't heard anything. > >> >> Is there some commitment from the CACAO project to keep the OpenJDK build >> working? >> > > They suggested bumping to the development line, if you read the bug. > Hopefully us testing it will push them into doing a new release. > 0.99.4 is becoming more and more unmaintainable. ?I got it to build, > but not bootstrap. ?The fix for that issue is apparently in the > rewrite. > >>> As to IcedTea6 HEAD generally, I don't think we're ready for >>> another release yet so I doubt we'll have a release based on b19. ?The >>> only major change there was an upgrade to hs16, which we provided as >>> an option in 1.8 anyway. ?I'd rather we wait for b20 and then begin >>> preparing a release, stabilising on hs17, which will bring us in line >>> with the proprietary JDK6. >> >> skipping b20 sounds fine. I personally do not want to work on b19 anymore. >> > > We're skipping b19 (I imagine you meant 'skipping to b20'), the > current IcedTea6 HEAD and moving to the new b20 release. > >>> For 1.8, I will backport any plugin fixes that are post-1.8 as I do >>> them for 1.7, but I'll leave releases up to the release manager, doko. >> >> please feel free to apply these to the 1.8 branch. Trying for a 1.8.1 >> release around the same time as for the 1.7.4 release. >> > > Done (I took your questions on IRC about them the other day as > indication that you wanted them too). ?The 1.7 branch is ready for > testing and will be released as soon as it seems ready. > >> ?Matthias >> > > > > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > I should also note that you can build http://icedtea.classpath.org/hg/icedtea6-hg with --enable-hg now to get b20 ahead of time. That branch will be merged to HEAD once b20 is released. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Fri Jun 11 05:02:11 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 11 Jun 2010 12:02:11 +0000 Subject: /hg/icedtea: 7 new changesets Message-ID: changeset a044595518ad in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a044595518ad author: Gary Benson date: Wed Jun 09 17:37:28 2010 +0100 PR icedtea/323: Backport new frame anchor and stack overflow code for Zero and Shark 2010-05-10 Gary Benson PR icedtea/323 * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (SharkBuilder::throw_StackOverflowError): New method. * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::throw_StackOverflowError): Likewise. * ports/hotspot/src/share/vm/shark/sharkStack.hpp (SharkStack::initialize): Removed argument. (SharkStack::CreateStackOverflowCheck): Updated. (SharkStack::CreateCheckStack): Removed method. (SharkStack::frame_anchor_addr): Likewise. (SharkStack::last_Java_sp_addr): New method. (SharkStack::last_Java_fp_addr): New method. (SharkStack::CreateSetLastJavaFrame): Use new frame anchor code. (SharkStack::CreateResetLastJavaFrame): Likewise. (SharkStack::CreateAssertLastJavaSPIsNull): New method. * ports/hotspot/src/share/vm/shark/sharkStack.cpp (SharkStack::initialize): Updated for new stack overflow code. (SharkStack::CreateStackOverflowCheck): Likewise. (SharkStack::CreateCheckStack): Removed. (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated for new stack overflow code. (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise. (SharkStack::CreateAssertLastJavaSPIsNull): New method. * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp (SharkNativeWrapper::initialize): Whitespace fix. changeset 1de4376d0732 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1de4376d0732 author: Gary Benson date: Wed Jun 09 17:42:58 2010 +0100 PR icedtea/323: Remove now unnecessary hack. 2010-05-11 Gary Benson PR icedtea/323 * patches/hotspot/default/icedtea-shark.patch (Deoptimization::create_vframeArray): Remove a now- unnecessary hack. changeset 1852744c5c16 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1852744c5c16 author: Gary Benson date: Wed Jun 09 17:44:09 2010 +0100 PR icedtea/483: Fix signedness of T_BYTE and T_CHAR results 2010-05-13 Gary Benson PR icedtea/483 * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp (SharkNativeWrapper::initialize): Fix signedness of T_BYTE and T_CHAR results. changeset 86213d4d475a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=86213d4d475a author: Gary Benson date: Fri May 07 10:49:34 2010 +0100 Use new stack overflow code in Shark. 2010-05-07 Gary Benson * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp (SharkRuntime::uncommon_trap): Use new stack overflow code. (FakeStubFrame::build): Likewise. * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Updated. * ports/hotspot/src/share/vm/includeDB_shark: Likewise. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp (SharkDecacher::end_frame): Updated for newer HotSpot. changeset 254a1f83b7da in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=254a1f83b7da author: Gary Benson date: Fri May 14 13:55:26 2010 +0100 Fix PR icedtea/484: Method still in use can be marked as a zombie 2010-05-14 Gary Benson PR icedtea/484 * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (SharkBuilder::deoptimized_entry_point): New method. * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (SharkBuilder::uncommon_trap): Return int instead of void. (SharkBuilder::deoptimized_entry_point): New method. * ports/hotspot/src/share/vm/shark/sharkContext.cpp (SharkContext::SharkContext): Updated entry point types. * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp (SharkNativeWrapper::initialize): Make generated wrappers return 0 instead of void. * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp (SharkRuntime::uncommon_trap): Return int instead of void. * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp (SharkRuntime::uncommon_trap): Don't enter the interpreter, just return the number of frames that have been deoptimized. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::do_trap): Return the number of deoptimized frames instead of void. (SharkTopLevelBlock::handle_return): Return 0 instead of void. (SharkTopLevelBlock::do_call): Deoptimize where necessary. changeset 494ed9fb8215 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=494ed9fb8215 author: Gary Benson date: Fri May 14 17:37:29 2010 +0100 Fix stack leak in Shark This commit fixes a bug where having an exception handler in a loop would caused a little bit of stack to be allocated every time the handler was invoked. This code... int a = 23; int b = 0; while (true) { try { int c = a / b; } catch (ArithmeticException e) { // do nothing } } ...would eventually fail with a stack overflow. 2010-05-14 Gary Benson * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp (SharkCodeBuffer::inline_data): New method. * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (SharkBuilder::CreateInlineData): Likewise. * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::CreateInlineData): Likewise. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::handle_exception): Inline the exception handler table in the code buffer rather than creating it on the stack. changeset d7d97061baf3 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d7d97061baf3 author: Gary Benson date: Thu May 20 12:40:31 2010 +0100 PR icedtea/494: exception handlers not installed Speed up exception handling This commit fixes PR icedtea/494, a bug where some exception handlers were not installed. Shark relied on exception handler tables supplied by the TypeFlow pass, but it turns out that TypeFlow does not record all exceptions in its tables. Shark now builds its own tables. While implementing this I realised that the VM call carried out to figure out which exception handler to use is unnecessary in most cases. I've left the original code in, but added a fast path which bypasses a lot of the junk. 2010-05-20 Gary Benson PR icedtea/494 * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp (SharkCompileInvariants::java_lang_Throwable_klass): New method. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::_exc_handlers): New field. (SharkTopLevelBlock::_exceptions): Likewise. (SharkTopLevelBlock::compute_exceptions): New method. (SharkTopLevelBlock::num_exceptions): Rewritten. (SharkTopLevelBlock::exc_handler): New method. (SharkTopLevelBlock::exception): Rewritten. (SharkTopLevelBlock::marshal_exception_fast): New method. (SharkTopLevelBlock::marshal_exception_slow): Likewise. (SharkTopLevelBlock::handler_for_exception): Likewise. (SharkTopLevelBlock::make_trap): Likewise. * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp (SharkTopLevelBlock::enter): Compute exceptions on entry, and skip over any null handlers. (SharkTopLevelBlock::compute_exceptions): New method. (SharkTopLevelBlock::handle_exception): Rewritten. (SharkTopLevelBlock::marshal_exception_fast): New method. (SharkTopLevelBlock::marshal_exception_slow): Likewise. (SharkTopLevelBlock::handler_for_exception): Likewise. (SharkTopLevelBlock::make_trap): Likewise. (SharkTopLevelBlock::can_reach_helper): Skip over null handlers. diffstat: 17 files changed, 491 insertions(+), 190 deletions(-) ChangeLog | 116 +++++++ patches/hotspot/default/icedtea-shark.patch | 21 - ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 1 ports/hotspot/src/share/vm/includeDB_shark | 3 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 24 + ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 16 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 1 ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 11 ports/hotspot/src/share/vm/shark/sharkContext.cpp | 6 ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 7 ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 10 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 35 +- ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 4 ports/hotspot/src/share/vm/shark/sharkStack.cpp | 110 +++--- ports/hotspot/src/share/vm/shark/sharkStack.hpp | 41 +- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 246 +++++++++++---- ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 29 + diffs (truncated from 1092 to 500 lines): diff -r b645643e700f -r d7d97061baf3 ChangeLog --- a/ChangeLog Wed Jun 09 14:26:24 2010 +0100 +++ b/ChangeLog Thu May 20 12:40:31 2010 +0100 @@ -1,3 +1,109 @@ 2010-05-07 Deepak Bhole + + PR icedtea/494 + * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp + (SharkCompileInvariants::java_lang_Throwable_klass): New method. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::_exc_handlers): New field. + (SharkTopLevelBlock::_exceptions): Likewise. + (SharkTopLevelBlock::compute_exceptions): New method. + (SharkTopLevelBlock::num_exceptions): Rewritten. + (SharkTopLevelBlock::exc_handler): New method. + (SharkTopLevelBlock::exception): Rewritten. + (SharkTopLevelBlock::marshal_exception_fast): New method. + (SharkTopLevelBlock::marshal_exception_slow): Likewise. + (SharkTopLevelBlock::handler_for_exception): Likewise. + (SharkTopLevelBlock::make_trap): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::enter): Compute exceptions on entry, + and skip over any null handlers. + (SharkTopLevelBlock::compute_exceptions): New method. + (SharkTopLevelBlock::handle_exception): Rewritten. + (SharkTopLevelBlock::marshal_exception_fast): New method. + (SharkTopLevelBlock::marshal_exception_slow): Likewise. + (SharkTopLevelBlock::handler_for_exception): Likewise. + (SharkTopLevelBlock::make_trap): Likewise. + (SharkTopLevelBlock::can_reach_helper): Skip over null handlers. + +2010-05-14 Gary Benson + + * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp + (SharkCodeBuffer::inline_data): New method. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::CreateInlineData): Likewise. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::CreateInlineData): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::handle_exception): Inline the exception + handler table in the code buffer rather than creating it on + the stack. + +2010-05-14 Gary Benson + + PR icedtea/484 + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::deoptimized_entry_point): New method. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::uncommon_trap): Return int instead of void. + (SharkBuilder::deoptimized_entry_point): New method. + * ports/hotspot/src/share/vm/shark/sharkContext.cpp + (SharkContext::SharkContext): Updated entry point types. + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Make generated wrappers + return 0 instead of void. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::uncommon_trap): Return int instead of void. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::uncommon_trap): Don't enter the interpreter, + just return the number of frames that have been deoptimized. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::do_trap): Return the number of deoptimized + frames instead of void. + (SharkTopLevelBlock::handle_return): Return 0 instead of void. + (SharkTopLevelBlock::do_call): Deoptimize where necessary. + +2010-05-13 Gary Benson + + PR icedtea/483 + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Fix signedness of T_BYTE + and T_CHAR results. + +2010-05-11 Gary Benson + + PR icedtea/323 + * patches/hotspot/default/icedtea-shark.patch + (Deoptimization::create_vframeArray): + Remove a now-unnecessary hack. + +2010-05-10 Gary Benson + + PR icedtea/323 + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp + (SharkBuilder::throw_StackOverflowError): New method. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::throw_StackOverflowError): Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.hpp + (SharkStack::initialize): Removed argument. + (SharkStack::CreateStackOverflowCheck): Updated. + (SharkStack::CreateCheckStack): Removed method. + (SharkStack::frame_anchor_addr): Likewise. + (SharkStack::last_Java_sp_addr): New method. + (SharkStack::last_Java_fp_addr): New method. + (SharkStack::CreateSetLastJavaFrame): Use new frame anchor code. + (SharkStack::CreateResetLastJavaFrame): Likewise. + (SharkStack::CreateAssertLastJavaSPIsNull): New method. + * ports/hotspot/src/share/vm/shark/sharkStack.cpp + (SharkStack::initialize): Updated for new stack overflow code. + (SharkStack::CreateStackOverflowCheck): Likewise. + (SharkStack::CreateCheckStack): Removed. + (SharkStackWithNormalFrame::SharkStackWithNormalFrame): Updated + for new stack overflow code. + (SharkStackWithNativeFrame::SharkStackWithNativeFrame): Likewise. + (SharkStack::CreateAssertLastJavaSPIsNull): New method. + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp + (SharkNativeWrapper::initialize): Whitespace fix. + 2010-05-07 Deepak Bhole PR icedtea/436: @@ -31,6 +137,16 @@ 2010-05-06 Deepak Bhole + + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp + (SharkRuntime::uncommon_trap): Use new stack overflow code. + (FakeStubFrame::build): Likewise. + * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Updated. + * ports/hotspot/src/share/vm/includeDB_shark: Likewise. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::end_frame): Updated for newer HotSpot. 2010-05-05 Gary Benson diff -r b645643e700f -r d7d97061baf3 patches/hotspot/default/icedtea-shark.patch --- a/patches/hotspot/default/icedtea-shark.patch Wed Jun 09 14:26:24 2010 +0100 +++ b/patches/hotspot/default/icedtea-shark.patch Thu May 20 12:40:31 2010 +0100 @@ -279,27 +279,6 @@ diff -Nru openjdk.orig/hotspot/src/share UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord, caller_adjustment * BytesPerWord, -@@ -921,7 +928,20 @@ - // stuff a C2I adapter we can properly fill in the callee-save - // register locations. - frame caller = fr.sender(reg_map); -+#ifdef ZERO -+ int frame_size; -+ { -+ // In zero, frame::sp() is the *end* of the frame, so -+ // caller.sp() - fr.sp() is the size of the *caller*. -+ RegisterMap dummy_map(thread, false); -+ frame frame_1 = thread->last_frame(); -+ frame frame_2 = frame_1.sender(&dummy_map); -+ assert(frame_2.sp() == fr.sp(), "should be"); -+ frame_size = frame_2.sp() - frame_1.sp(); -+ } -+#else - int frame_size = caller.sp() - fr.sp(); -+#endif // ZERO - - frame sender = caller; - @@ -1073,7 +1093,7 @@ JRT_END diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Thu May 20 12:40:31 2010 +0100 @@ -47,6 +47,7 @@ define_pd_global(intx, Tier4BackEdge define_pd_global(intx, OnStackReplacePercentage, 933 ); define_pd_global(intx, FreqInlineSize, 325 ); +define_pd_global(intx, InlineSmallCode, 1000 ); define_pd_global(intx, NewRatio, 12 ); define_pd_global(intx, NewSizeThreadIncrease, 4*K ); define_pd_global(intx, InitialCodeCacheSize, 160*K); diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/includeDB_shark --- a/ports/hotspot/src/share/vm/includeDB_shark Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/includeDB_shark Thu May 20 12:40:31 2010 +0100 @@ -1,6 +1,6 @@ // // Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. -// Copyright 2008, 2009 Red Hat, Inc. +// Copyright 2008, 2009, 2010 Red Hat, Inc. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -273,6 +273,7 @@ sharkRuntime.cpp sharkRuntime.cpp llvmHeaders.hpp sharkRuntime.cpp klassOop.hpp sharkRuntime.cpp sharkRuntime.hpp +sharkRuntime.cpp stack_.inline.hpp sharkRuntime.cpp thread.hpp sharkRuntime.hpp allocation.hpp diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu May 20 12:40:31 2010 +0100 @@ -319,13 +319,21 @@ Value* SharkBuilder::osr_migration_end() return make_function((address) SharedRuntime::OSR_migration_end, "C", "v"); } -// Uncommon trap +// Semi-VM calls + +Value* SharkBuilder::throw_StackOverflowError() { + return make_function((address) ZeroStack::handle_overflow, "T", "v"); +} Value* SharkBuilder::uncommon_trap() { - return make_function((address) SharkRuntime::uncommon_trap, "Ti", "v"); + return make_function((address) SharkRuntime::uncommon_trap, "Ti", "i"); } -// Native-Java transition. +Value* SharkBuilder::deoptimized_entry_point() { + return make_function((address) CppInterpreter::main_loop, "iT", "v"); +} + +// Native-Java transition Value* SharkBuilder::check_special_condition_for_native_trans() { return make_function( @@ -538,6 +546,16 @@ Value* SharkBuilder::CreateInlineOop(job name); } +Value* SharkBuilder::CreateInlineData(void* data, + size_t size, + const Type* type, + const char* name) { + return CreateIntToPtr( + code_buffer_address(code_buffer()->inline_data(data, size)), + type, + name); +} + // Helpers for creating basic blocks. BasicBlock* SharkBuilder::GetBlockInsertionPoint() const { diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu May 20 12:40:31 2010 +0100 @@ -125,13 +125,15 @@ class SharkBuilder : public llvm::IRBuil llvm::Value* unsafe_field_offset_to_byte_offset(); llvm::Value* osr_migration_end(); - // Intrinsics and external functions, part 3: Uncommon trap. - // This is a special case in that it is invoked like a non-VM - // call but it does VM call stuff. This is acceptable so long - // as the method that calls uncommon_trap returns to its caller - // immediately that uncommon_trap returns. + // Intrinsics and external functions, part 3: semi-VM calls. + // These are special cases that do VM call stuff but are invoked + // as though they were normal calls. This is acceptable so long + // as the method that calls them returns to its immediately that + // the semi VM call returns. public: + llvm::Value* throw_StackOverflowError(); llvm::Value* uncommon_trap(); + llvm::Value* deoptimized_entry_point(); // Intrinsics and external functions, part 4: Native-Java transition. // This is a special case in that it is invoked during a thread @@ -192,6 +194,10 @@ class SharkBuilder : public llvm::IRBuil llvm::Value* CreateInlineOop(ciObject* object, const char* name = "") { return CreateInlineOop(object->encoding(), name); } + llvm::Value* CreateInlineData(void* data, + size_t size, + const llvm::Type* type, + const char* name = ""); // Helpers for creating basic blocks. // NB don't use unless SharkFunction::CreateBlock is unavailable. diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu May 20 12:40:31 2010 +0100 @@ -149,6 +149,7 @@ void SharkDecacher::end_frame() { pc_offset(), target(), bci(), + true, debug_info()->create_scope_values(locarray()), debug_info()->create_scope_values(exparray()), debug_info()->create_monitor_values(monarray())); diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp --- a/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp Thu May 20 12:40:31 2010 +0100 @@ -73,4 +73,15 @@ class SharkCodeBuffer : public StackObj masm()->store_oop(object); return offset; } + + // Inline a block of non-oop data into the buffer and return its offset. + public: + int inline_data(void *src, size_t size) const { + masm()->align(BytesPerWord); + int offset = masm()->offset(); + void *dst = masm()->pc(); + masm()->advance(size); + memcpy(dst, src, size); + return offset; + } }; diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkContext.cpp --- a/ports/hotspot/src/share/vm/shark/sharkContext.cpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkContext.cpp Thu May 20 12:40:31 2010 +0100 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2009 Red Hat, Inc. + * Copyright 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -76,14 +76,14 @@ SharkContext::SharkContext(const char* n params.push_back(methodOop_type()); params.push_back(intptr_type()); params.push_back(thread_type()); - _entry_point_type = FunctionType::get(void_type(), params, false); + _entry_point_type = FunctionType::get(jint_type(), params, false); params.clear(); params.push_back(methodOop_type()); params.push_back(PointerType::getUnqual(jbyte_type())); params.push_back(intptr_type()); params.push_back(thread_type()); - _osr_entry_point_type = FunctionType::get(void_type(), params, false); + _osr_entry_point_type = FunctionType::get(jint_type(), params, false); // Create mappings for (int i = 0; i < T_CONFLICT; i++) { diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkInvariants.hpp --- a/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp Thu May 20 12:40:31 2010 +0100 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008, 2009 Red Hat, Inc. + * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -93,10 +93,13 @@ class SharkCompileInvariants : public Re return builder()->code_buffer(); } - // That well-known class... + // Commonly used classes protected: ciInstanceKlass* java_lang_Object_klass() const { return env()->Object_klass(); + } + ciInstanceKlass* java_lang_Throwable_klass() const { + return env()->Throwable_klass(); } }; diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp --- a/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Thu May 20 12:40:31 2010 +0100 @@ -99,7 +99,7 @@ void SharkNativeWrapper::initialize(cons builder()->CreateStore( builder()->CreateInlineOop( JNIHandles::make_local( - target()->method_holder()->klass_part()->java_mirror())), + target()->method_holder()->klass_part()->java_mirror())), oop_tmp_slot()); param_types.push_back(box_type); @@ -283,7 +283,7 @@ void SharkNativeWrapper::initialize(cons builder()->SetInsertPoint(exception); CreateResetHandleBlock(); stack()->CreatePopFrame(0); - builder()->CreateRetVoid(); + builder()->CreateRet(LLVMValue::jint_constant(0)); builder()->SetInsertPoint(no_exception); @@ -327,11 +327,11 @@ void SharkNativeWrapper::initialize(cons needs_cast = true; break; - case T_BYTE: + case T_CHAR: needs_cast = true; break; - case T_CHAR: + case T_BYTE: case T_SHORT: needs_cast = true; is_signed = true; @@ -348,5 +348,5 @@ void SharkNativeWrapper::initialize(cons result_addr, PointerType::getUnqual(SharkType::to_stackType(result_type)))); } - builder()->CreateRetVoid(); + builder()->CreateRet(LLVMValue::jint_constant(0)); } diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp --- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Thu May 20 12:40:31 2010 +0100 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008, 2009 Red Hat, Inc. + * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -192,13 +192,15 @@ bool SharkRuntime::is_subtype_of(klassOo return object_klass->klass_part()->is_subtype_of(check_klass); } -void SharkRuntime::uncommon_trap(JavaThread* thread, int trap_request) { +int SharkRuntime::uncommon_trap(JavaThread* thread, int trap_request) { + Thread *THREAD = thread; + // In C2, uncommon_trap_blob creates a frame, so all the various // deoptimization functions expect to find the frame of the method - // being deopted one frame down on the stack. Create a dummy frame - // to mirror this. - ZeroStack *stack = thread->zero_stack(); - thread->push_zero_frame(FakeStubFrame::build(stack)); + // being deopted one frame down on the stack. We create a dummy + // frame to mirror this. + FakeStubFrame *stubframe = FakeStubFrame::build(CHECK_0); + thread->push_zero_frame(stubframe); // Initiate the trap thread->set_last_Java_frame(); @@ -214,11 +216,13 @@ void SharkRuntime::uncommon_trap(JavaThr int number_of_frames = urb->number_of_frames(); for (int i = 0; i < number_of_frames; i++) { intptr_t size = urb->frame_sizes()[i]; - thread->push_zero_frame(InterpreterFrame::build(stack, size)); + InterpreterFrame *frame = InterpreterFrame::build(size, CHECK_0); + thread->push_zero_frame(frame); } // Push another dummy frame - thread->push_zero_frame(FakeStubFrame::build(stack)); + stubframe = FakeStubFrame::build(CHECK_0); + thread->push_zero_frame(stubframe); // Fill in the skeleton frames thread->set_last_Java_frame(); @@ -228,18 +232,13 @@ void SharkRuntime::uncommon_trap(JavaThr // Pop our dummy frame thread->pop_zero_frame(); - // Jump into the interpreter -#ifdef CC_INTERP - CppInterpreter::main_loop(number_of_frames - 1, thread); -#else - Unimplemented(); -#endif // CC_INTERP + // Fall back into the interpreter + return number_of_frames; } -FakeStubFrame* FakeStubFrame::build(ZeroStack* stack) { - if (header_words > stack->available_words()) { - Unimplemented(); - } +FakeStubFrame* FakeStubFrame::build(TRAPS) { + ZeroStack *stack = ((JavaThread *) THREAD)->zero_stack(); + stack->overflow_check(header_words, CHECK_NULL); stack->push(0); // next_frame, filled in later intptr_t *fp = stack->sp(); diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkRuntime.hpp --- a/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Thu May 20 12:40:31 2010 +0100 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008, 2009 Red Hat, Inc. + * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -79,5 +79,5 @@ class SharkRuntime : public AllStatic { public: static void dump(const char *name, intptr_t value); static bool is_subtype_of(klassOop check_klass, klassOop object_klass); - static void uncommon_trap(JavaThread* thread, int trap_request); + static int uncommon_trap(JavaThread* thread, int trap_request); }; diff -r b645643e700f -r d7d97061baf3 ports/hotspot/src/share/vm/shark/sharkStack.cpp --- a/ports/hotspot/src/share/vm/shark/sharkStack.cpp Wed Jun 09 14:26:24 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkStack.cpp Thu May 20 12:40:31 2010 +0100 @@ -28,7 +28,9 @@ using namespace llvm; -void SharkStack::initialize(Value* method, bool setup_sp_and_method) { +void SharkStack::initialize(Value* method) { + bool setup_sp_and_method = (method != NULL); + int locals_words = max_locals(); int extra_locals = locals_words - arg_size(); From andrew at icedtea.classpath.org Fri Jun 11 05:57:19 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 11 Jun 2010 12:57:19 +0000 Subject: /hg/icedtea: 4 new changesets Message-ID: changeset 85ec20ad5e63 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=85ec20ad5e63 author: Xerxes R?nby date: Fri Jun 11 13:08:48 2010 +0100 Use full path to jar application to avoid relying on the one on the path. 2010-06-01 Xerxes R?nby * Makefile.am: (rewrite-rhino.stamp): Use full path to jar application to avoid relying on the one on the path. changeset 3f0dad02b228 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3f0dad02b228 author: Jon VanAlten date: Fri Jun 04 14:20:15 2010 -0400 PR icedtea/438: Fix bug in PulseAudio backend http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438 * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Pulse AudioLine.java: (isControlSupported): Correctly determine if control-type is supported. * Makefile.am (stamps/icedtea.stamp): Add PulseAudio sources to src.zip changeset 57b31ab89534 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=57b31ab89534 author: Andrew John Hughes date: Fri Jun 11 13:26:35 2010 +0100 Make BOOT_BUILD_OUTPUT_DIR absolute and drop unneeded ICEDTEA_BUILD_DIR{,_BOOT}. 2010-06-07 Andrew John Hughes Make BOOT_BUILD_OUTPUT_DIR absolute and dispense with ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ. * Makefile.am: (ICEDTEA_BUILD_DIR): Dropped. (ECJ_BUILD_OUTPUT_DIR): Make absolute. (ICEDTEA_CLS_DIR_BOOT): Make relative to ECJ_BUILD_OUTPUT_DIR. (ICEDTEA_BUILD_DIR_BOOT): Dropped. (bootstrap- directory.stamp): Use BOOT_BUILD_OUTPUT_DIR rather than ICEDTEA_BUILD_DIR_BOOT. Remove unneeded $(abs_top_builddir). (icedtea-debug.stamp): Add pulse java src.zip update. (ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR with BUILD_OUTPUT_DIR. (check- hotspot): Replace unneeded use of pwd. (check-jdk): Likewise. (check-langtools): Likewise. changeset c3af7166afc4 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c3af7166afc4 author: Andrew John Hughes date: Fri Jun 11 13:56:52 2010 +0100 Use build directories outside the source tree and make lightweight copies of external source trees where possible. 2010-04-26 Andrew John Hughes Use build directories outside the source tree and use lightweight copies for external source trees where possible. * Makefile.am: (OS_DIR): Removed. (BUILD_DIR): Set to openjdk.build. (BUILD_OUTPUT_DIR): Use BUILD_DIR. (BOOT_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-boot'. (ICEDTEA_ENV): Set output directory. (ICEDTEA_ENV_BOOT): Likewise. (clean-icedtea): Simplify by just removing BUILD_OUTPUT_DIR. (clean-icedtea-boot): Likewise, but BOOT_BUILD_OUTPUT_DIR is removed. (extract-openjdk.stamp): Use lightweight copies where possible. (generated.stamp): Likewise. (liveconnect-dist.stamp): Likewise. (netx- dist.stamp): Likewise. (plugin-tests.stamp): Likewise. diffstat: 3 files changed, 99 insertions(+), 56 deletions(-) ChangeLog | 55 +++++ Makefile.am | 96 ++++------ pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 4 diffs (326 lines): diff -r d7d97061baf3 -r c3af7166afc4 ChangeLog --- a/ChangeLog Thu May 20 12:40:31 2010 +0100 +++ b/ChangeLog Fri Jun 11 13:56:52 2010 +0100 @@ -1,3 +1,58 @@ 2010-05-20 Gary Benson + + Use build directories outside the source + tree and use lightweight copies for external + source trees where possible. + * Makefile.am: + (OS_DIR): Removed. + (BUILD_DIR): Set to openjdk.build. + (BUILD_OUTPUT_DIR): Use BUILD_DIR. + (BOOT_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-boot'. + (ICEDTEA_ENV): Set output directory. + (ICEDTEA_ENV_BOOT): Likewise. + (clean-icedtea): Simplify by just removing BUILD_OUTPUT_DIR. + (clean-icedtea-boot): Likewise, but BOOT_BUILD_OUTPUT_DIR is removed. + (extract-openjdk.stamp): Use lightweight copies where possible. + (generated.stamp): Likewise. + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + +2010-06-07 Andrew John Hughes + + Make BOOT_BUILD_OUTPUT_DIR absolute and dispense + with ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ. + * Makefile.am: + (ICEDTEA_BUILD_DIR): Dropped. + (ECJ_BUILD_OUTPUT_DIR): Make absolute. + (ICEDTEA_CLS_DIR_BOOT): Make relative to ECJ_BUILD_OUTPUT_DIR. + (ICEDTEA_BUILD_DIR_BOOT): Dropped. + (bootstrap-directory.stamp): Use BOOT_BUILD_OUTPUT_DIR + rather than ICEDTEA_BUILD_DIR_BOOT. Remove unneeded + $(abs_top_builddir). + (icedtea-debug.stamp): Add pulse java src.zip update. + (ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR + with BUILD_OUTPUT_DIR. + (check-hotspot): Replace unneeded use of pwd. + (check-jdk): Likewise. + (check-langtools): Likewise. + +2010-06-04 Jon VanAlten + + PR icedtea/438 + * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java: + (isControlSupported): Correctly determine if control-type is + supported. + * Makefile.am + (stamps/icedtea.stamp): Add PulseAudio sources to src.zip + +2010-06-01 Xerxes R??nby + + * Makefile.am: + (rewrite-rhino.stamp): Use full path to + jar application to avoid relying on the one + on the path. + 2010-05-20 Gary Benson PR icedtea/494 diff -r d7d97061baf3 -r c3af7166afc4 Makefile.am --- a/Makefile.am Thu May 20 12:40:31 2010 +0100 +++ b/Makefile.am Fri Jun 11 13:56:52 2010 +0100 @@ -59,28 +59,17 @@ HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot # Build directories -OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR) -BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR) +BUILD_DIR = openjdk.build +BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR) DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug -BOOT_BUILD_OUTPUT_DIR = openjdk-boot/build/$(OS_DIR) -ICEDTEA_BUILD_DIR = \ - $(abs_top_builddir)/$(BUILD_OUTPUT_DIR) -ICEDTEA_BOOT_DIR= \ - $(abs_top_builddir)/bootstrap/jdk1.6.0 -ICEDTEA_RT = \ - $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar -NETX_CLASSES = \ - $(abs_top_builddir)/netx.build -NETX_JAR = \ - $(NETX_CLASSES)/lib/classes.jar -NETX_SRC = \ - $(NETX_CLASSES)/lib/src.zip -ICEDTEA_ENDORSED_DIR = \ - $(ICEDTEA_BOOT_DIR)/lib/endorsed -ICEDTEA_BUILD_DIR_BOOT = \ - $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/ -ICEDTEA_CLS_DIR_BOOT = \ - $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/classes +BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot +ICEDTEA_BOOT_DIR= $(abs_top_builddir)/bootstrap/jdk1.6.0 +ICEDTEA_RT = $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar +NETX_CLASSES = $(abs_top_builddir)/netx.build +NETX_JAR = $(NETX_CLASSES)/lib/classes.jar +NETX_SRC = $(NETX_CLASSES)/lib/src.zip +ICEDTEA_ENDORSED_DIR = $(ICEDTEA_BOOT_DIR)/lib/endorsed +ICEDTEA_CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -521,7 +510,8 @@ ICEDTEA_ENV = \ DEBUG_CLASSFILES="true" \ DEBUG_BINARIES="true" \ DISABLE_INTREE_EC="true" \ - ALT_DROPS_DIR="$(abs_top_builddir)/drops" + ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ + ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" if WITH_CACAO ICEDTEA_ENV += \ @@ -564,7 +554,8 @@ ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \ JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \ DISABLE_NIMBUS="true" \ - NO_DOCS="true" + NO_DOCS="true" \ + ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)" # Source files @@ -1182,7 +1173,7 @@ clean-extract: clean-extract-openjdk cle stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp if OPENJDK_SRC_DIR_FOUND - cp -a $(OPENJDK_SRC_DIR) openjdk + cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk else set -e ; \ if ! test -d openjdk ; then \ @@ -1427,7 +1418,7 @@ stamps/generated.stamp: stamps/ports.sta stamps/generated.stamp: stamps/ports.stamp set -e ; \ if [ ! -e $(abs_top_builddir)/generated ]; then \ - cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \ + cp -pPR --reflink=auto $(abs_top_srcdir)/generated $(abs_top_builddir); \ find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';'; \ fi @@ -1741,11 +1732,9 @@ clean-bootstrap-directory-stage1: # bootstrap/stage2. stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp rm -rf bootstrap/icedtea - ln -s \ - $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ \ - bootstrap/icedtea + ln -s $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ bootstrap/icedtea if ! test -d bootstrap/icedtea/include; then \ - ln -sf $(ICEDTEA_BUILD_DIR_BOOT)/include bootstrap/icedtea/include; \ + ln -sf $(BOOT_BUILD_OUTPUT_DIR)/include bootstrap/icedtea/include; \ fi mkdir -p stamps touch $@ @@ -1815,6 +1804,8 @@ if ENABLE_PULSE_JAVA $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext cp -pPRf pulse-java.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif if JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ @@ -1887,6 +1878,8 @@ if ENABLE_PULSE_JAVA $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext cp -pPRf pulse-java.jar \ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif if JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ @@ -1934,11 +1927,7 @@ endif touch $@ clean-icedtea: - if [ -e $(abs_top_builddir)/openjdk ]; then \ - $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV) \ - -C openjdk clobber ; \ - fi + rm -rf $(BUILD_OUTPUT_DIR) rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ @@ -1994,12 +1983,8 @@ else @echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image endif -clean-icedtea-boot: - if [ -e $(abs_top_builddir)/openjdk-boot ]; then \ - $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV_BOOT) \ - -C openjdk-boot clobber ; \ - fi +clean-icedtea-boot: + rm -rf $(BOOT_BUILD_OUTPUT_DIR) rm -f stamps/icedtea-boot.stamp stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp @@ -2085,7 +2070,7 @@ stamps/liveconnect-dist.stamp: stamps/li (cd $(LIVECONNECT_CLASSES) ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $(LIVECONNECT_JAR) $(LIVECONNECT_DIR) ; \ - cp -a $(PLUGIN_SRCDIR)/java src; \ + cp -pPR --reflink=auto $(PLUGIN_SRCDIR)/java src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ZIP) -qr $(LIVECONNECT_SRC) ${LIVECONNECT_DIR} ) ; \ @@ -2122,7 +2107,7 @@ stamps/netx-dist.stamp: stamps/netx.stam (cd $(NETX_CLASSES) ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $(NETX_JAR) javax/jnlp net ; \ - cp -a $(NETX_SRCDIR) src; \ + cp -pPR --reflink=auto $(NETX_SRCDIR) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ICEDTEA_BOOT_DIR)/bin/jar uf $(NETX_JAR) \ @@ -2237,7 +2222,7 @@ stamps/rewrite-rhino.stamp: stamps/rewri stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) if WITH_RHINO mkdir -p rhino/rhino.{old,new} && \ - (cd rhino/rhino.old && jar xf $(RHINO_JAR)) && \ + (cd rhino/rhino.old && $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \ $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ com.redhat.rewriter.ClassRewriter \ $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \ @@ -2413,10 +2398,10 @@ ADD_ZERO_CONFIGURE_ARGS += \ $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz)) ADD_ZERO_EXTRA_BUILD_ENV = \ - BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \ - BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \ - BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \ - BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \ + BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \ + BUILD_JAXP=false ALT_JAXP_DIST=$(BUILD_OUTPUT_DIR)/jaxp/dist \ + BUILD_JAXWS=false ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \ + BUILD_CORBA=false ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \ BUILD_JDK=false \ DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))' @@ -2434,13 +2419,13 @@ if ADD_ZERO_BUILD if ZERO_BUILD mkdir -p $(BUILD_JRE_ARCH_DIR)/shark - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/shark/ printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg else mkdir -p $(BUILD_JRE_ARCH_DIR)/zero - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg @@ -2474,12 +2459,12 @@ if ADD_ZERO_BUILD if ZERO_BUILD mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/shark/ printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg else mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -2507,7 +2492,8 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST -classpath $(LIVECONNECT_JAR) $(PLUGIN_TEST_SRCS) ; $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ plugin/tests/LiveConnect/*.class ; - cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; + cp -pPR --reflink-auto $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \ + plugin/tests/LiveConnect ; echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \ mkdir -p stamps touch stamps/plugin-tests.stamp @@ -2538,7 +2524,7 @@ check-hotspot: stamps/jtreg.stamp mkdir -p test/hotspot/JTwork test/hotspot/JTreport $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/hotspot/JTwork -r:test/hotspot/JTreport \ - -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/hotspot/test \ | tee test/$@.log @@ -2548,7 +2534,7 @@ check-langtools: stamps/jtreg.stamp $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/langtools/JTwork -r:test/langtools/JTreport \ $${ICEDTEA_JTREG_OTHERVM:--samevm} \ - -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ $(ICEDTEA_JTREG_OPTIONS) \ -exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \ `pwd`/openjdk/langtools/test \ @@ -2562,7 +2548,7 @@ endif $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \ -w:test/jdk/JTwork -r:test/jdk/JTreport \ $${ICEDTEA_JTREG_OTHERVM:--samevm} \ - -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \ + -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ $(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \ -exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \ `pwd`/openjdk/jdk/test \ diff -r d7d97061baf3 -r c3af7166afc4 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java --- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Thu May 20 12:40:31 2010 +0100 +++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Fri Jun 11 13:56:52 2010 +0100 @@ -102,7 +102,9 @@ abstract class PulseAudioLine implements @Override public boolean isControlSupported(Type control) { for (Control myControl : controls) { - if (myControl.getType().getClass() == control.getClass()) { + //Control.Type's known descendants keep a set of + //static Types. + if (myControl.getType().equals(control)) { return true; } } From andrew at icedtea.classpath.org Fri Jun 11 06:46:00 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 11 Jun 2010 13:46:00 +0000 Subject: /hg/icedtea6: Drop old dependencies of rt.stamp that are no long... Message-ID: changeset be0a17ddbdb8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be0a17ddbdb8 author: Andrew John Hughes date: Fri Jun 11 14:45:52 2010 +0100 Drop old dependencies of rt.stamp that are no longer needed. 2010-06-11 Andrew John Hughes * Makefile.am: (rt.stamp): Drop old dependencies no longer needed. diffstat: 2 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 3 +-- diffs (26 lines): diff -r fa0ad887008c -r be0a17ddbdb8 ChangeLog --- a/ChangeLog Mon Jun 07 19:43:40 2010 +0100 +++ b/ChangeLog Fri Jun 11 14:45:52 2010 +0100 @@ -1,3 +1,9 @@ 2010-06-07 Andrew John Hughes + + * Makefile.am: + (rt.stamp): Drop old dependencies no + longer needed. + 2010-06-07 Andrew John Hughes Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR diff -r fa0ad887008c -r be0a17ddbdb8 Makefile.am --- a/Makefile.am Mon Jun 07 19:43:40 2010 +0100 +++ b/Makefile.am Fri Jun 11 14:45:52 2010 +0100 @@ -2055,8 +2055,7 @@ clean-rt: rm -f rt-source-files.txt cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT) -stamps/rt.stamp: stamps/rt-class-files.stamp stamps/bootstrap-directory-ecj.stamp \ - stamps/liveconnect.stamp +stamps/rt.stamp: stamps/rt-class-files.stamp mkdir -p stamps if LACKS_SUN_AWT_TOOLKIT $(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \ From ahughes at redhat.com Fri Jun 11 07:13:52 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 15:13:52 +0100 Subject: SPARC support Message-ID: Does anyone know if SPARC on GNU/Linux support currently works in IcedTea, or for which releases it did work? We have some local RPM patches for it that change the include directives: -#include +#include and replacing the current IcedTea fix: -+#if defined(__sparc__) && defined(__arch64__) -+# include -+#else -+# include -+#endif I seem to remember something about sparc and sparc64 support being merged together in the kernel, which is what this would suggest. I'm trying to work out if it's worth bringing over these patches. Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From doko at ubuntu.com Fri Jun 11 07:28:13 2010 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 11 Jun 2010 16:28:13 +0200 Subject: SPARC support In-Reply-To: References: Message-ID: <4C1247FD.1000705@ubuntu.com> just check it, you have access to a sparc box running sparc-linux and sparc64-linux ;-) Matthias On 11.06.2010 16:13, Andrew John Hughes wrote: > Does anyone know if SPARC on GNU/Linux support currently works in > IcedTea, or for which releases it did work? > > We have some local RPM patches for it that change the include directives: > > -#include > +#include > > and replacing the current IcedTea fix: > > -+#if defined(__sparc__)&& defined(__arch64__) > -+# include > -+#else > -+# include > -+#endif > > I seem to remember something about sparc and sparc64 support being > merged together in the kernel, which is what this would suggest. I'm > trying to work out if it's worth bringing over these patches. > > Thanks, From Tomas.Hurka at Sun.COM Fri Jun 11 07:51:19 2010 From: Tomas.Hurka at Sun.COM (Tomas Hurka) Date: Fri, 11 Jun 2010 16:51:19 +0200 Subject: Release Schedule In-Reply-To: <4C11F6A1.7070305@ubuntu.com> References: <4C11F6A1.7070305@ubuntu.com> Message-ID: On 11 Jun 2010, at 10:41, Matthias Klose wrote: [..] >> A couple of changes I plan for this release are updating the CACAO >> build to use the development branch: see >> http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=139 >> and dropping VisualVM, which I believe is broken anyway. VisualVM >> will be migrated to its own repository. >> >> I'd like to make the same VisualVM change with IcedTea6 HEAD in due >> course. > > agreed. Did we hear back from VisualVM upstream to provide a > visualvm project on IcedTea.classpath.org? I am sorry, I do not understand what this is all about. What do you want to hear? Bye, -- Tomas Hurka NetBeans Profiler http://profiler.netbeans.org VisualVM http://visualvm.dev.java.net Software Engineer, Developer Platforms Group Sun Microsystems, Praha Czech Republic From ahughes at redhat.com Fri Jun 11 08:53:42 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 16:53:42 +0100 Subject: SPARC support In-Reply-To: <4C1247FD.1000705@ubuntu.com> References: <4C1247FD.1000705@ubuntu.com> Message-ID: On 11 June 2010 15:28, Matthias Klose wrote: > just check it, you have access to a sparc box running sparc-linux and > sparc64-linux ;-) > Yeah, I know, I plan to do that before the releases ;-) But I could do with some background info. on if things are broken, and if so, when that happened. Also, making a change for newer kernels may break older systems. That said, it seems the patches I was looking at were copied from Fedora a while back, and they haven't actually been using there since F9. And there have been successful builds since: http://sparc.koji.fedoraproject.org/koji/packageinfo?packageID=8220 > ?Matthias > > On 11.06.2010 16:13, Andrew John Hughes wrote: >> >> Does anyone know if SPARC on GNU/Linux support currently works in >> IcedTea, or for which releases it did work? >> >> We have some local RPM patches for it that change the include directives: >> >> -#include >> +#include >> >> and replacing the current IcedTea fix: >> >> -+#if defined(__sparc__)&& ?defined(__arch64__) >> -+# include >> -+#else >> -+# include >> -+#endif >> >> I seem to remember something about sparc and sparc64 support being >> merged together in the kernel, which is what this would suggest. ?I'm >> trying to work out if it's worth bringing over these patches. >> >> Thanks, > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Jun 11 08:57:32 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 11 Jun 2010 16:57:32 +0100 Subject: Release Schedule In-Reply-To: References: <4C11F6A1.7070305@ubuntu.com> Message-ID: On 11 June 2010 15:51, Tomas Hurka wrote: > > On 11 Jun 2010, at 10:41, Matthias Klose wrote: > [..] >>> >>> A couple of changes I plan for this release are updating the CACAO >>> build to use the development branch: see >>> http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=139 >>> and dropping VisualVM, which I believe is broken anyway. ?VisualVM >>> will be migrated to its own repository. >>> >>> I'd like to make the same VisualVM change with IcedTea6 HEAD in due >>> course. >> >> agreed. Did we hear back from VisualVM upstream to provide a visualvm >> project on IcedTea.classpath.org? > > I am sorry, I do not understand what this is all about. What do you want to > hear? > I'm not sure what Matthias wants to hear. We're planning to move VisualVM support out of IcedTea to its own project, so you'd provide patches for that rather than IcedTea. It should make things easier for you I would have thought as you can just use an installed JDK and not build one to test the Visual VM build. It also breaks this link between the version of IcedTea and the version of NetBeans, which causes problems with updating IcedTea builds on older platforms. > Bye, > -- > Tomas Hurka ? > NetBeans Profiler http://profiler.netbeans.org > VisualVM http://visualvm.dev.java.net > Software Engineer, Developer Platforms Group > Sun Microsystems, Praha Czech Republic > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From Tomas.Hurka at Sun.COM Fri Jun 11 09:14:14 2010 From: Tomas.Hurka at Sun.COM (Tomas Hurka) Date: Fri, 11 Jun 2010 18:14:14 +0200 Subject: Release Schedule In-Reply-To: References: <4C11F6A1.7070305@ubuntu.com> Message-ID: Hi Andrew, On 11 Jun 2010, at 17:57, Andrew John Hughes wrote: >>> agreed. Did we hear back from VisualVM upstream to provide a >>> visualvm >>> project on IcedTea.classpath.org? >> >> I am sorry, I do not understand what this is all about. What do you >> want to >> hear? > > I'm not sure what Matthias wants to hear. We're planning to move > VisualVM support out of IcedTea to its own project, so you'd provide > patches for that rather than IcedTea. It should make things easier > for you I would have thought as you can just use an installed JDK and > not build one to test the VisualVM build. It also breaks this link > between the version of IcedTea and the version of NetBeans, which > causes problems with updating IcedTea builds on older platforms. Thanks for the explanation. I am fine with this solution. If you need any help, please let me know. Bye, -- Tomas Hurka NetBeans Profiler http://profiler.netbeans.org VisualVM http://visualvm.dev.java.net Software Engineer, Developer Platforms Group Sun Microsystems, Praha Czech Republic From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 09:58:37 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 16:58:37 +0000 Subject: [Bug 445] FMJstudio Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=445 ------- Comment #1 from omajid at redhat.com 2010-06-11 16:58 ------- Could you post any additional details to help reproduce this issue? I downloaded and tried out fmjstudio using the sample fmjstudio-linux-amd64.sh binary and it worked perfectly fine in playing an audio. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 11:14:25 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 18:14:25 +0000 Subject: [Bug 443] Iceweasel freezes and is unresponsive Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=443 ------- Comment #1 from asu at redhat.com 2010-06-11 18:14 ------- Hello, Could you provide us with more information as to which version of the plugin you are using. Also the site does not seem to be available. --Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 11:45:05 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 18:45:05 +0000 Subject: [Bug 120] icedtea segfaults while compiling openproj from source Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=120 ------- Comment #13 from jon.vanalten at redhat.com 2010-06-11 18:45 ------- I am unable to reproduce this crash with current IcedTea6. $ java -version java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-38.b18.fc12-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) Using openproj 1.4 source tarball, once I drop in newer proguard 3.7 jar as noted in Comment #6 build is able to complete. Is this still a problem for anyone else? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 12:04:18 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 19:04:18 +0000 Subject: [Bug 120] icedtea segfaults while compiling openproj from source Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=120 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution| |INVALID ------- Comment #14 from gnu_andrew at member.fsf.org 2010-06-11 19:04 ------- >From reading the comments, It was unreproducable at the time and that's over two years ago and before OpenJDK6. Closing as INVALID. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 12:18:14 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 19:18:14 +0000 Subject: [Bug 443] Iceweasel freezes and is unresponsive Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=443 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea6 |Plugin ------- Comment #2 from gnu_andrew at member.fsf.org 2010-06-11 19:18 ------- As Andrew says, your original report is not very specific. Can you please report the version given in about:plugins? Assuming by Debian 5.0, you mean you are tracking the stable version then that has a very old version of IcedTea6 (and thus the plugin): $ java -version java version "1.6.0_0" OpenJDK Runtime Environment (build 1.6.0_0-b11) OpenJDK Client VM (build 1.6.0_0-b11, mixed mode, sharing) IceCat 3.6 will not even work with the old plugin provided by this version. We do not support this old plugin any more. I suggest reporting this to bugs.debian.org first as they will know more about exactly what is shipping with Debian and about any backports that may have been done. If you feel up to the task, you can build a version of IcedTea6 1.8 which includes the new plugin. See http://icedtea.classpath.org for instructions. Reassigning this to plugin on the assumption it's the old plugin we no longer supported that's at fault. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 13:30:31 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 20:30:31 +0000 Subject: [Bug 299] eclipse crashes during file download in a tomcat test scenario Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=299 jon.vanalten at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID ------- Comment #4 from jon.vanalten at redhat.com 2010-06-11 20:30 ------- Please reopen if more information is available to reproduce this bug. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 13:46:43 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 20:46:43 +0000 Subject: [Bug 426] normal Eclipse update crash (SIGSEGV) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=426 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID ------- Comment #3 from asu at redhat.com 2010-06-11 20:46 ------- Unable to reproduce and no further instructions given by reporter on steps to recreate this scenario, closing as invalid. If steps can be given to reproduce this error on the latest version of icedtea, feel free to reopen. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 11 14:08:40 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 11 Jun 2010 21:08:40 +0000 Subject: [Bug 376] Cannot create GC thread. Out of system resources. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=376 ------- Comment #3 from GavinFlower at yahoo.com 2010-06-11 21:08 ------- I have upgraded my whole system since I raised this, and you have updated your software. So I think this can be closed. If I have any more problems, I will raise appropriate bug reports. Thanks. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Fri Jun 11 17:24:30 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sat, 12 Jun 2010 00:24:30 +0000 Subject: /hg/icedtea: Incorporate more Zero fixes and the NSS debug fix f... Message-ID: changeset b636f1c1c06b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b636f1c1c06b author: Andrew John Hughes date: Sat Jun 12 01:24:21 2010 +0100 Incorporate more Zero fixes and the NSS debug fix from the forest. 2010-06-12 Andrew John Hughes * Makefile.am: Bump HotSpot and JDK changeset IDs and SHA256 checksums to incorporate recent Zero fixes and NSS error output fix. diffstat: 2 files changed, 11 insertions(+), 4 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 8 ++++---- diffs (40 lines): diff -r c3af7166afc4 -r b636f1c1c06b ChangeLog --- a/ChangeLog Fri Jun 11 13:56:52 2010 +0100 +++ b/ChangeLog Sat Jun 12 01:24:21 2010 +0100 @@ -1,3 +1,10 @@ 2010-04-26 Andrew John Hughes + + * Makefile.am: + Bump HotSpot and JDK changeset IDs and + SHA256 checksums to incorporate recent + Zero fixes and NSS error output fix. + 2010-04-26 Andrew John Hughes Use build directories outside the source diff -r c3af7166afc4 -r b636f1c1c06b Makefile.am --- a/Makefile.am Fri Jun 11 13:56:52 2010 +0100 +++ b/Makefile.am Sat Jun 12 01:24:21 2010 +0100 @@ -3,18 +3,18 @@ OPENJDK_VERSION = b89 OPENJDK_VERSION = b89 CORBA_CHANGESET = e805b4155d76 -HOTSPOT_CHANGESET = de6965fd4cc5 +HOTSPOT_CHANGESET = 5a92a37da3b9 JAXP_CHANGESET = 826bafcb6c4a JAXWS_CHANGESET = 1661166c82dc -JDK_CHANGESET = 3d1a836736bf +JDK_CHANGESET = 2dead33effe1 LANGTOOLS_CHANGESET = 681f1f51926f OPENJDK_CHANGESET = 195fcceefddc CORBA_SHA256SUM = 870e2eac993a4eef48197ed7309cab176b56a994add1de215a026599052627cb -HOTSPOT_SHA256SUM = be6833f5e7a30091173a7099da9bae304df9e0868403b05660c10a574b4fd2fc +HOTSPOT_SHA256SUM = f3dbd5689769cac89951a2e762db6ad2365942f7f99d69c33e96874622f09d7d JAXP_SHA256SUM = 42d004e51a1f01d146ad230ce48996ddf8da3719fe571a41653f431d6b2e8a7b JAXWS_SHA256SUM = 4523909cd46fd61b5c6670bf932099d5899236a37a4058e7b2bcb855e503a0e4 -JDK_SHA256SUM = 637372a089a1d50dc85d098e8b897d01e001730dd0ed94a6d347243272dedeeb +JDK_SHA256SUM = ef0d2624d6844516ac079483ea576623733ce0f27fd57bb359ffe07f7c4ac60f LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d948a07204904f6ce60e363bd0516e22f1cae830aba84f8 OPENJDK_SHA256SUM = 93c536e6bc4e962050a00321e88e694fc4e0000e2ad887b8de22830bfda2649f From andrew at icedtea.classpath.org Sat Jun 12 17:41:21 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 13 Jun 2010 00:41:21 +0000 Subject: /hg/icedtea6-hg: 3 new changesets Message-ID: changeset be0a17ddbdb8 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=be0a17ddbdb8 author: Andrew John Hughes date: Fri Jun 11 14:45:52 2010 +0100 Drop old dependencies of rt.stamp that are no longer needed. 2010-06-11 Andrew John Hughes * Makefile.am: (rt.stamp): Drop old dependencies no longer needed. changeset 183783e975ca in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=183783e975ca author: Andrew John Hughes date: Sun Jun 13 01:39:55 2010 +0100 Add generated Nimbus files so we can build SynthUI during bootstrap. 2010-06-13 Andrew John Hughes * generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.jav a, * generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditable State.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter. java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.ja va, * generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java, * generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java, * generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.j ava, * generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneClose ButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneClose ButtonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconi fyButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconi fyButtonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim izeButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim izeButtonWindowMaximizedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim izeButtonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuB uttonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuB uttonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePaint er.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindo wFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedS tate.java, * generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java, * generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java, * generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java, * generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java, * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOption PaneLabelPainter.java, * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainte r.java, * generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java, * generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java, * generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.j ava, * generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.ja va, * generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateSta te.java, * generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter. java, * generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java , * generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java, * generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState. java, * generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState. java, * generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.ja va, * generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormatte dTextFieldPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainte r.java, * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.jav a, * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalSta te.java, * generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java , * generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.ja va, * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter. java, * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedSt ate.java, * generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneStat e.java, * generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter. java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TreePainter.java: Add generated Nimbus files so SynthUI can be compiled during bootstrap. changeset f7f32c0c87c1 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f7f32c0c87c1 author: Andrew John Hughes date: Sun Jun 13 01:41:08 2010 +0100 Merge diffstat: 112 files changed, 40319 insertions(+), 15618 deletions(-) ChangeLog | 199 Makefile.am | 76 generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java | 119 generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java | 653 generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java | 163 generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java | 636 generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java | 42 generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java | 477 generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java | 42 generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java | 734 generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java | 255 generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java | 160 generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java | 351 generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java | 125 generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java | 2249 generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java | 403 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java | 464 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java | 607 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java | 1046 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java | 518 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java | 41 generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java | 41 generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java | 108 generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java | 153 generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java | 108 generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java | 158 generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java | 1773 generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java | 584 generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java | 164 generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java | 613 generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java | 172 generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java | 705 generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java | 381 generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java | 88 generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java | 380 generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java | 276 generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java | 179 generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java | 88 generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java | 655 generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java | 230 generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java | 583 generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java | 321 generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java | 505 generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java | 290 generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java | 41 generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java | 41 generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java | 93 generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java | 221 generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java | 678 generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java | 135 generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java | 141 generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java | 381 generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java | 42 generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java | 41 generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java | 412 generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java | 125 generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java | 706 generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java | 289 generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java | 212 generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java | 536 generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java | 151 generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java | 144 generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java | 146 generated/com/sun/java/swing/plaf/nimbus/TreePainter.java | 653 hotspot.map | 1 patches/ecj/icedtea.patch | 134 patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch | 42 patches/hotspot/hs17/params-cast-size_t.patch | 252 patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch | 14 patches/hotspot/hs17/systemtap.patch | 157 patches/hotspot/original/params-cast-size_t.patch | 252 patches/hotspot/original/shark_do_nothing_on_stub_frame.patch | 15 patches/hotspot/original/systemtap.patch | 182 patches/icedtea-alpha-fixes.patch | 24 patches/icedtea-clean-crypto.patch | 91 patches/icedtea-doc-headers.patch | 181 patches/icedtea-java2d-dasher.patch | 11 patches/icedtea-jtreg-jrunscript.patch | 26 patches/icedtea-nio2.patch | 269 patches/icedtea-nomotif-6706121.patch |26836 +++++----- patches/icedtea-sh4-support.patch | 212 patches/openjdk/6616792-focus-tests-fix.patch | 1117 patches/openjdk/6798572-iso-8859-15-fix.patch | 10 patches/openjdk/6896472-missing_libjsig.patch | 20 patches/params-cast-size_t.patch | 252 patches/shark_do_nothing_on_stub_frame.patch | 14 patches/systemtap.patch | 157 patches/xrender/icedtea-000.patch | 112 diffs (truncated from 58082 to 500 lines): diff -r fa0ad887008c -r f7f32c0c87c1 ChangeLog --- a/ChangeLog Mon Jun 07 19:43:40 2010 +0100 +++ b/ChangeLog Sun Jun 13 01:41:08 2010 +0100 @@ -1,3 +1,139 @@ 2010-06-07 Andrew John Hughes + + * generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java, + * generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java, + * generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreePainter.java: + Add generated Nimbus files so SynthUI can be compiled during + bootstrap. + +2010-06-11 Andrew John Hughes + + * Makefile.am: + (rt.stamp): Drop old dependencies no + longer needed. + +2010-06-10 Andrew John Hughes + + * patches/icedtea-doc-headers.patch: + Dropped, upstream file has completely changed. + May need to be recreated, may not. + * patches/icedtea-java2d-dasher.patch: + Upstreamed by Omair as 6793344. Now in OpenJDK6. + * Makefile.am: + Remove above patches. + (JAXWS_DROP_URL): Updated. + (JAXWS_DROP_ZIP): Likewise. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAF_DROP_URL): Added. + (JAF_DROP_ZIP): Updated. + (JAF_DROP_SHA256SUM): Likewise. + (JAXP_DROP_URL): Updated. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (download-jaf-drop): Use specific JAF_DROP_URL, + not JAXWS_DROP_URL. + * patches/icedtea-nio2.patch: Converted to use + new doc generation makefile. + +2010-06-08 Andrew John Hughes + + Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ + made obsolete by previous merge. Use --reflink=auto instead + of -l to avoid cross-device issues. + * Makefile.am: + (ICEDTEA_ENV): Fix use of ICEDTEA_BUILD_DIR. + (ICEDTEA_ENV_ECJ): Fix use of ICEDTEA_BUILD_DIR_ECJ. + (distclean-local): Fix use of ICEDTEA_BUILD_DIR + and ICEDTEA_BUILD_DIR_ECJ. + (extract-openjdk.stamp): Use --reflink=auto instead + of -l. + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + 2010-06-07 Andrew John Hughes Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR @@ -32,6 +168,13 @@ 2010-06-07 Jon VanAlten + + * patches/icedtea-alpha-fixes.patch: + Remove upstreamed JDK portion. + * patches/icedtea-sh4-support.patch: + Recreated against upstreamed alpha patch. + 2010-06-04 Jon VanAlten * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java: @@ -43,11 +186,21 @@ 2010-06-01 Xerxes R??nby * Makefile.am: - (extra-lib/about.jar): Remove redundant + (extra-lib/about.jar): Remove redundant conditional that we don't need any more. (rewrite-rhino.stamp): Use full path to jar application to avoid relying on the one on the path. + +2010-05-26 Andrew John Hughes + + * patches/ecj/icedtea.patch, + * patches/icedtea-clean-crypto.patch, + * patches/icedtea-jtreg-jrunscript.patch, + * patches/icedtea-nio2.patch, + * patches/icedtea-nomotif-6706121.patch, + * patches/xrender/icedtea-000.patch: + Update after changes to licensing headers. 2010-05-28 Andrew John Hughes @@ -74,6 +227,30 @@ 2010-05-24 Andrew John Hughes + + Remove hs17 build option as this is now the default. + * patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch: + Dropped; applied upstream. + * patches/hotspot/hs17/params-cast-size_t.patch, + * patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch, + * patches/hotspot/hs17/systemtap.patch: + Moved to top-level. + * patches/hotspot/original/params-cast-size_t.patch, + * patches/hotspot/original/shark_do_nothing_on_stub_frame.patch, + * patches/hotspot/original/systemtap.patch: + Dropped; hs16 is dead. + * patches/openjdk/6896472-missing_libjsig.patch: + Dropped; applied upstream. + * Makefile.am: + Remove differentation between original and hs17 build patches + as only build is now the hs17 one in the OpenJDK repository. + * hotspot.map: Drop hs17. + * patches/params-cast-size_t.patch, + * patches/shark_do_nothing_on_stub_frame.patch, + * patches/systemtap.patch: + Moved from hs17 to top-level. 2010-05-20 Gary Benson @@ -265,7 +442,7 @@ 2010-05-10 Gary Benson + + Use build directories outside the source + tree and link instead of copying external + source trees where possible. + * Makefile.am: + (OS_DIR): Removed. + (BUILD_OUTPUT_DIR): Set to openjdk.build. + (ECJ_BUILD_OUTPUT_DIR): Set to openjdk-ecj.build. + (ICEDTEA_ENV): Set output directory. + (ICEDTEA_ENV_ECJ): Likewise. + (distclean-local): Remove build directories. + (extract-openjdk.stamp): Link instead of copying + where possible. + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. 2010-04-24 Matthias Klose diff -r fa0ad887008c -r f7f32c0c87c1 Makefile.am --- a/Makefile.am Mon Jun 07 19:43:40 2010 +0100 +++ b/Makefile.am Sun Jun 13 01:41:08 2010 +0100 @@ -18,23 +18,23 @@ VISUALVM_URL = https://visualvm.dev.java VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/ VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz -JAXWS_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download -JAXWS_DROP_ZIP = jdk6-jaxws-2009_10_27.zip -JAXWS_DROP_SHA256SUM = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2 -JAF_DROP_ZIP = jdk6-jaf-2009_10_27.zip -JAF_DROP_SHA256SUM = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f -JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147491 -JAXP_DROP_ZIP = jdk6-jaxp-2010_01_15.zip -JAXP_DROP_SHA256SUM = 181615cfec1c3721a7d8f278fa25b392be4247a496c7774a10cb9df37684f94f +JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724 +JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip +JAXWS_DROP_SHA256SUM = 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb +JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725 +JAF_DROP_ZIP = jdk6-jaf-b20.zip +JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 +JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648 +JAXP_DROP_ZIP = jdk6-jaxp-b20.zip +JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6 # Build directories -OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR) -BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR) +BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk.build DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug -ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj/build/$(OS_DIR) +ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj.build ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes ICEDTEA_BOOT_DIR= \ @@ -177,11 +177,12 @@ else MEMORY_LIMIT = endif +ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(ICEDTEA_DEBUG_BUILD_DIR)" if WITH_CACAO ICEDTEA_BUILD_TARGET=j2se_only - ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only + ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only else - ICEDTEA_DEBUG_BUILD_TARGET=debug_build + ICEDTEA_DEBUG_BUILD_TARGET += debug_build endif # FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap @@ -217,7 +218,7 @@ ICEDTEA_FSG_PATCHES = ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ - patches/hotspot/$(HSBUILD)/shark_do_nothing_on_stub_frame.patch \ + patches/shark_do_nothing_on_stub_frame.patch \ patches/icedtea-notice-safepoints.patch \ patches/icedtea-parisc-opt.patch \ patches/icedtea-lucene-crash.patch \ @@ -253,7 +254,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-alt-jar.patch \ patches/icedtea-jdk-use-ssize_t.patch \ patches/icedtea-use-idx_t.patch \ - patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \ + patches/params-cast-size_t.patch \ patches/icedtea-clean-crypto.patch \ patches/icedtea-shark.patch \ patches/icedtea-arch.patch \ @@ -265,14 +266,12 @@ ICEDTEA_PATCHES = \ patches/icedtea-testenv.patch \ patches/icedtea-samejvm-safe.patch \ patches/icedtea-pr261.patch \ - patches/icedtea-doc-headers.patch \ patches/icedtea-sparc-buildfixes.patch \ patches/icedtea-sparc64-linux.patch \ patches/icedtea-sparc-ptracefix.patch \ patches/icedtea-sparc-trapsfix.patch \ patches/icedtea-demo-swingapplet.patch \ patches/icedtea-awt-window-size.patch \ - patches/icedtea-java2d-dasher.patch \ patches/icedtea-jtreg-6592792.patch \ patches/icedtea-s390-noinline.patch \ patches/icedtea-jtreg-dnd.patch \ @@ -294,16 +293,7 @@ ICEDTEA_PATCHES = \ patches/extensions/netx.patch \ patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ - patches/icedtea-jtreg-httpTest.patch \ - patches/nss-debug.patch \ - patches/openjdk/6616792-focus-tests-fix.patch \ - patches/openjdk/6798572-iso-8859-15-fix.patch - -if WITH_ALT_HSBUILD -ICEDTEA_PATCHES += \ - patches/openjdk/6896472-missing_libjsig.patch \ - patches/hotspot/$(HSBUILD)/6873059-javac-versioning-hotspot.patch -endif + patches/icedtea-jtreg-httpTest.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -351,7 +341,7 @@ endif endif if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/systemtap.patch \ +ICEDTEA_PATCHES += patches/systemtap.patch \ patches/systemtap-gcc-4.5.patch endif @@ -447,7 +437,8 @@ ICEDTEA_ENV = \ ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ VERBOSE="$(VERBOSE)" \ ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" + ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ + ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" if WITH_CACAO ICEDTEA_ENV += \ @@ -488,6 +479,7 @@ endif # OpenJDK ecj build environment. ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \ + ALT_OUTPUTDIR="$(ECJ_BUILD_OUTPUT_DIR)" \ JAVA_TOOLS_DIR="$(ICEDTEA_BOOT_DIR)/bin" \ ICEDTEA_RT="$(ICEDTEA_RT)" \ ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \ @@ -542,7 +534,9 @@ distclean-local: clean-copy clean-jtreg rm -rf lib rm -rf extra-lib rm -rf openjdk-ecj + rm -rf $(ECJ_BUILD_OUTPUT_DIR) rm -rf openjdk + rm -rf $(BUILD_OUTPUT_DIR) rm -rf visualvm rm -rf netbeans @@ -647,7 +641,7 @@ endif then \ mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \ fi ; \ - $(WGET) $(JAXWS_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \ + $(WGET) $(JAF_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \ if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \ | $(SHA256SUM) --check ; \ then echo "ERROR: Bad download of jaf drop zip"; false; \ @@ -809,7 +803,7 @@ clean-extract: stamps/extract-openjdk.stamp: stamps/download.stamp if OPENJDK_SRC_DIR_FOUND - cp -a $(OPENJDK_SRC_DIR) openjdk + cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk else set -e ; \ if ! test -d openjdk ; \ @@ -1542,7 +1536,7 @@ stamps/liveconnect-dist.stamp: stamps/li (cd $(abs_top_builddir)/liveconnect ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \ - cp -a $(LIVECONNECT_SRCS) src; \ + cp -pPR --reflink=auto $(LIVECONNECT_SRCS) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip $(LIVECONNECT_DIR) ) ; \ @@ -1578,7 +1572,7 @@ stamps/netx-dist.stamp: stamps/netx.stam (cd $(abs_top_builddir)/netx.build ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \ - cp -a $(NETX_SRCDIR) src; \ + cp -pPR --reflink=auto $(NETX_SRCDIR) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \ @@ -1868,12 +1862,12 @@ if ADD_ZERO_BUILD if ZERO_BUILD mkdir -p $(BUILD_JRE_ARCH_DIR)/shark - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/shark/ printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg else mkdir -p $(BUILD_JRE_ARCH_DIR)/zero - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1898,12 +1892,12 @@ if ADD_ZERO_BUILD if ZERO_BUILD mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/shark/ printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg else mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero - cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1929,8 +1923,9 @@ stamps/plugin-tests.stamp: $(INITIAL_BOO $(PLUGIN_TEST_SRCS) ; $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ plugin/tests/LiveConnect/*.class ; - cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; - echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \ + cp -pPR --reflink=auto $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \ + plugin/tests/LiveConnect ; + echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; mkdir -p stamps touch stamps/plugin-tests.stamp endif @@ -2055,8 +2050,7 @@ clean-rt: rm -f rt-source-files.txt cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT) -stamps/rt.stamp: stamps/rt-class-files.stamp stamps/bootstrap-directory-ecj.stamp \ - stamps/liveconnect.stamp +stamps/rt.stamp: stamps/rt-class-files.stamp mkdir -p stamps if LACKS_SUN_AWT_TOOLKIT $(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \ diff -r fa0ad887008c -r f7f32c0c87c1 generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java Sun Jun 13 01:41:08 2010 +0100 @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2005, 2006, 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 From andrew at icedtea.classpath.org Sun Jun 13 16:21:55 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 13 Jun 2010 23:21:55 +0000 Subject: /hg/icedtea6-hg: Make source & target 1.6 when building Nimbus t... Message-ID: changeset 609c64d51922 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=609c64d51922 author: Andrew John Hughes date: Mon Jun 14 00:21:47 2010 +0100 Make source & target 1.6 when building Nimbus to allow @Override on interfaces. 2010-06-13 Andrew John Hughes * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/D efaultSelectorProvider.java: Removed, provided upstream. * Makefile.am: Add new nimbus-source-target.patch. * patches/ecj/bootver.patch: Always set required version to 1.5, don't bother checking DISABLE_NIMBUS. * patches/nimbus-source-target.patch: Fix source/target options for Nimbus sources to 6, due to presence of @Override on interfaces. diffstat: 5 files changed, 39 insertions(+), 59 deletions(-) ChangeLog | 10 ++ Makefile.am | 3 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java | 49 ---------- patches/ecj/bootver.patch | 14 +- patches/nimbus-source-target.patch | 22 ++++ diffs (136 lines): diff -r f7f32c0c87c1 -r 609c64d51922 ChangeLog --- a/ChangeLog Sun Jun 13 01:41:08 2010 +0100 +++ b/ChangeLog Mon Jun 14 00:21:47 2010 +0100 @@ -1,3 +1,13 @@ 2010-06-13 Andrew John Hughes + + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java: + Removed, provided upstream. + * Makefile.am: Add new nimbus-source-target.patch. + * patches/ecj/bootver.patch: Always set required version to 1.5, + don't bother checking DISABLE_NIMBUS. + * patches/nimbus-source-target.patch: Fix source/target options + for Nimbus sources to 6, due to presence of @Override on interfaces. + 2010-06-13 Andrew John Hughes * generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java, diff -r f7f32c0c87c1 -r 609c64d51922 Makefile.am --- a/Makefile.am Sun Jun 13 01:41:08 2010 +0100 +++ b/Makefile.am Mon Jun 14 00:21:47 2010 +0100 @@ -293,7 +293,8 @@ ICEDTEA_PATCHES = \ patches/extensions/netx.patch \ patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ - patches/icedtea-jtreg-httpTest.patch + patches/icedtea-jtreg-httpTest.patch \ + patches/nimbus-source-target.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r f7f32c0c87c1 -r 609c64d51922 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java --- a/overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java Sun Jun 13 01:41:08 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* - * Copyright 2001-2002 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. - */ - -package sun.nio.ch; - -import java.nio.channels.spi.SelectorProvider; - - -/** - * Creates this platform's default SelectorProvider - */ - -public class DefaultSelectorProvider { - - /** - * Prevent instantiation. - */ - private DefaultSelectorProvider() { } - - /** - * Returns the default SelectorProvider. - */ - public static SelectorProvider create() { - return new sun.nio.ch.WindowsSelectorProvider(); - } - -} diff -r f7f32c0c87c1 -r 609c64d51922 patches/ecj/bootver.patch --- a/patches/ecj/bootver.patch Sun Jun 13 01:41:08 2010 +0100 +++ b/patches/ecj/bootver.patch Mon Jun 14 00:21:47 2010 +0100 @@ -1,18 +1,14 @@ diff -r b202c79afde3 make/common/shared/ -diff -r b202c79afde3 make/common/shared/Platform.gmk ---- openjdk-ecj.orig/jdk/make/common/shared/Platform.gmk Thu Dec 10 13:04:13 2009 -0800 -+++ openjdk-ecj/jdk/make/common/shared/Platform.gmk Tue Dec 15 16:19:38 2009 +0000 -@@ -89,8 +89,13 @@ +diff -r b6701047e287 make/common/shared/Platform.gmk +--- openjdk-ecj.orig/jdk/make/common/shared/Platform.gmk Sat Jun 12 00:15:32 2010 +0100 ++++ openjdk-ecj/jdk/make/common/shared/Platform.gmk Sun Jun 13 23:54:02 2010 +0100 +@@ -88,8 +88,8 @@ SYSTEM_UNAME := $(shell uname) -# Normal boot jdk is previous release, but a hard requirement is a 1.6 boot +-REQUIRED_BOOT_VER = 1.6 +# Normal boot jdk is previous release, but a hard requirement is a 1.5 boot -+# without Nimbus or a 1.6 boot with -+ifdef DISABLE_NIMBUS +REQUIRED_BOOT_VER = 1.5 -+else - REQUIRED_BOOT_VER = 1.6 -+endif # If we are using freetype, this is the required version REQUIRED_FREETYPE_VERSION=2.3.0 diff -r f7f32c0c87c1 -r 609c64d51922 patches/nimbus-source-target.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/nimbus-source-target.patch Mon Jun 14 00:21:47 2010 +0100 @@ -0,0 +1,22 @@ +--- openjdk.orig/jdk/make/javax/swing/Makefile 2010-06-13 20:19:57.324427433 +0100 ++++ openjdk/jdk/make/javax/swing/Makefile 2010-06-13 20:19:57.161043101 +0100 +@@ -35,6 +35,8 @@ + NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/generatenimbus.jar + + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # + # Files +--- openjdk.orig/jdk/make/javax/swing/plaf/Makefile 2010-06-13 20:19:58.277416821 +0100 ++++ openjdk/jdk/make/javax/swing/plaf/Makefile 2010-06-13 20:19:58.121793675 +0100 +@@ -29,6 +29,8 @@ + SWING_SRC = $(SHARE_SRC)/classes/javax/swing + + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # + # Files From bugzilla-daemon at icedtea.classpath.org Mon Jun 14 06:18:05 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 14 Jun 2010 13:18:05 +0000 Subject: [Bug 376] Cannot create GC thread. Out of system resources. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=376 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME ------- Comment #4 from asu at redhat.com 2010-06-14 13:18 ------- Closing as worksforme. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Mon Jun 14 08:27:56 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 14 Jun 2010 15:27:56 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset 2877f76472f7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2877f76472f7 author: Andrew John Hughes date: Mon Jun 14 13:41:26 2010 +0100 Check that cp supports --reflink and use only if it does. 2010-06-14 Andrew John Hughes * Makefile.am: (REFLINK): Set to --reflink=auto if CP_SUPPORTS_REFLINK is defined. (extract-openjdk.stamp): Replace --reflink=auto with $(REFLINK). (generated.stamp): Likewise. (liveconnect-dist.stamp): Likewise. (netx-dist.stamp): Likewise. * acinclude.m4: (IT_CP_SUPPORTS_REFLINK): New macro to check for a cp new enough to have --reflink. * configure.ac: Invoke IT_CP_SUPPORTS_REFLINK. changeset 7dd1a3ba46d2 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7dd1a3ba46d2 author: Andrew John Hughes date: Mon Jun 14 16:27:40 2010 +0100 Hard link external OpenJDK source directories if possible, and check that ${OPENJDK_SRC_DIR}/README exists. 2010-06-14 Andrew John Hughes * Makefile.am: (REFLINK): Remove unneeded quotation. (OPENJDK_SRC_DIR_LINK): Use reflink only if hard linking is not possible. * acinclude.m4: (IT_CP_SUPPORTS_REFLINK): Define once only. (WITH_OPENJDK_SRC_DIR): Define once only. Check that directory is valid (to the extent this is discernable by the README being present) and whether hardlinking is possible, defining OPENJDK_SRC_DIR_HARDLINKABLE if it is. diffstat: 4 files changed, 89 insertions(+), 12 deletions(-) ChangeLog | 30 ++++++++++++++++++++++++++++++ Makefile.am | 18 ++++++++++++++---- acinclude.m4 | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- configure.ac | 1 + diffs (175 lines): diff -r b636f1c1c06b -r 7dd1a3ba46d2 ChangeLog --- a/ChangeLog Sat Jun 12 01:24:21 2010 +0100 +++ b/ChangeLog Mon Jun 14 16:27:40 2010 +0100 @@ -1,3 +1,33 @@ 2010-06-12 Andrew John Hughes + + * Makefile.am: + (REFLINK): Remove unneeded quotation. + (OPENJDK_SRC_DIR_LINK): Use reflink only + if hard linking is not possible. + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): Define once only. + (WITH_OPENJDK_SRC_DIR): Define once only. + Check that directory is valid (to the extent + this is discernable by the README being present) + and whether hardlinking is possible, defining + OPENJDK_SRC_DIR_HARDLINKABLE if it is. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (REFLINK): Set to --reflink=auto if + CP_SUPPORTS_REFLINK is defined. + (extract-openjdk.stamp): Replace --reflink=auto + with $(REFLINK). + (generated.stamp): Likewise. + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): New macro to check + for a cp new enough to have --reflink. + * configure.ac: + Invoke IT_CP_SUPPORTS_REFLINK. + 2010-06-12 Andrew John Hughes * Makefile.am: diff -r b636f1c1c06b -r 7dd1a3ba46d2 Makefile.am --- a/Makefile.am Sat Jun 12 01:24:21 2010 +0100 +++ b/Makefile.am Mon Jun 14 16:27:40 2010 +0100 @@ -234,6 +234,16 @@ else BOOTSTRAP_DIRECTORY_STAMP = ICEDTEA_HOME = $(SYSTEM_JDK_DIR) INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage2.stamp +endif + +if CP_SUPPORTS_REFLINK + REFLINK = --reflink=auto +endif + +if OPENJDK_SRC_DIR_HARDLINKABLE + OPENJDK_SRC_DIR_LINK = -l +else + OPENJDK_SRC_DIR_LINK = $(REFLINK) endif # Target to ensure a patched OpenJDK tree containing Zero & Shark @@ -1173,7 +1183,7 @@ clean-extract: clean-extract-openjdk cle stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp if OPENJDK_SRC_DIR_FOUND - cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk + cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk else set -e ; \ if ! test -d openjdk ; then \ @@ -1418,7 +1428,7 @@ stamps/generated.stamp: stamps/ports.sta stamps/generated.stamp: stamps/ports.stamp set -e ; \ if [ ! -e $(abs_top_builddir)/generated ]; then \ - cp -pPR --reflink=auto $(abs_top_srcdir)/generated $(abs_top_builddir); \ + cp -pPR $(REFLINK) $(abs_top_srcdir)/generated $(abs_top_builddir); \ find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';'; \ fi @@ -2070,7 +2080,7 @@ stamps/liveconnect-dist.stamp: stamps/li (cd $(LIVECONNECT_CLASSES) ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $(LIVECONNECT_JAR) $(LIVECONNECT_DIR) ; \ - cp -pPR --reflink=auto $(PLUGIN_SRCDIR)/java src; \ + cp -pPR $(REFLINK) $(PLUGIN_SRCDIR)/java src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ZIP) -qr $(LIVECONNECT_SRC) ${LIVECONNECT_DIR} ) ; \ @@ -2107,7 +2117,7 @@ stamps/netx-dist.stamp: stamps/netx.stam (cd $(NETX_CLASSES) ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $(NETX_JAR) javax/jnlp net ; \ - cp -pPR --reflink=auto $(NETX_SRCDIR) src; \ + cp -pPR $(REFLINK) $(NETX_SRCDIR) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ICEDTEA_BOOT_DIR)/bin/jar uf $(NETX_JAR) \ diff -r b636f1c1c06b -r 7dd1a3ba46d2 acinclude.m4 --- a/acinclude.m4 Sat Jun 12 01:24:21 2010 +0100 +++ b/acinclude.m4 Mon Jun 14 16:27:40 2010 +0100 @@ -234,23 +234,59 @@ AC_DEFUN([FIND_JAVA], AC_SUBST(JAVA) ]) -AC_DEFUN([WITH_OPENJDK_SRC_DIR], +AC_DEFUN_ONCE([IT_CP_SUPPORTS_REFLINK], [ - AC_MSG_CHECKING(for an OpenJDK source directory) + AC_CACHE_CHECK([if cp supports --reflink], it_cv_reflink, [ + touch tmp.$$ + if cp --reflink=auto tmp.$$ tmp2.$$ >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_reflink=yes; + else + it_cv_reflink=no; + fi + rm -f tmp.$$ tmp2.$$ + ]) + AM_CONDITIONAL([CP_SUPPORTS_REFLINK], test x"${it_cv_reflink}" = "xyes") +]) + +AC_DEFUN_ONCE([WITH_OPENJDK_SRC_DIR], +[ + DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk + AC_MSG_CHECKING([for an OpenJDK source directory]) AC_ARG_WITH([openjdk-src-dir], [AS_HELP_STRING(--with-openjdk-src-dir,specify the location of the openjdk sources)], [ OPENJDK_SRC_DIR=${withval} - AC_MSG_RESULT(${withval}) - conditional_with_openjdk_sources=true + with_external_src_dir=true ], [ - conditional_with_openjdk_sources=false - OPENJDK_SRC_DIR=`pwd`/openjdk - AC_MSG_RESULT(${OPENJDK_SRC_DIR}) + OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR} + with_external_src_dir=false ]) + AC_MSG_RESULT(${OPENJDK_SRC_DIR}) AC_SUBST(OPENJDK_SRC_DIR) - AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue) + if test "x${with_external_src_dir}" = "xtrue"; then + AC_MSG_CHECKING([if ${OPENJDK_SRC_DIR}/README exists]) + if test -f ${OPENJDK_SRC_DIR}/README; then + openjdk_src_dir_valid=yes; + else + openjdk_src_dir_valid="no, resetting to ${DEFAULT_SRC_DIR}"; + OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR} + with_external_src_dir=false + fi + AC_MSG_RESULT(${openjdk_src_dir_valid}) + if test "x${openjdk_src_dir_valid}" = "xyes"; then + AC_MSG_CHECKING([if we can hard link rather than copy the OpenJDK source directory]) + if cp -l ${OPENJDK_SRC_DIR}/README tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then + openjdk_src_dir_hardlinkable=yes; + else + openjdk_src_dir_hardlinkable=no; + fi + AC_MSG_RESULT(${openjdk_src_dir_hardlinkable}) + rm -f tmp.$$ + fi + fi + AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${with_external_src_dir}" = "xtrue") + AM_CONDITIONAL(OPENJDK_SRC_DIR_HARDLINKABLE, test "x${openjdk_src_dir_hardlinkable}" = "xyes") ]) AC_DEFUN([FIND_ECJ_JAR], diff -r b636f1c1c06b -r 7dd1a3ba46d2 configure.ac --- a/configure.ac Sat Jun 12 01:24:21 2010 +0100 +++ b/configure.ac Mon Jun 14 16:27:40 2010 +0100 @@ -48,6 +48,7 @@ AC_PATH_TOOL([LINUX32],[linux32]) AC_PATH_TOOL([LINUX32],[linux32]) AC_CHECK_GCC_VERSION IT_FIND_NUMBER_OF_PROCESSORS +IT_CP_SUPPORTS_REFLINK AC_MSG_CHECKING([for a NetBeans installation]) AC_ARG_WITH([netbeans-home], From bugzilla-daemon at icedtea.classpath.org Mon Jun 14 08:54:47 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 14 Jun 2010 15:54:47 +0000 Subject: [Bug 450] TinyLaF 1.4.0 generated gui rendered incorrect using IcedTea6 1.8pre (6b18~pre1-1ubuntu1) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=450 ------- Comment #2 from asu at redhat.com 2010-06-14 15:54 ------- Some additional differences, -Window size is a bit wider compared to sun java -the "ok" button is shown as "..." (see this by going to Menu > Dialogs > ErrorDialogs) This happens in other areas that use the OK button. -The checkboxes make a dot in the bottom right corner of the box when hovering over it instead of a yellow-orangy interior border. -Similar to the above, buttons do not have the border drawn properly as well. (yellow-orangy boarder only show top and bottom lines, missing left and right side.) -Menu radio buttons are shown as a dot rather than a circle with a dot. (Look at Menu > Test Menu) -Similarly to the above the item "RadioButtonMenuItem w/ icon" shows a dot with an icon instead of circle dot with icon. -font seems different too. Sun Java -> sharper, Openjdk -> more smooth (anti-aliasing?) The comparison was done with the following versions java version "1.6.0_20" Java(TM) SE Runtime Environment (build 1.6.0_20-b02) Java HotSpot(TM) 64-Bit Server VM (build 16.3-b01, mixed mode) java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-39.b18.fc13-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Mon Jun 14 09:17:29 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 14 Jun 2010 16:17:29 +0000 Subject: /hg/icedtea: Hardlink to files in the source directory from the ... Message-ID: changeset 731f4c50030c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=731f4c50030c author: Andrew John Hughes date: Mon Jun 14 17:17:14 2010 +0100 Hardlink to files in the source directory from the build directory, if possible. 2010-06-14 Andrew John Hughes * Makefile.am: (SRC_DIR_LINK): Use reflink only if hard linking is not possible. (generated.stamp): Replace $(REFLINK) with $(SRC_DIR_LINK). (liveconnect-dist.stamp): Likewise. (netx-dist.stamp): Likewise. * acinclude.m4: (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking to files in the source directory from the build directory is possible. * configure.ac: Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE. diffstat: 4 files changed, 41 insertions(+), 3 deletions(-) ChangeLog | 18 ++++++++++++++++++ Makefile.am | 12 +++++++++--- acinclude.m4 | 13 +++++++++++++ configure.ac | 1 + diffs (108 lines): diff -r 7dd1a3ba46d2 -r 731f4c50030c ChangeLog --- a/ChangeLog Mon Jun 14 16:27:40 2010 +0100 +++ b/ChangeLog Mon Jun 14 17:17:14 2010 +0100 @@ -1,9 +1,27 @@ 2010-06-14 Andrew John Hughes + + * Makefile.am: + (SRC_DIR_LINK): Use reflink only if hard + linking is not possible. + (generated.stamp): Replace $(REFLINK) with + $(SRC_DIR_LINK). + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + * acinclude.m4: + (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking + to files in the source directory from the build directory + is possible. + * configure.ac: + Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE. + 2010-06-14 Andrew John Hughes * Makefile.am: (REFLINK): Remove unneeded quotation. (OPENJDK_SRC_DIR_LINK): Use reflink only if hard linking is not possible. + (extract-openjdk.stamp): Replace $(REFLINK) + with $(OPENJDK_SRC_DIR_LINK). * acinclude.m4: (IT_CP_SUPPORTS_REFLINK): Define once only. (WITH_OPENJDK_SRC_DIR): Define once only. diff -r 7dd1a3ba46d2 -r 731f4c50030c Makefile.am --- a/Makefile.am Mon Jun 14 16:27:40 2010 +0100 +++ b/Makefile.am Mon Jun 14 17:17:14 2010 +0100 @@ -244,6 +244,12 @@ if OPENJDK_SRC_DIR_HARDLINKABLE OPENJDK_SRC_DIR_LINK = -l else OPENJDK_SRC_DIR_LINK = $(REFLINK) +endif + +if SRC_DIR_HARDLINKABLE + SRC_DIR_LINK = -l +else + SRC_DIR_LINK = $(REFLINK) endif # Target to ensure a patched OpenJDK tree containing Zero & Shark @@ -1428,7 +1434,7 @@ stamps/generated.stamp: stamps/ports.sta stamps/generated.stamp: stamps/ports.stamp set -e ; \ if [ ! -e $(abs_top_builddir)/generated ]; then \ - cp -pPR $(REFLINK) $(abs_top_srcdir)/generated $(abs_top_builddir); \ + cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/generated $(abs_top_builddir); \ find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \ -o -type d -exec chmod 750 '{}' ';'; \ fi @@ -2080,7 +2086,7 @@ stamps/liveconnect-dist.stamp: stamps/li (cd $(LIVECONNECT_CLASSES) ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $(LIVECONNECT_JAR) $(LIVECONNECT_DIR) ; \ - cp -pPR $(REFLINK) $(PLUGIN_SRCDIR)/java src; \ + cp -pPR $(SRC_DIR_LINK) $(PLUGIN_SRCDIR)/java src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ZIP) -qr $(LIVECONNECT_SRC) ${LIVECONNECT_DIR} ) ; \ @@ -2117,7 +2123,7 @@ stamps/netx-dist.stamp: stamps/netx.stam (cd $(NETX_CLASSES) ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf $(NETX_JAR) javax/jnlp net ; \ - cp -pPR $(REFLINK) $(NETX_SRCDIR) src; \ + cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ICEDTEA_BOOT_DIR)/bin/jar uf $(NETX_JAR) \ diff -r 7dd1a3ba46d2 -r 731f4c50030c acinclude.m4 --- a/acinclude.m4 Mon Jun 14 16:27:40 2010 +0100 +++ b/acinclude.m4 Mon Jun 14 17:17:14 2010 +0100 @@ -287,6 +287,19 @@ AC_DEFUN_ONCE([WITH_OPENJDK_SRC_DIR], fi AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${with_external_src_dir}" = "xtrue") AM_CONDITIONAL(OPENJDK_SRC_DIR_HARDLINKABLE, test "x${openjdk_src_dir_hardlinkable}" = "xyes") +]) + +AC_DEFUN_ONCE([IT_CAN_HARDLINK_TO_SOURCE_TREE], +[ + AC_CACHE_CHECK([if we can hard link rather than copy from ${abs_top_srcdir}], it_cv_hardlink_src, [ + if cp -l ${abs_top_srcdir}/README tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_hardlink_src=yes; + else + it_cv_hardlink_src=no; + fi + rm -f tmp.$$ + ]) + AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes") ]) AC_DEFUN([FIND_ECJ_JAR], diff -r 7dd1a3ba46d2 -r 731f4c50030c configure.ac --- a/configure.ac Mon Jun 14 16:27:40 2010 +0100 +++ b/configure.ac Mon Jun 14 17:17:14 2010 +0100 @@ -49,6 +49,7 @@ AC_CHECK_GCC_VERSION AC_CHECK_GCC_VERSION IT_FIND_NUMBER_OF_PROCESSORS IT_CP_SUPPORTS_REFLINK +IT_CAN_HARDLINK_TO_SOURCE_TREE AC_MSG_CHECKING([for a NetBeans installation]) AC_ARG_WITH([netbeans-home], From bugzilla-daemon at icedtea.classpath.org Mon Jun 14 09:45:01 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 14 Jun 2010 16:45:01 +0000 Subject: [Bug 450] TinyLaF 1.4.0 generated gui rendered incorrect using IcedTea6 1.8pre (6b18~pre1-1ubuntu1) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=450 ------- Comment #3 from asu at redhat.com 2010-06-14 16:45 ------- extra note on font, the spacing is more wide for openjdk compared to proprietary java also, this is none of these issues are fixed in openjdk7 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Jun 14 11:32:24 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 14 Jun 2010 18:32:24 +0000 Subject: [Bug 281] web100 applet fails to display buttons Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=281 ------- Comment #5 from asu at redhat.com 2010-06-14 18:32 ------- Hello Rao, I have just tried out the website you specified, however I am unable to reproduce this. The buttons are visible and execute accordingly when pressed upon. Please let us know if this is still a problem for you. --Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From dbhole at icedtea.classpath.org Mon Jun 14 12:04:04 2010 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 14 Jun 2010 19:04:04 +0000 Subject: /hg/icedtea6: 3 new changesets Message-ID: changeset df96f563510a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=df96f563510a author: Deepak Bhole date: Mon Jun 14 14:55:08 2010 -0400 Patch for Bug# 480 (NPPlugin with NoScript extension), by Omair Majid. changeset 3dc9772300a0 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3dc9772300a0 author: Deepak Bhole date: Mon Jun 14 14:58:37 2010 -0400 Fix for Bug# 488 (Question mark changing into underscore in URL), by Omair M. changeset 9a9ed35b3f80 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9a9ed35b3f80 author: Deepak Bhole date: Mon Jun 14 15:03:55 2010 -0400 Fix bug causing 100% CPU usage (rhbz# 592553). diffstat: 5 files changed, 35 insertions(+), 22 deletions(-) ChangeLog | 15 +++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 30 ++++------ plugin/icedteanp/IcedTeaPluginUtils.h | 4 - plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 4 - plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 4 - diffs (129 lines): diff -r be0a17ddbdb8 -r 9a9ed35b3f80 ChangeLog --- a/ChangeLog Fri Jun 11 14:45:52 2010 +0100 +++ b/ChangeLog Mon Jun 14 15:03:55 2010 -0400 @@ -1,3 +1,18 @@ 2010-06-11 Andrew John Hughes + + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug + causing 100% CPU usage (rhbz# 592553). + +2010-06-14 Omair Majid + + * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to + incorrect assumption that 'A' > 'a'. + +2010-06-14 Omair Majid + + * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead + of evaluate, to get page URL. + 2010-06-11 Andrew John Hughes * Makefile.am: diff -r be0a17ddbdb8 -r 9a9ed35b3f80 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 11 14:45:52 2010 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jun 14 15:03:55 2010 -0400 @@ -1021,30 +1021,26 @@ plugin_get_documentbase (NPP instance) // Additionally, since it is insecure, we cannot use it for making // security decisions. NPObject* window; - NPString script = NPString(); - std::string script_str = std::string(); - NPVariant* location = new NPVariant(); - std::string location_str = std::string(); + browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - script_str += "window.location.href"; -#if MOZILLA_VERSION_COLLAPSED < 1090200 - script.utf8characters = script_str.c_str(); - script.utf8length = script_str.size(); -#else - script.UTF8Characters = script_str.c_str(); - script.UTF8Length = script_str.size(); -#endif - browser_functions.evaluate(instance, window, &script, location); + NPVariant location; + NPIdentifier location_id = browser_functions.getstringidentifier("location"); + browser_functions.getproperty(instance, window, location_id, &location); + + NPVariant href; + NPIdentifier href_id = browser_functions.getstringidentifier("href"); + browser_functions.getproperty(instance, NPVARIANT_TO_OBJECT(location), + href_id, &href); // Strip everything after the last "/" #if MOZILLA_VERSION_COLLAPSED < 1090200 - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).utf8characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).utf8characters, "/", -1); #else - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).UTF8Characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).UTF8Characters, "/", -1); #endif guint parts_sz = g_strv_length (parts); + std::string location_str; for (int i=0; i < parts_sz - 1; i++) { location_str += parts[i]; @@ -1054,6 +1050,8 @@ plugin_get_documentbase (NPP instance) documentbase_copy = g_strdup (location_str.c_str()); // Release references. + browser_functions.releasevariantvalue(&href); + browser_functions.releasevariantvalue(&location); cleanup_done: PLUGIN_DEBUG_0ARG ("plugin_get_documentbase return\n"); PLUGIN_DEBUG_1ARG("plugin_get_documentbase returning: %s\n", documentbase_copy); diff -r be0a17ddbdb8 -r 9a9ed35b3f80 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Fri Jun 11 14:45:52 2010 +0100 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Mon Jun 14 15:03:55 2010 -0400 @@ -137,8 +137,8 @@ exception statement from your version. * } #define HEX_TO_INT(c) \ - ((*c >= 'A') ? *c - 'A' + 10 : \ - (*c >= 'a') ? *c - 'a' + 10 : \ + ((*c >= 'a') ? *c - 'a' + 10 : \ + (*c >= 'A') ? *c - 'A' + 10 : \ *c - '0') #define IS_VALID_HEX(c) \ diff -r be0a17ddbdb8 -r 9a9ed35b3f80 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Fri Jun 11 14:45:52 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Mon Jun 14 15:03:55 2010 -0400 @@ -164,11 +164,11 @@ class PluginMessageConsumer { registerPriorityWait("instance " + instanceNum + " handle"); registerPriorityWait("instance " + instanceNum + " width"); - } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) { + } else if (msgParts[2].equals("handle")) { Integer instanceNum = new Integer(msgParts[1]); // If this instance is not in init, return false immediately. - // Handle/Width messages should NEVER go before tag messages + // Handle messages should NEVER go before tag messages if (!isInInit(instanceNum)) return false; } diff -r be0a17ddbdb8 -r 9a9ed35b3f80 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Fri Jun 11 14:45:52 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Mon Jun 14 15:03:55 2010 -0400 @@ -72,7 +72,7 @@ class PluginMessageHandlerWorker extends if (message != null) { - PluginDebug.debug("Consumer thread " + id + " consuming " + message); + PluginDebug.debug("Consumer (priority=" + isPriorityWorker + ") thread " + id + " consuming " + message); // ideally, whoever returns things object should mark it // busy first, but just in case.. @@ -90,7 +90,7 @@ class PluginMessageHandlerWorker extends this.message = null; - PluginDebug.debug("Consumption completed by consumer thread " + id); + PluginDebug.debug("Consumption (priority=" + isPriorityWorker + ") completed by consumer thread " + id); // mark ourselves free again free(); From bugzilla-daemon at icedtea.classpath.org Mon Jun 14 12:11:27 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 14 Jun 2010 19:11:27 +0000 Subject: [Bug 308] run scilab 5.1 demos at openSUSE11.1 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=308 ------- Comment #3 from jon.vanalten at redhat.com 2010-06-14 19:11 ------- Hi, Trying this out I do not reproduce these crashes. I see one of your crash logs is in libscicore, which is native code and part of scilab not Icedtea/OpenJDK, and the second is in libc, also native code. When attempting to reproduce this, I did have one reliably reproduceable crash in libc (not when running demos, but when closing the program of all things). But this was only when I was using the precompiled scilab binaries. Taking the source and building it on my machine I ended up with a scilab that worked just fine, at least as far as running the demo mentioned in description and several others in the list of demos. I wonder if you had scilab built from source? If not, you may have been running into some incompatibility between what scilab was built against and what was actually on your machine. Or, whatever caused your problem may have been since fixed in either IcedTea, scilab, or some native library. Can you try with up-to-date versions of IcedTea and scilab? I was working with scilab 5.2.2, and $ java -version java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-38.b18.fc12-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) cheers, jon -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Mon Jun 14 13:08:10 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 14 Jun 2010 20:08:10 +0000 Subject: /hg/icedtea6-hg: 4 new changesets Message-ID: changeset 9a43545ed562 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9a43545ed562 author: Andrew John Hughes date: Mon Jun 14 18:35:47 2010 +0100 Check that cp supports --reflink and use only if it does. 2010-06-14 Andrew John Hughes * Makefile.am: (REFLINK): Set to --reflink=auto if CP_SUPPORTS_REFLINK is defined. (extract-openjdk.stamp): Replace --reflink=auto with $(REFLINK). (generated.stamp): Likewise. (liveconnect-dist.stamp): Likewise. (netx-dist.stamp): Likewise. (plugin- tests.stamp): Likewise. * acinclude.m4: (IT_CP_SUPPORTS_REFLINK): New macro to check for a cp new enough to have --reflink. * configure.ac: Invoke IT_CP_SUPPORTS_REFLINK. changeset edee5dc4edad in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=edee5dc4edad author: Andrew John Hughes date: Mon Jun 14 16:27:40 2010 +0100 Hard link external OpenJDK source directories if possible, and check that ${OPENJDK_SRC_DIR}/README exists. 2010-06-14 Andrew John Hughes * Makefile.am: (REFLINK): Remove unneeded quotation. (OPENJDK_SRC_DIR_LINK): Use reflink only if hard linking is not possible. * acinclude.m4: (IT_CP_SUPPORTS_REFLINK): Define once only. (WITH_OPENJDK_SRC_DIR): Define once only. Check that directory is valid (to the extent this is discernable by the README being present) and whether hardlinking is possible, defining OPENJDK_SRC_DIR_HARDLINKABLE if it is. changeset 152d9e45c454 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=152d9e45c454 author: Andrew John Hughes date: Mon Jun 14 18:39:11 2010 +0100 Hardlink to files in the source directory from the build directory, if possible. 2010-06-14 Andrew John Hughes * Makefile.am: (SRC_DIR_LINK): Use reflink only if hard linking is not possible. (liveconnect- dist.stamp): Replace $(REFLINK) with $(SRC_DIR_LINK). (netx-dist.stamp): Likewise. (plugin-tests.stamp): Likewise. * acinclude.m4: (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking to files in the source directory from the build directory is possible. * configure.ac: Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE. changeset aa48b7afc30b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aa48b7afc30b author: Andrew John Hughes date: Mon Jun 14 18:44:51 2010 +0100 Support using the build directory in a relative path. 2010-06-14 Andrew John Hughes Make available BUILD_DIR for where a relative path needs to be built. (BUILD_DIR): Set to openjdk.build. (BUILD_OUTPUT_DIR): Use BUILD_DIR. (ECJ_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-ecj'. diffstat: 4 files changed, 142 insertions(+), 18 deletions(-) ChangeLog | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 37 ++++++++++++++++++++++++--------- acinclude.m4 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- configure.ac | 2 + diffs (264 lines): diff -r 609c64d51922 -r aa48b7afc30b ChangeLog --- a/ChangeLog Mon Jun 14 00:21:47 2010 +0100 +++ b/ChangeLog Mon Jun 14 18:44:51 2010 +0100 @@ -1,3 +1,59 @@ 2010-06-13 Andrew John Hughes + + Make available BUILD_DIR for where a relative + path needs to be built. + (BUILD_DIR): Set to openjdk.build. + (BUILD_OUTPUT_DIR): Use BUILD_DIR. + (ECJ_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-ecj'. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (SRC_DIR_LINK): Use reflink only if hard + linking is not possible. + (liveconnect-dist.stamp): Replace $(REFLINK) with + $(SRC_DIR_LINK). + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + * acinclude.m4: + (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking + to files in the source directory from the build directory + is possible. + * configure.ac: + Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (REFLINK): Remove unneeded quotation. + (OPENJDK_SRC_DIR_LINK): Use reflink only + if hard linking is not possible. + (extract-openjdk.stamp): Replace $(REFLINK) + with $(OPENJDK_SRC_DIR_LINK). + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): Define once only. + (WITH_OPENJDK_SRC_DIR): Define once only. + Check that directory is valid (to the extent + this is discernable by the README being present) + and whether hardlinking is possible, defining + OPENJDK_SRC_DIR_HARDLINKABLE if it is. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (REFLINK): Set to --reflink=auto if + CP_SUPPORTS_REFLINK is defined. + (extract-openjdk.stamp): Replace --reflink=auto + with $(REFLINK). + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): New macro to check + for a cp new enough to have --reflink. + * configure.ac: + Invoke IT_CP_SUPPORTS_REFLINK. + 2010-06-13 Andrew John Hughes * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java: diff -r 609c64d51922 -r aa48b7afc30b Makefile.am --- a/Makefile.am Mon Jun 14 00:21:47 2010 +0100 +++ b/Makefile.am Mon Jun 14 18:44:51 2010 +0100 @@ -32,9 +32,10 @@ OPENJDK_HG_URL = http://hg.openjdk.java. # Build directories -BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk.build +BUILD_DIR = openjdk.build +BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR) DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug -ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj.build +ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-ecj ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes ICEDTEA_BOOT_DIR= \ @@ -196,6 +197,22 @@ else SYSTEM_JDK_DIR = $(SYSTEM_GCJ_DIR) ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp +endif + +if CP_SUPPORTS_REFLINK + REFLINK = --reflink=auto +endif + +if OPENJDK_SRC_DIR_HARDLINKABLE + OPENJDK_SRC_DIR_LINK = -l +else + OPENJDK_SRC_DIR_LINK = $(REFLINK) +endif + +if SRC_DIR_HARDLINKABLE + SRC_DIR_LINK = -l +else + SRC_DIR_LINK = $(REFLINK) endif # Target to ensure a patched OpenJDK tree containing Zero & Shark @@ -804,7 +821,7 @@ clean-extract: stamps/extract-openjdk.stamp: stamps/download.stamp if OPENJDK_SRC_DIR_FOUND - cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk + cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk else set -e ; \ if ! test -d openjdk ; \ @@ -1537,7 +1554,7 @@ stamps/liveconnect-dist.stamp: stamps/li (cd $(abs_top_builddir)/liveconnect ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \ - cp -pPR --reflink=auto $(LIVECONNECT_SRCS) src; \ + cp -pPR $(SRC_DIR_LINK) $(LIVECONNECT_SRCS) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip $(LIVECONNECT_DIR) ) ; \ @@ -1573,7 +1590,7 @@ stamps/netx-dist.stamp: stamps/netx.stam (cd $(abs_top_builddir)/netx.build ; \ mkdir -p lib ; \ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \ - cp -pPR --reflink=auto $(NETX_SRCDIR) src; \ + cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \ @@ -1863,12 +1880,12 @@ if ADD_ZERO_BUILD if ZERO_BUILD mkdir -p $(BUILD_JRE_ARCH_DIR)/shark - cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/shark/ printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg else mkdir -p $(BUILD_JRE_ARCH_DIR)/zero - cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1893,12 +1910,12 @@ if ADD_ZERO_BUILD if ZERO_BUILD mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark - cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/shark/ printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg else mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero - cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1924,7 +1941,7 @@ stamps/plugin-tests.stamp: $(INITIAL_BOO $(PLUGIN_TEST_SRCS) ; $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ plugin/tests/LiveConnect/*.class ; - cp -pPR --reflink=auto $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \ + cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \ plugin/tests/LiveConnect ; echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; mkdir -p stamps diff -r 609c64d51922 -r aa48b7afc30b acinclude.m4 --- a/acinclude.m4 Mon Jun 14 00:21:47 2010 +0100 +++ b/acinclude.m4 Mon Jun 14 18:44:51 2010 +0100 @@ -245,23 +245,72 @@ AC_DEFUN([FIND_JAVA], AC_SUBST(JAVA) ]) -AC_DEFUN([WITH_OPENJDK_SRC_DIR], +AC_DEFUN_ONCE([IT_CP_SUPPORTS_REFLINK], [ - AC_MSG_CHECKING(for an OpenJDK source directory) + AC_CACHE_CHECK([if cp supports --reflink], it_cv_reflink, [ + touch tmp.$$ + if cp --reflink=auto tmp.$$ tmp2.$$ >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_reflink=yes; + else + it_cv_reflink=no; + fi + rm -f tmp.$$ tmp2.$$ + ]) + AM_CONDITIONAL([CP_SUPPORTS_REFLINK], test x"${it_cv_reflink}" = "xyes") +]) + +AC_DEFUN_ONCE([WITH_OPENJDK_SRC_DIR], +[ + DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk + AC_MSG_CHECKING([for an OpenJDK source directory]) AC_ARG_WITH([openjdk-src-dir], [AS_HELP_STRING(--with-openjdk-src-dir,specify the location of the openjdk sources)], [ OPENJDK_SRC_DIR=${withval} - AC_MSG_RESULT(${withval}) - conditional_with_openjdk_sources=true + with_external_src_dir=true ], [ - conditional_with_openjdk_sources=false - OPENJDK_SRC_DIR=`pwd`/openjdk - AC_MSG_RESULT(${OPENJDK_SRC_DIR}) + OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR} + with_external_src_dir=false ]) + AC_MSG_RESULT(${OPENJDK_SRC_DIR}) AC_SUBST(OPENJDK_SRC_DIR) - AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue) + if test "x${with_external_src_dir}" = "xtrue"; then + AC_MSG_CHECKING([if ${OPENJDK_SRC_DIR}/README exists]) + if test -f ${OPENJDK_SRC_DIR}/README; then + openjdk_src_dir_valid=yes; + else + openjdk_src_dir_valid="no, resetting to ${DEFAULT_SRC_DIR}"; + OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR} + with_external_src_dir=false + fi + AC_MSG_RESULT(${openjdk_src_dir_valid}) + if test "x${openjdk_src_dir_valid}" = "xyes"; then + AC_MSG_CHECKING([if we can hard link rather than copy the OpenJDK source directory]) + if cp -l ${OPENJDK_SRC_DIR}/README tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then + openjdk_src_dir_hardlinkable=yes; + else + openjdk_src_dir_hardlinkable=no; + fi + AC_MSG_RESULT(${openjdk_src_dir_hardlinkable}) + rm -f tmp.$$ + fi + fi + AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${with_external_src_dir}" = "xtrue") + AM_CONDITIONAL(OPENJDK_SRC_DIR_HARDLINKABLE, test "x${openjdk_src_dir_hardlinkable}" = "xyes") +]) + +AC_DEFUN_ONCE([IT_CAN_HARDLINK_TO_SOURCE_TREE], +[ + AC_CACHE_CHECK([if we can hard link rather than copy from ${abs_top_srcdir}], it_cv_hardlink_src, [ + if cp -l ${abs_top_srcdir}/README tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_hardlink_src=yes; + else + it_cv_hardlink_src=no; + fi + rm -f tmp.$$ + ]) + AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes") ]) AC_DEFUN([FIND_ECJ_JAR], diff -r 609c64d51922 -r aa48b7afc30b configure.ac --- a/configure.ac Mon Jun 14 00:21:47 2010 +0100 +++ b/configure.ac Mon Jun 14 18:44:51 2010 +0100 @@ -50,6 +50,8 @@ AC_CHECK_GCC_VERSION AC_CHECK_GCC_VERSION AC_CHECK_FOR_OPENJDK IT_CHECK_NUMBER_OF_PARALLEL_JOBS +IT_CP_SUPPORTS_REFLINK +IT_CAN_HARDLINK_TO_SOURCE_TREE AC_MSG_CHECKING([for a NetBeans installation]) AC_ARG_WITH([netbeans-home], From omajid at redhat.com Tue Jun 15 06:42:09 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 15 Jun 2010 09:42:09 -0400 Subject: [RFC] JNLP: jars with native libraries in incorrect locations Message-ID: <4C178331.6000802@redhat.com> Hi, I recently ran into a problem with SweetHome3D [1] not working under Netx. The jnlp file contains no 'nativelib' elements which initially led me to believe that it contains no native code. However, one of the jars it references [2] contains native code under /linux/x64/. Both of these things (no nativelib element and placing .so's anywhere other than under /) seem to go against the developer guide's guidelines. Of course, without reading the JSR, I can not say if this is against the JNLP spec or not. That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx should work too. The attached patch modifies Netx so that it always tries to look for .so's (placed anywhere) in jar files. If it finds them, it activates them as if the .so's were in a nativelib jar. Any thoughts or comments? Cheers, Omair [1] http://www.sweethome3d.com/SweetHome3D.jnlp [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-jnlp-bad-native-library-jars.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100615/7b145447/icedtea6-jnlp-bad-native-library-jars.patch From bugzilla-daemon at icedtea.classpath.org Tue Jun 15 08:19:01 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Jun 2010 15:19:01 +0000 Subject: [Bug 357] java frame unprompted window resizing Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=357 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME ------- Comment #2 from asu at redhat.com 2010-06-15 15:19 ------- I've ran your robot many time, no result. After moving the mouse to the proper location, and letting it minimize and maximize. The frame still remains maximized. This issue _may_ have been fixed in the latest version of Icedtea. -Unable to reproduce java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-39.b18.fc13-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) -Worksforme --Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Tue Jun 15 09:11:07 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 15 Jun 2010 16:11:07 +0000 Subject: /hg/release/icedtea6-1.8: 3 new changesets Message-ID: changeset a033b01ed09b in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=a033b01ed09b author: Omair Majid date: Mon Jun 14 14:55:08 2010 -0400 PR icedtea/480: (NPPlugin with NoScript extension). 2010-06-14 Omair Majid * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead of evaluate, to get page URL. changeset b7e6bac9cd18 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=b7e6bac9cd18 author: Omair Majid date: Tue Jun 15 17:09:31 2010 +0100 PR icedtea/488: Question mark changing into underscore in URL. 2010-06-14 Omair Majid PR icedtea/488 * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to incorrect assumption that 'A' > 'a'. changeset 8de4ce5137b8 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=8de4ce5137b8 author: Deepak Bhole date: Mon Jun 14 15:03:55 2010 -0400 Fix bug causing 100% CPU usage (rhbz# 592553). 2010-06-14 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug causing 100% CPU usage (rhbz# 592553). diffstat: 5 files changed, 37 insertions(+), 22 deletions(-) ChangeLog | 17 +++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 30 ++++------ plugin/icedteanp/IcedTeaPluginUtils.h | 4 - plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 4 - plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 4 - diffs (131 lines): diff -r a59c9d0cda71 -r 8de4ce5137b8 ChangeLog --- a/ChangeLog Fri May 07 16:57:27 2010 -0400 +++ b/ChangeLog Mon Jun 14 15:03:55 2010 -0400 @@ -1,3 +1,20 @@ 2010-05-07 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug + causing 100% CPU usage (rhbz# 592553). + +2010-06-14 Omair Majid + + PR icedtea/488 + * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to + incorrect assumption that 'A' > 'a'. + +2010-06-14 Omair Majid + + PR icedtea/480 + * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead + of evaluate, to get page URL. + 2010-05-07 Deepak Bhole PR icedtea/436: diff -r a59c9d0cda71 -r 8de4ce5137b8 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jun 14 15:03:55 2010 -0400 @@ -1021,30 +1021,26 @@ plugin_get_documentbase (NPP instance) // Additionally, since it is insecure, we cannot use it for making // security decisions. NPObject* window; - NPString script = NPString(); - std::string script_str = std::string(); - NPVariant* location = new NPVariant(); - std::string location_str = std::string(); + browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - script_str += "window.location.href"; -#if MOZILLA_VERSION_COLLAPSED < 1090200 - script.utf8characters = script_str.c_str(); - script.utf8length = script_str.size(); -#else - script.UTF8Characters = script_str.c_str(); - script.UTF8Length = script_str.size(); -#endif - browser_functions.evaluate(instance, window, &script, location); + NPVariant location; + NPIdentifier location_id = browser_functions.getstringidentifier("location"); + browser_functions.getproperty(instance, window, location_id, &location); + + NPVariant href; + NPIdentifier href_id = browser_functions.getstringidentifier("href"); + browser_functions.getproperty(instance, NPVARIANT_TO_OBJECT(location), + href_id, &href); // Strip everything after the last "/" #if MOZILLA_VERSION_COLLAPSED < 1090200 - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).utf8characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).utf8characters, "/", -1); #else - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).UTF8Characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).UTF8Characters, "/", -1); #endif guint parts_sz = g_strv_length (parts); + std::string location_str; for (int i=0; i < parts_sz - 1; i++) { location_str += parts[i]; @@ -1054,6 +1050,8 @@ plugin_get_documentbase (NPP instance) documentbase_copy = g_strdup (location_str.c_str()); // Release references. + browser_functions.releasevariantvalue(&href); + browser_functions.releasevariantvalue(&location); cleanup_done: PLUGIN_DEBUG_0ARG ("plugin_get_documentbase return\n"); PLUGIN_DEBUG_1ARG("plugin_get_documentbase returning: %s\n", documentbase_copy); diff -r a59c9d0cda71 -r 8de4ce5137b8 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Mon Jun 14 15:03:55 2010 -0400 @@ -137,8 +137,8 @@ exception statement from your version. * } #define HEX_TO_INT(c) \ - ((*c >= 'A') ? *c - 'A' + 10 : \ - (*c >= 'a') ? *c - 'a' + 10 : \ + ((*c >= 'a') ? *c - 'a' + 10 : \ + (*c >= 'A') ? *c - 'A' + 10 : \ *c - '0') #define IS_VALID_HEX(c) \ diff -r a59c9d0cda71 -r 8de4ce5137b8 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Mon Jun 14 15:03:55 2010 -0400 @@ -164,11 +164,11 @@ class PluginMessageConsumer { registerPriorityWait("instance " + instanceNum + " handle"); registerPriorityWait("instance " + instanceNum + " width"); - } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) { + } else if (msgParts[2].equals("handle")) { Integer instanceNum = new Integer(msgParts[1]); // If this instance is not in init, return false immediately. - // Handle/Width messages should NEVER go before tag messages + // Handle messages should NEVER go before tag messages if (!isInInit(instanceNum)) return false; } diff -r a59c9d0cda71 -r 8de4ce5137b8 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Mon Jun 14 15:03:55 2010 -0400 @@ -72,7 +72,7 @@ class PluginMessageHandlerWorker extends if (message != null) { - PluginDebug.debug("Consumer thread " + id + " consuming " + message); + PluginDebug.debug("Consumer (priority=" + isPriorityWorker + ") thread " + id + " consuming " + message); // ideally, whoever returns things object should mark it // busy first, but just in case.. @@ -90,7 +90,7 @@ class PluginMessageHandlerWorker extends this.message = null; - PluginDebug.debug("Consumption completed by consumer thread " + id); + PluginDebug.debug("Consumption (priority=" + isPriorityWorker + ") completed by consumer thread " + id); // mark ourselves free again free(); From andrew at icedtea.classpath.org Tue Jun 15 09:11:11 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 15 Jun 2010 16:11:11 +0000 Subject: /hg/release/icedtea6-1.7: 3 new changesets Message-ID: changeset fa964a40477d in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=fa964a40477d author: Omair Majid date: Mon Jun 14 14:55:08 2010 -0400 PR icedtea/480: (NPPlugin with NoScript extension). 2010-06-14 Omair Majid * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead of evaluate, to get page URL. changeset c6d6a600f2bc in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=c6d6a600f2bc author: Omair Majid date: Tue Jun 15 17:09:31 2010 +0100 PR icedtea/488: Question mark changing into underscore in URL. 2010-06-14 Omair Majid PR icedtea/488 * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to incorrect assumption that 'A' > 'a'. changeset 80db934e31d5 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=80db934e31d5 author: Deepak Bhole date: Mon Jun 14 15:03:55 2010 -0400 Fix bug causing 100% CPU usage (rhbz# 592553). 2010-06-14 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug causing 100% CPU usage (rhbz# 592553). diffstat: 5 files changed, 37 insertions(+), 22 deletions(-) ChangeLog | 17 +++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 30 ++++------ plugin/icedteanp/IcedTeaPluginUtils.h | 4 - plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 4 - plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 4 - diffs (131 lines): diff -r 848713f58719 -r 80db934e31d5 ChangeLog --- a/ChangeLog Fri May 07 16:57:27 2010 -0400 +++ b/ChangeLog Mon Jun 14 15:03:55 2010 -0400 @@ -1,3 +1,20 @@ 2010-05-07 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug + causing 100% CPU usage (rhbz# 592553). + +2010-06-14 Omair Majid + + PR icedtea/488 + * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to + incorrect assumption that 'A' > 'a'. + +2010-06-14 Omair Majid + + PR icedtea/480 + * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead + of evaluate, to get page URL. + 2010-05-07 Deepak Bhole PR icedtea/436: diff -r 848713f58719 -r 80db934e31d5 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jun 14 15:03:55 2010 -0400 @@ -1021,30 +1021,26 @@ plugin_get_documentbase (NPP instance) // Additionally, since it is insecure, we cannot use it for making // security decisions. NPObject* window; - NPString script = NPString(); - std::string script_str = std::string(); - NPVariant* location = new NPVariant(); - std::string location_str = std::string(); + browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - script_str += "window.location.href"; -#if MOZILLA_VERSION_COLLAPSED < 1090200 - script.utf8characters = script_str.c_str(); - script.utf8length = script_str.size(); -#else - script.UTF8Characters = script_str.c_str(); - script.UTF8Length = script_str.size(); -#endif - browser_functions.evaluate(instance, window, &script, location); + NPVariant location; + NPIdentifier location_id = browser_functions.getstringidentifier("location"); + browser_functions.getproperty(instance, window, location_id, &location); + + NPVariant href; + NPIdentifier href_id = browser_functions.getstringidentifier("href"); + browser_functions.getproperty(instance, NPVARIANT_TO_OBJECT(location), + href_id, &href); // Strip everything after the last "/" #if MOZILLA_VERSION_COLLAPSED < 1090200 - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).utf8characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).utf8characters, "/", -1); #else - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).UTF8Characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).UTF8Characters, "/", -1); #endif guint parts_sz = g_strv_length (parts); + std::string location_str; for (int i=0; i < parts_sz - 1; i++) { location_str += parts[i]; @@ -1054,6 +1050,8 @@ plugin_get_documentbase (NPP instance) documentbase_copy = g_strdup (location_str.c_str()); // Release references. + browser_functions.releasevariantvalue(&href); + browser_functions.releasevariantvalue(&location); cleanup_done: PLUGIN_DEBUG_0ARG ("plugin_get_documentbase return\n"); PLUGIN_DEBUG_1ARG("plugin_get_documentbase returning: %s\n", documentbase_copy); diff -r 848713f58719 -r 80db934e31d5 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Mon Jun 14 15:03:55 2010 -0400 @@ -137,8 +137,8 @@ exception statement from your version. * } #define HEX_TO_INT(c) \ - ((*c >= 'A') ? *c - 'A' + 10 : \ - (*c >= 'a') ? *c - 'a' + 10 : \ + ((*c >= 'a') ? *c - 'a' + 10 : \ + (*c >= 'A') ? *c - 'A' + 10 : \ *c - '0') #define IS_VALID_HEX(c) \ diff -r 848713f58719 -r 80db934e31d5 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Mon Jun 14 15:03:55 2010 -0400 @@ -164,11 +164,11 @@ class PluginMessageConsumer { registerPriorityWait("instance " + instanceNum + " handle"); registerPriorityWait("instance " + instanceNum + " width"); - } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) { + } else if (msgParts[2].equals("handle")) { Integer instanceNum = new Integer(msgParts[1]); // If this instance is not in init, return false immediately. - // Handle/Width messages should NEVER go before tag messages + // Handle messages should NEVER go before tag messages if (!isInInit(instanceNum)) return false; } diff -r 848713f58719 -r 80db934e31d5 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Fri May 07 16:57:27 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Mon Jun 14 15:03:55 2010 -0400 @@ -72,7 +72,7 @@ class PluginMessageHandlerWorker extends if (message != null) { - PluginDebug.debug("Consumer thread " + id + " consuming " + message); + PluginDebug.debug("Consumer (priority=" + isPriorityWorker + ") thread " + id + " consuming " + message); // ideally, whoever returns things object should mark it // busy first, but just in case.. @@ -90,7 +90,7 @@ class PluginMessageHandlerWorker extends this.message = null; - PluginDebug.debug("Consumption completed by consumer thread " + id); + PluginDebug.debug("Consumption (priority=" + isPriorityWorker + ") completed by consumer thread " + id); // mark ourselves free again free(); From andrew at icedtea.classpath.org Tue Jun 15 10:21:58 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 15 Jun 2010 17:21:58 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset bee59676264f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bee59676264f author: Stefan Ring date: Mon Jun 14 22:19:24 2010 +0200 PR icedtea/495: Extend JAR_KNOWS_ATFILE patch 2010-06-15 Stefan Ring PR icedtea/495 * patches/boot/jar.patch: Apply workaround in more places. changeset 09f5a7f1fb25 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=09f5a7f1fb25 author: Andrew John Hughes date: Tue Jun 15 18:21:49 2010 +0100 Bring recent Zero fixes into HotSpot. 2010-06-15 Andrew John Hughes * Makefile.am: Bump HotSpot changeset ID and HA256 checksum to incorporate recent Zero fixes (as in OpenJDK6). diffstat: 3 files changed, 57 insertions(+), 2 deletions(-) ChangeLog | 11 +++++++++++ Makefile.am | 4 ++-- patches/boot/jar.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ diffs (90 lines): diff -r 731f4c50030c -r 09f5a7f1fb25 ChangeLog --- a/ChangeLog Mon Jun 14 17:17:14 2010 +0100 +++ b/ChangeLog Tue Jun 15 18:21:49 2010 +0100 @@ -1,3 +1,14 @@ 2010-06-14 Andrew John Hughes + + * Makefile.am: + Bump HotSpot changeset ID and HA256 checksum + to incorporate recent Zero fixes (as in OpenJDK6). + +2010-06-15 Stefan Ring + + PR icedtea/495 + * patches/boot/jar.patch: Apply workaround in more places. + 2010-06-14 Andrew John Hughes * Makefile.am: diff -r 731f4c50030c -r 09f5a7f1fb25 Makefile.am --- a/Makefile.am Mon Jun 14 17:17:14 2010 +0100 +++ b/Makefile.am Tue Jun 15 18:21:49 2010 +0100 @@ -3,7 +3,7 @@ OPENJDK_VERSION = b89 OPENJDK_VERSION = b89 CORBA_CHANGESET = e805b4155d76 -HOTSPOT_CHANGESET = 5a92a37da3b9 +HOTSPOT_CHANGESET = a393ff93e7e5 JAXP_CHANGESET = 826bafcb6c4a JAXWS_CHANGESET = 1661166c82dc JDK_CHANGESET = 2dead33effe1 @@ -11,7 +11,7 @@ OPENJDK_CHANGESET = 195fcceefddc OPENJDK_CHANGESET = 195fcceefddc CORBA_SHA256SUM = 870e2eac993a4eef48197ed7309cab176b56a994add1de215a026599052627cb -HOTSPOT_SHA256SUM = f3dbd5689769cac89951a2e762db6ad2365942f7f99d69c33e96874622f09d7d +HOTSPOT_SHA256SUM = 995d64e272ecde0e00b69e36371bc7f8a82638c1f598c956f98e10538e41d695 JAXP_SHA256SUM = 42d004e51a1f01d146ad230ce48996ddf8da3719fe571a41653f431d6b2e8a7b JAXWS_SHA256SUM = 4523909cd46fd61b5c6670bf932099d5899236a37a4058e7b2bcb855e503a0e4 JDK_SHA256SUM = ef0d2624d6844516ac079483ea576623733ce0f27fd57bb359ffe07f7c4ac60f diff -r 731f4c50030c -r 09f5a7f1fb25 patches/boot/jar.patch --- a/patches/boot/jar.patch Mon Jun 14 17:17:14 2010 +0100 +++ b/patches/boot/jar.patch Tue Jun 15 18:21:49 2010 +0100 @@ -24,3 +24,47 @@ diff -Nru ../openjdk.orig/openjdk-boot/j # Create jsse.jar containing SunJSSE implementation classes JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar +@@ -711,9 +722,19 @@ + RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar + $(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) + $(CD) $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ + @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS) ++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) ++ $(CD) $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \ ++ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_JFLAGS) ++else ++ $(CD) $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(BOOT_JAR_JFLAGS) `cat $(RT_JAR_FILELIST)` ++endif + @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) + + # Meta-index construction to make core class loaders lazier +--- openjdk-boot/jdk/make/modules/Makefile.orig 2010-06-13 10:37:13.000000000 +0200 ++++ openjdk-boot/jdk/make/modules/Makefile 2010-06-13 10:42:37.000000000 +0200 +@@ -111,10 +111,21 @@ + fi ; \ + $(MKDIR) -p $(ABS_MODULES_DIR)/$$m/lib; \ + $(CD) $(MODULE_CLASSES) && \ ++ifneq (,$(JAR_KNOWS_ATFILE)) + $(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \ + $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \ + @$(TMP)/tmp.cf \ + $(BOOT_JAR_JFLAGS); \ ++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) ++ $(CAT) $(TMP)/tmp.cf | \ ++ $(BOOT_JAR_CMD) c0mf@ $(MODULE_JAR_MANIFEST_FILE) \ ++ $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \ ++ $(BOOT_JAR_JFLAGS); \ ++else ++ $(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \ ++ $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \ ++ $(BOOT_JAR_JFLAGS) `cat $(TMP)/tmp.cf`; \ ++endif + for s in `$(GREP) "^$$m" $(MODULES_LIST)` ; do \ + if [ -d $(TMP)/$$s ] ; then \ + $(CP) -rf $(TMP)/$$s/* $(ABS_MODULES_DIR)/$$m; \ From andrew at icedtea.classpath.org Tue Jun 15 10:34:51 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 15 Jun 2010 17:34:51 +0000 Subject: /hg/icedtea6: Don't generate a random pointer from a pthread_t i... Message-ID: changeset 1e95c787d40b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1e95c787d40b author: Andrew John Hughes date: Tue Jun 15 18:34:45 2010 +0100 Don't generate a random pointer from a pthread_t in the debug output. 2010-06-14 Andrew John Hughes Don't print out the return value of pthread_self which is a pthread_t. pthread_t is an opaque type and we don't know what it actually is (it varies from system to system; recent versions of Linux use an unsigned long int). * plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. diffstat: 2 files changed, 21 insertions(+), 6 deletions(-) ChangeLog | 15 +++++++++++++++ plugin/icedteanp/IcedTeaPluginUtils.h | 12 ++++++------ diffs (79 lines): diff -r 9a9ed35b3f80 -r 1e95c787d40b ChangeLog --- a/ChangeLog Mon Jun 14 15:03:55 2010 -0400 +++ b/ChangeLog Tue Jun 15 18:34:45 2010 +0100 @@ -1,3 +1,18 @@ 2010-06-14 Deepak Bhole + + Don't print out the return value of pthread_self + which is a pthread_t. pthread_t is an opaque type + and we don't know what it actually is (it varies + from system to system; recent versions of Linux + use an unsigned long int). + * plugin/icedteanp/IcedTeaPluginUtils.h: + (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. + (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. + (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. + (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. + (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. + (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. + 2010-06-14 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug diff -r 9a9ed35b3f80 -r 1e95c787d40b plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Mon Jun 14 15:03:55 2010 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jun 15 18:34:45 2010 +0100 @@ -71,7 +71,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str); \ } \ } while (0) @@ -81,7 +81,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1); \ } \ } while (0) @@ -91,7 +91,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2); \ } \ } while (0) @@ -101,7 +101,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3); \ } \ } while (0) @@ -111,7 +111,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4); \ } \ } while (0) @@ -121,7 +121,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5); \ } \ } while (0) From andrew at icedtea.classpath.org Tue Jun 15 10:35:38 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 15 Jun 2010 17:35:38 +0000 Subject: /hg/release/icedtea6-1.8: Don't generate a random pointer from a... Message-ID: changeset 9969adc2442f in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=9969adc2442f author: Andrew John Hughes date: Tue Jun 15 18:34:45 2010 +0100 Don't generate a random pointer from a pthread_t in the debug output. 2010-06-14 Andrew John Hughes Don't print out the return value of pthread_self which is a pthread_t. pthread_t is an opaque type and we don't know what it actually is (it varies from system to system; recent versions of Linux use an unsigned long int). * plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. diffstat: 2 files changed, 21 insertions(+), 6 deletions(-) ChangeLog | 15 +++++++++++++++ plugin/icedteanp/IcedTeaPluginUtils.h | 12 ++++++------ diffs (79 lines): diff -r 8de4ce5137b8 -r 9969adc2442f ChangeLog --- a/ChangeLog Mon Jun 14 15:03:55 2010 -0400 +++ b/ChangeLog Tue Jun 15 18:34:45 2010 +0100 @@ -1,3 +1,18 @@ 2010-06-14 Deepak Bhole + + Don't print out the return value of pthread_self + which is a pthread_t. pthread_t is an opaque type + and we don't know what it actually is (it varies + from system to system; recent versions of Linux + use an unsigned long int). + * plugin/icedteanp/IcedTeaPluginUtils.h: + (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. + (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. + (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. + (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. + (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. + (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. + 2010-06-14 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug diff -r 8de4ce5137b8 -r 9969adc2442f plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Mon Jun 14 15:03:55 2010 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jun 15 18:34:45 2010 +0100 @@ -71,7 +71,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str); \ } \ } while (0) @@ -81,7 +81,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1); \ } \ } while (0) @@ -91,7 +91,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2); \ } \ } while (0) @@ -101,7 +101,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3); \ } \ } while (0) @@ -111,7 +111,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4); \ } \ } while (0) @@ -121,7 +121,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5); \ } \ } while (0) From andrew at icedtea.classpath.org Tue Jun 15 10:35:49 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 15 Jun 2010 17:35:49 +0000 Subject: /hg/release/icedtea6-1.7: Don't generate a random pointer from a... Message-ID: changeset a14090fab523 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=a14090fab523 author: Andrew John Hughes date: Tue Jun 15 18:34:45 2010 +0100 Don't generate a random pointer from a pthread_t in the debug output. 2010-06-14 Andrew John Hughes Don't print out the return value of pthread_self which is a pthread_t. pthread_t is an opaque type and we don't know what it actually is (it varies from system to system; recent versions of Linux use an unsigned long int). * plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. diffstat: 2 files changed, 21 insertions(+), 6 deletions(-) ChangeLog | 15 +++++++++++++++ plugin/icedteanp/IcedTeaPluginUtils.h | 12 ++++++------ diffs (79 lines): diff -r 80db934e31d5 -r a14090fab523 ChangeLog --- a/ChangeLog Mon Jun 14 15:03:55 2010 -0400 +++ b/ChangeLog Tue Jun 15 18:34:45 2010 +0100 @@ -1,3 +1,18 @@ 2010-06-14 Deepak Bhole + + Don't print out the return value of pthread_self + which is a pthread_t. pthread_t is an opaque type + and we don't know what it actually is (it varies + from system to system; recent versions of Linux + use an unsigned long int). + * plugin/icedteanp/IcedTeaPluginUtils.h: + (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. + (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. + (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. + (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. + (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. + (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. + 2010-06-14 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug diff -r 80db934e31d5 -r a14090fab523 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Mon Jun 14 15:03:55 2010 -0400 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jun 15 18:34:45 2010 +0100 @@ -71,7 +71,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str); \ } \ } while (0) @@ -81,7 +81,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1); \ } \ } while (0) @@ -91,7 +91,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2); \ } \ } while (0) @@ -101,7 +101,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3); \ } \ } while (0) @@ -111,7 +111,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4); \ } \ } while (0) @@ -121,7 +121,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5); \ } \ } while (0) From andrew at icedtea.classpath.org Tue Jun 15 10:38:40 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 15 Jun 2010 17:38:40 +0000 Subject: /hg/icedtea: 4 new changesets Message-ID: changeset 9bcb3b430941 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9bcb3b430941 author: Omair Majid date: Mon Jun 14 14:55:08 2010 -0400 PR icedtea/480: (NPPlugin with NoScript extension). 2010-06-14 Omair Majid * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead of evaluate, to get page URL. changeset 4b85fc5edffb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4b85fc5edffb author: Omair Majid date: Tue Jun 15 17:09:31 2010 +0100 PR icedtea/488: Question mark changing into underscore in URL. 2010-06-14 Omair Majid PR icedtea/488 * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to incorrect assumption that 'A' > 'a'. changeset c4a1546cbcbd in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c4a1546cbcbd author: Deepak Bhole date: Mon Jun 14 15:03:55 2010 -0400 Fix bug causing 100% CPU usage (rhbz# 592553). 2010-06-14 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug causing 100% CPU usage (rhbz# 592553). changeset 4fed9f38e501 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4fed9f38e501 author: Andrew John Hughes date: Tue Jun 15 18:34:45 2010 +0100 Don't generate a random pointer from a pthread_t in the debug output. 2010-06-14 Andrew John Hughes Don't print out the return value of pthread_self which is a pthread_t. pthread_t is an opaque type and we don't know what it actually is (it varies from system to system; recent versions of Linux use an unsigned long int). * plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. diffstat: 5 files changed, 58 insertions(+), 28 deletions(-) ChangeLog | 32 ++++++++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 30 ++++----- plugin/icedteanp/IcedTeaPluginUtils.h | 16 ++--- plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 4 - plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 4 - diffs (200 lines): diff -r 09f5a7f1fb25 -r 4fed9f38e501 ChangeLog --- a/ChangeLog Tue Jun 15 18:21:49 2010 +0100 +++ b/ChangeLog Tue Jun 15 18:34:45 2010 +0100 @@ -1,3 +1,35 @@ 2010-06-15 Andrew John Hughes + + Don't print out the return value of pthread_self + which is a pthread_t. pthread_t is an opaque type + and we don't know what it actually is (it varies + from system to system; recent versions of Linux + use an unsigned long int). + * plugin/icedteanp/IcedTeaPluginUtils.h: + (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. + (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. + (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. + (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. + (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. + (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. + +2010-06-14 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug + causing 100% CPU usage (rhbz# 592553). + +2010-06-14 Omair Majid + + PR icedtea/488 + * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to + incorrect assumption that 'A' > 'a'. + +2010-06-14 Omair Majid + + PR icedtea/480 + * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead + of evaluate, to get page URL. + 2010-06-15 Andrew John Hughes * Makefile.am: diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Jun 15 18:21:49 2010 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Jun 15 18:34:45 2010 +0100 @@ -1021,30 +1021,26 @@ plugin_get_documentbase (NPP instance) // Additionally, since it is insecure, we cannot use it for making // security decisions. NPObject* window; - NPString script = NPString(); - std::string script_str = std::string(); - NPVariant* location = new NPVariant(); - std::string location_str = std::string(); + browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - browser_functions.getvalue(instance, NPNVWindowNPObject, &window); - script_str += "window.location.href"; -#if MOZILLA_VERSION_COLLAPSED < 1090200 - script.utf8characters = script_str.c_str(); - script.utf8length = script_str.size(); -#else - script.UTF8Characters = script_str.c_str(); - script.UTF8Length = script_str.size(); -#endif - browser_functions.evaluate(instance, window, &script, location); + NPVariant location; + NPIdentifier location_id = browser_functions.getstringidentifier("location"); + browser_functions.getproperty(instance, window, location_id, &location); + + NPVariant href; + NPIdentifier href_id = browser_functions.getstringidentifier("href"); + browser_functions.getproperty(instance, NPVARIANT_TO_OBJECT(location), + href_id, &href); // Strip everything after the last "/" #if MOZILLA_VERSION_COLLAPSED < 1090200 - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).utf8characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).utf8characters, "/", -1); #else - gchar** parts = g_strsplit (NPVARIANT_TO_STRING(*location).UTF8Characters, "/", -1); + gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).UTF8Characters, "/", -1); #endif guint parts_sz = g_strv_length (parts); + std::string location_str; for (int i=0; i < parts_sz - 1; i++) { location_str += parts[i]; @@ -1054,6 +1050,8 @@ plugin_get_documentbase (NPP instance) documentbase_copy = g_strdup (location_str.c_str()); // Release references. + browser_functions.releasevariantvalue(&href); + browser_functions.releasevariantvalue(&location); cleanup_done: PLUGIN_DEBUG_0ARG ("plugin_get_documentbase return\n"); PLUGIN_DEBUG_1ARG("plugin_get_documentbase returning: %s\n", documentbase_copy); diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/IcedTeaPluginUtils.h --- a/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jun 15 18:21:49 2010 +0100 +++ b/plugin/icedteanp/IcedTeaPluginUtils.h Tue Jun 15 18:34:45 2010 +0100 @@ -71,7 +71,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str); \ } \ } while (0) @@ -81,7 +81,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1); \ } \ } while (0) @@ -91,7 +91,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2); \ } \ } while (0) @@ -101,7 +101,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3); \ } \ } while (0) @@ -111,7 +111,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4); \ } \ } while (0) @@ -121,7 +121,7 @@ exception statement from your version. * { \ if (plugin_debug) \ { \ - fprintf(stderr, "ICEDTEA NP PLUGIN: thread %p: ", pthread_self()); \ + fprintf(stderr, "ICEDTEA NP PLUGIN: "); \ fprintf(stderr, str, arg1, arg2, arg3, arg4, arg5); \ } \ } while (0) @@ -137,8 +137,8 @@ exception statement from your version. * } #define HEX_TO_INT(c) \ - ((*c >= 'A') ? *c - 'A' + 10 : \ - (*c >= 'a') ? *c - 'a' + 10 : \ + ((*c >= 'a') ? *c - 'a' + 10 : \ + (*c >= 'A') ? *c - 'A' + 10 : \ *c - '0') #define IS_VALID_HEX(c) \ diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Tue Jun 15 18:21:49 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Tue Jun 15 18:34:45 2010 +0100 @@ -164,11 +164,11 @@ class PluginMessageConsumer { registerPriorityWait("instance " + instanceNum + " handle"); registerPriorityWait("instance " + instanceNum + " width"); - } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) { + } else if (msgParts[2].equals("handle")) { Integer instanceNum = new Integer(msgParts[1]); // If this instance is not in init, return false immediately. - // Handle/Width messages should NEVER go before tag messages + // Handle messages should NEVER go before tag messages if (!isInInit(instanceNum)) return false; } diff -r 09f5a7f1fb25 -r 4fed9f38e501 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java --- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Tue Jun 15 18:21:49 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Tue Jun 15 18:34:45 2010 +0100 @@ -72,7 +72,7 @@ class PluginMessageHandlerWorker extends if (message != null) { - PluginDebug.debug("Consumer thread " + id + " consuming " + message); + PluginDebug.debug("Consumer (priority=" + isPriorityWorker + ") thread " + id + " consuming " + message); // ideally, whoever returns things object should mark it // busy first, but just in case.. @@ -90,7 +90,7 @@ class PluginMessageHandlerWorker extends this.message = null; - PluginDebug.debug("Consumption completed by consumer thread " + id); + PluginDebug.debug("Consumption (priority=" + isPriorityWorker + ") completed by consumer thread " + id); // mark ourselves free again free(); From bugzilla-daemon at icedtea.classpath.org Tue Jun 15 12:44:08 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Jun 2010 19:44:08 +0000 Subject: [Bug 358] java programe exit while inputting chinese with scim Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=358 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME ------- Comment #5 from asu at redhat.com 2010-06-15 19:44 ------- unable to replicate this issue, scim was able to input the characters perfectly and I experience no errors at all. (tried about 3000+ characters) java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (fedora-41.b18.fc13-x86_64) OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) if are you able still encountering this issue please reopen -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 15 13:55:18 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Jun 2010 20:55:18 +0000 Subject: [Bug 504] Uniform scalings broken when drawing dashed lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=504 dlila at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|dlila at redhat.com |unassigned at icedtea.classpath | |.org -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 15 13:58:25 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Jun 2010 20:58:25 +0000 Subject: [Bug 504] Uniform scalings broken when drawing dashed lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=504 ------- Comment #4 from dlila at redhat.com 2010-06-15 20:58 ------- Created an attachment (id=372) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=372&action=view) Fixes it, and a few minor things. This patch is against openjdk7, but it should, with a bit of modification work in icedtea6, since the patched file hasn't changed. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 06:00:50 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 13:00:50 +0000 Subject: [Bug 504] Uniform scalings broken when drawing dashed lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=504 ------- Comment #5 from gnu_andrew at member.fsf.org 2010-06-16 13:00 ------- Denis, the original bug (503) says this is fixed in OpenJDK7. Is this not true or is this just a different bug that is broken in OpenJDK7? If it is broken in OpenJDK7, then I'd suggest posting about the bug, with this patch, to 2d-dev at openjdk.java.net where it can be discussed and integrated upstream. Ping me on IRC (gnu_andrew/gnu_andy) if you need any help building OpenJDK without the aid of IcedTea :-) I'd suggest using the 2d forest: http://hg.openjdk.java.net/jdk7/2d -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From zmo at google.com Mon Jun 14 16:41:18 2010 From: zmo at google.com (Zhenyao Mo) Date: Mon, 14 Jun 2010 16:41:18 -0700 Subject: how to do non-boot-strapped build for icedtea6 Message-ID: Hi, I want to do an icedtea6 build without bootstrap, i.e., without depending on an previously built icedtea6-bin. For icedtea7, seems like you can pass in --disable-bootstrap. However, I couldn't find the same flag for icedtea6. Anyone can give me some hints how to do that for icedtea6? Thanks a lot ! - mo -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100614/1aff84b6/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 06:16:18 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 13:16:18 +0000 Subject: [Bug 504] Uniform scalings broken when drawing dashed lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=504 dlila at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #362 is|0 |1 obsolete| | ------- Comment #6 from dlila at redhat.com 2010-06-16 13:16 ------- Created an attachment (id=374) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=374&action=view) Good reproducer @Andrew: Bug 503 is a completely different bug, which was fixed in OpenJDK7 and backported into openjdk6 last week. I only mentioned it because bug 503 and this had very similar reproducers, and when I didn't want to attach the same thing twice. Now, however, I've posted a proper reproducer for this. I sent a patch that fixes this bug to the 2d-dev mailing list yesterday, explaining what was wrong, how I fixed it, and why I fixed it the way I did. Hopefully it will get accepted soon. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 06:26:06 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 13:26:06 +0000 Subject: [Bug 506] Jagged round endcaps when drawing scaled up lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=506 dlila at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|dlila at redhat.com |unassigned at icedtea.classpath | |.org ------- Comment #5 from dlila at redhat.com 2010-06-16 13:26 ------- I'd appreciate it if anyone could take a look at this patch. It has been about a week since it was submitted to the openjdk 2d-dev mailing list, so maybe it can be included in icedtea. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 07:24:15 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 14:24:15 +0000 Subject: [Bug 281] web100 applet fails to display buttons Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=281 asu at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution| |WORKSFORME ------- Comment #6 from asu at redhat.com 2010-06-16 14:24 ------- closing as worksforme. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 07:37:10 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 14:37:10 +0000 Subject: [Bug 506] Jagged round endcaps when drawing scaled up lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=506 ------- Comment #6 from ptisnovs at redhat.com 2010-06-16 14:37 ------- I think you are using good approximation of ellipse circumference. But maybe this code: + double mappedD1 = dx1*dx1 + dy1*dy1; + double mappedD2 = dx2*dx2 + dy2*dy2; + double mappedD = radius * java.lang.Math.sqrt(Math.max(mappedD1, mappedD2); is somewhat quickier than: + double mappedD1 = radius * java.lang.Math.sqrt(dx1*dx1 + dy1*dy1); + double mappedD2 = radius * java.lang.Math.sqrt(dx2*dx2 + dy2*dy2); + double mappedD = (mappedD1 < mappedD2) ? mappedD2 : mappedD1; (because one sqrt and one multiplication is eliminated) But it's just minor enhancement (I'll try your patch to check if there is any performance difference in Java2D benchmark). Have your patch been accepted by Oracle engineers? I just read response from James Graham. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 08:49:23 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 15:49:23 +0000 Subject: [Bug 506] Jagged round endcaps when drawing scaled up lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=506 ------- Comment #7 from dlila at redhat.com 2010-06-16 15:49 ------- Pavel: That is, indeed, much better than what I did. How would I go about incorporating this change into my patch? Would I have to submit a new patch? It has not been accepted yet. The only thing I have heard about it is James Graham's suggestion, which I don't think can be followed without some pretty major changes to Pisces. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 08:57:21 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 15:57:21 +0000 Subject: [Bug 506] Jagged round endcaps when drawing scaled up lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=506 ------- Comment #8 from gnu_andrew at member.fsf.org 2010-06-16 15:57 ------- But you didn't reply and say that (or not publicly anyway). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 16 09:12:06 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Jun 2010 16:12:06 +0000 Subject: [Bug 506] Jagged round endcaps when drawing scaled up lines. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=506 ------- Comment #9 from dlila at redhat.com 2010-06-16 16:12 ------- Andrew: Yes, I haven't sent that reply to James Graham's comment yet. I will do it as soon as I am finished with another patch I am working on and sending a JTreg reproducer for http://cr.openjdk.java.net/~andrew/rh597227/, like you said. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 17 06:02:05 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 17 Jun 2010 13:02:05 +0000 Subject: [Bug 508] New: Aptana studio constantly crashing Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=508 Summary: Aptana studio constantly crashing Product: IcedTea Version: unspecified Platform: 32-bit OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: eazyigz at gmail.com I am running Aptana Studio, build: 2.0.4.1268158907 on CentOS release 5.4, and keeps crashing (every hour). The console says: An unexpected error has been detected by Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00a18f5c, pid=24044, tid=2277116816 # # Java VM: OpenJDK Client VM (1.6.0-b09 mixed mode linux-x86) # Problematic frame: # V [libjvm.so+0x26af5c] # # An error report file with more information is saved as: # /home/Aptana Studio 2.0/hs_err_pid24044.log # If you would like to submit a bug report, please visit: # http://icedtea.classpath.org/bugzilla And here is the log file: Current thread (0x082cc800): VMThread [stack: 0x87b20000,0x87ba1000] [id=24054] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x00020000 Registers: EAX=0x00020000, EBX=0x00b83de4, ECX=0xab374160, EDX=0x00000001 ESP=0x87b9fcec, EBP=0x87b9fcf8, ESI=0x00000001, EDI=0x00000002 EIP=0x00a18f5c, CR2=0x00020000, EFLAGS=0x00010206 Top of Stack: (sp=0x87b9fcec) 0x87b9fcec: 00b83de4 ab374020 ab374018 87b9fd28 0x87b9fcfc: 009390c2 09699680 ab373970 00000000 0x87b9fd0c: 008f669e 008f293e 00a456de 00a3450e 0x87b9fd1c: 00b83de4 ab374018 ac155680 87b9fd58 0x87b9fd2c: 00aa4b83 a7d60158 ab374018 ab373fc8 0x87b9fd3c: ab373fc8 0827b0b0 0827ae00 ac146608 0x87b9fd4c: 00b83de4 00b9b9c8 0827ae00 87b9fd78 0x87b9fd5c: 008cfe9b 0827ce58 0827b0b0 00000002 Instructions: (pc=0x00a18f5c) 0x00a18f4c: 8d 0c 91 31 f6 eb 03 83 c1 08 8b 01 85 c0 74 26 0x00a18f5c: 8b 10 8b 83 c4 ee ff ff 80 38 00 74 0a 89 d0 83 Stack: [0x87b20000,0x87ba1000], sp=0x87b9fcec, free space=511k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) V [libjvm.so+0x26af5c] V [libjvm.so+0x18b0c2] V [libjvm.so+0x2f6b83] V [libjvm.so+0x121e9b] V [libjvm.so+0x16ef3e] V [libjvm.so+0x16f0fc] V [libjvm.so+0x175710] V [libjvm.so+0x329e31] V [libjvm.so+0x16de9d] V [libjvm.so+0x16e494] -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Thu Jun 17 09:03:20 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 17:03:20 +0100 Subject: The big Zero deletion Message-ID: Zero was upstreamed a while back, and we backported the beginnings of it for OpenJDK6 b19. For b20, the remaining upstream fixes have been synced: http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001764.html and b20 should shortly be released. icedtea6-hg (http://icedtea.classpath.org/hg/icedtea6-hg) is the tree tracking b20 and I've started work there on removing the upstreamed Zero. Overall, 84 files can simply be removed (the only difference being copyright heads) including a lot of files from ports and zero.patch. Shark is pretty separate in its own directory and can simply remain. The ARM port is a little more complicated, as some Zero files have been altered for this. These files will be removed as well, and the changes turned into a patch, so that we don't keep stale versions of upstream files in IcedTea6. There also seem to be a few minor differences that haven't been upstreamed. The details are as follows: ports/hotspot/src/share/vm/includeDB_shark ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp ports/hotspot/src/share/vm/shark/sharkState.hpp ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp ports/hotspot/src/share/vm/shark/sharkValue.hpp ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp ports/hotspot/src/share/vm/shark/sharkState.cpp ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp ports/hotspot/src/share/vm/shark/sharkEntry.hpp ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp ports/hotspot/src/share/vm/shark/sharkValue.cpp ports/hotspot/src/share/vm/shark/sharkFunction.hpp ports/hotspot/src/share/vm/shark/sharkBuilder.cpp ports/hotspot/src/share/vm/shark/shark_globals.cpp ports/hotspot/src/share/vm/shark/sharkCompiler.hpp ports/hotspot/src/share/vm/shark/sharkContext.hpp ports/hotspot/src/share/vm/shark/sharkConstant.hpp ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp ports/hotspot/src/share/vm/shark/sharkBuilder.hpp ports/hotspot/src/share/vm/shark/sharkFunction.cpp ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp ports/hotspot/src/share/vm/shark/shark_globals.hpp ports/hotspot/src/share/vm/shark/sharkConstant.cpp ports/hotspot/src/share/vm/shark/sharkContext.cpp ports/hotspot/src/share/vm/shark/sharkCompiler.cpp ports/hotspot/src/share/vm/shark/sharkInliner.hpp ports/hotspot/src/share/vm/shark/sharkType.hpp ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp ports/hotspot/src/share/vm/shark/sharkInliner.cpp ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp ports/hotspot/src/share/vm/shark/sharkRuntime.hpp ports/hotspot/src/share/vm/shark/sharkStack.cpp ports/hotspot/src/share/vm/shark/sharkInvariants.cpp ports/hotspot/src/share/vm/shark/sharkBlock.cpp ports/hotspot/src/share/vm/shark/sharkStack.hpp ports/hotspot/src/share/vm/shark/sharkInvariants.hpp ports/hotspot/src/share/vm/shark/sharkRuntime.cpp ports/hotspot/src/share/vm/shark/sharkBlock.hpp ports/hotspot/src/share/vm/shark/llvmHeaders.hpp ports/hotspot/src/share/vm/shark/llvmValue.hpp ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp ports/hotspot/make/./linux/makefiles/shark.make: Shark only files, remain as is. ports/hotspot/src/./cpu/zero/vm/cppInterpreter_arm.S ports/hotspot/src/./cpu/zero/vm/thumb2.cpp ports/hotspot/src/./cpu/zero/vm/asm_helper.cpp ports/hotspot/src/./cpu/zero/vm/bytecodes_arm.def: ARM assembler only files remain as is. ports/hotspot/src/./cpu/zero/vm/cppInterpreter_zero.cpp ports/hotspot/src/./cpu/zero/vm/bytecodes_zero.cpp ports/hotspot/src/./cpu/zero/vm/bytecodes_zero.hpp ports/hotspot/src/./os_cpu/linux_zero/vm/os_linux_zero.cpp ports/hotspot/make/./linux/makefiles/zeroshark.make: All have ARM changes ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp: Has the following differences left. (- is IcedTea6, + is OpenJDK6) @@ -35,7 +35,6 @@ define_pd_global(bool, UncommonNullCast, true); define_pd_global(intx, CodeEntryAlignment, 32); -define_pd_global(intx, OptoLoopAlignment, 16); define_pd_global(intx, InlineFrequencyCount, 100); define_pd_global(intx, PreInflateSpin, 10); @@ -45,5 +44,3 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); - -define_pd_global(intx, InlineSmallCode, 1000); plus old Sun copyright. ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp: Has the following differences left +// The disassembler prints out zero code annotated +// with Java specific information. + static int pd_instruction_alignment() { - return 1; + ShouldNotCallThis(); } static const char* pd_cpu_opts() { - return ""; + ShouldNotCallThis(); Again with old Sun copyright. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From gbenson at redhat.com Thu Jun 17 10:39:19 2010 From: gbenson at redhat.com (Gary Benson) Date: Thu, 17 Jun 2010 18:39:19 +0100 Subject: The big Zero deletion In-Reply-To: References: Message-ID: <20100617173919.GE4284@redhat.com> Andrew John Hughes wrote: > There also seem to be a few minor differences that haven't been > upstreamed. There shouldn't be :( > ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp: > > Has the following differences left. > > (- is IcedTea6, + is OpenJDK6) > > @@ -35,7 +35,6 @@ > define_pd_global(bool, UncommonNullCast, true); > > define_pd_global(intx, CodeEntryAlignment, 32); > -define_pd_global(intx, OptoLoopAlignment, 16); > define_pd_global(intx, InlineFrequencyCount, 100); > define_pd_global(intx, PreInflateSpin, 10); > > @@ -45,5 +44,3 @@ > > define_pd_global(bool, RewriteBytecodes, true); > define_pd_global(bool, RewriteFrequentPairs, true); > - > -define_pd_global(intx, InlineSmallCode, 1000); > > plus old Sun copyright. We should be able to ignore this one and just use whatever comes from upstream. If we're changing things like this to make it build then presumably that means upstream doesn't build? > ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp: > > Has the following differences left > > +// The disassembler prints out zero code annotated > +// with Java specific information. > + > static int pd_instruction_alignment() { > - return 1; > + ShouldNotCallThis(); > } > > static const char* pd_cpu_opts() { > - return ""; > + ShouldNotCallThis(); This change is being upstreamed as part of Shark. It's probably best to simply ignore this one and just use whatever comes from upstream. It's only for a not-very-useful debug option that probably nobody even knows about. Cheers, Gary -- http://gbenson.net/ From ahughes at redhat.com Thu Jun 17 11:08:11 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 19:08:11 +0100 Subject: The big Zero deletion In-Reply-To: <20100617173919.GE4284@redhat.com> References: <20100617173919.GE4284@redhat.com> Message-ID: On 17 June 2010 18:39, Gary Benson wrote: > Andrew John Hughes wrote: >> There also seem to be a few minor differences that haven't been >> upstreamed. > > There shouldn't be :( >> ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp: >> >> Has the following differences left. >> >> (- is IcedTea6, + is OpenJDK6) >> >> @@ -35,7 +35,6 @@ >> ?define_pd_global(bool, ?UncommonNullCast, ? ? true); >> >> ?define_pd_global(intx, ?CodeEntryAlignment, ? 32); >> -define_pd_global(intx, ?OptoLoopAlignment, ? ?16); >> ?define_pd_global(intx, ?InlineFrequencyCount, 100); >> ?define_pd_global(intx, ?PreInflateSpin, ? ? ? 10); >> >> @@ -45,5 +44,3 @@ >> >> ?define_pd_global(bool, ?RewriteBytecodes, ? ? true); >> ?define_pd_global(bool, ?RewriteFrequentPairs, true); >> - >> -define_pd_global(intx, ?InlineSmallCode, ? ? ?1000); >> >> plus old Sun copyright. > > We should be able to ignore this one and just use whatever comes from > upstream. ?If we're changing things like this to make it build then > presumably that means upstream doesn't build? > Upstream builds. I wouldn't have pushed it otherwise. But upstream doesn't have Shark. Are these additions not needed for Shark? >> ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp: >> >> Has the following differences left >> >> +// The disassembler prints out zero code annotated >> +// with Java specific information. >> + >> ? ?static int pd_instruction_alignment() { >> - ? ?return 1; >> + ? ?ShouldNotCallThis(); >> ? ?} >> >> ? ?static const char* pd_cpu_opts() { >> - ? ?return ""; >> + ? ?ShouldNotCallThis(); > > This change is being upstreamed as part of Shark. ?It's probably best > to simply ignore this one and just use whatever comes from upstream. > It's only for a not-very-useful debug option that probably nobody even > knows about. > Ok, do you have this somewhere else if we delete it from IcedTea6? > Cheers, > Gary > > -- > http://gbenson.net/ > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Thu Jun 17 11:23:26 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 19:23:26 +0100 Subject: The big Zero deletion In-Reply-To: References: <20100617173919.GE4284@redhat.com> Message-ID: On 17 June 2010 19:08, Andrew John Hughes wrote: > On 17 June 2010 18:39, Gary Benson wrote: >> Andrew John Hughes wrote: >>> There also seem to be a few minor differences that haven't been >>> upstreamed. >> >> There shouldn't be :( >>> ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp: >>> >>> Has the following differences left. >>> >>> (- is IcedTea6, + is OpenJDK6) >>> >>> @@ -35,7 +35,6 @@ >>> ?define_pd_global(bool, ?UncommonNullCast, ? ? true); >>> >>> ?define_pd_global(intx, ?CodeEntryAlignment, ? 32); >>> -define_pd_global(intx, ?OptoLoopAlignment, ? ?16); >>> ?define_pd_global(intx, ?InlineFrequencyCount, 100); >>> ?define_pd_global(intx, ?PreInflateSpin, ? ? ? 10); >>> >>> @@ -45,5 +44,3 @@ >>> >>> ?define_pd_global(bool, ?RewriteBytecodes, ? ? true); >>> ?define_pd_global(bool, ?RewriteFrequentPairs, true); >>> - >>> -define_pd_global(intx, ?InlineSmallCode, ? ? ?1000); >>> >>> plus old Sun copyright. >> >> We should be able to ignore this one and just use whatever comes from >> upstream. ?If we're changing things like this to make it build then >> presumably that means upstream doesn't build? >> > > Upstream builds. ?I wouldn't have pushed it otherwise. ?But upstream > doesn't have Shark. ?Are these additions not needed for Shark? > Ok the IcedTea6 local changes actually break the build: /mnt/builder/icedtea6-hg/openjdk/hotspot/src/share/vm/runtime/globals.hpp:50:1: error: redefinition of 'const intx pd_InlineSmallCode' /mnt/builder/icedtea6-hg/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp:49:1: error: 'const intx pd_InlineSmallCode' previously defined here I presume they were added for hs14, when we're now on hs17. I'm dropping these changes. >>> ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp: >>> >>> Has the following differences left >>> >>> +// The disassembler prints out zero code annotated >>> +// with Java specific information. >>> + >>> ? ?static int pd_instruction_alignment() { >>> - ? ?return 1; >>> + ? ?ShouldNotCallThis(); >>> ? ?} >>> >>> ? ?static const char* pd_cpu_opts() { >>> - ? ?return ""; >>> + ? ?ShouldNotCallThis(); >> >> This change is being upstreamed as part of Shark. ?It's probably best >> to simply ignore this one and just use whatever comes from upstream. >> It's only for a not-very-useful debug option that probably nobody even >> knows about. >> > > Ok, do you have this somewhere else if we delete it from IcedTea6? > I think I'll leave this in, but convert it to a patch (shark-debug-option.patch) >> Cheers, >> Gary >> >> -- >> http://gbenson.net/ >> > > > > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Thu Jun 17 12:27:44 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 17 Jun 2010 19:27:44 +0000 Subject: /hg/icedtea6-hg: 6 new changesets Message-ID: changeset df96f563510a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=df96f563510a author: Deepak Bhole date: Mon Jun 14 14:55:08 2010 -0400 Patch for Bug# 480 (NPPlugin with NoScript extension), by Omair Majid. changeset 3dc9772300a0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3dc9772300a0 author: Deepak Bhole date: Mon Jun 14 14:58:37 2010 -0400 Fix for Bug# 488 (Question mark changing into underscore in URL), by Omair M. changeset 9a9ed35b3f80 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9a9ed35b3f80 author: Deepak Bhole date: Mon Jun 14 15:03:55 2010 -0400 Fix bug causing 100% CPU usage (rhbz# 592553). changeset 1e95c787d40b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1e95c787d40b author: Andrew John Hughes date: Tue Jun 15 18:34:45 2010 +0100 Don't generate a random pointer from a pthread_t in the debug output. 2010-06-14 Andrew John Hughes Don't print out the return value of pthread_self which is a pthread_t. pthread_t is an opaque type and we don't know what it actually is (it varies from system to system; recent versions of Linux use an unsigned long int). * plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. changeset 17f89df79552 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=17f89df79552 author: Andrew John Hughes date: Thu Jun 17 20:25:25 2010 +0100 Remove the local copy of Zero, now available upstream. Replace remaining local changes with patches. 2010-06-17 Andrew John Hughes * patches/nimbus-source-target.patch: Upstreamed as 6961536. * patches/zero.patch: Dropped; old changes necessary for hs16 when we had to support hs14 & hs16. These changes are now upstream. * ports/hotspot/make/linux/makefiles/zero.make, * ports/hotspot/make/linux/makefiles/zeroshark.make, * ports/hotspot/make/linux/platform_zero.in, * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp, * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp, * ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp, * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp, * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp, * ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp, * ports/hotspot/src/cpu/zero/vm/copy_zero.hpp, * ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp, * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp, * ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp, * ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp, * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp, * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp, * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp, * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp, * ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp, * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp, * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp, * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp, * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp, * ports/hotspot/src/cpu/zero/vm/icache_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp, * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp, * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp, * ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp, * ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp, * ports/hotspot/src/cpu/zero/vm/jni_zero.h, * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp, * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp, * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp, * ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp, * ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp, * ports/hotspot/src/cpu/zero/vm/register_zero.cpp, * ports/hotspot/src/cpu/zero/vm/register_zero.hpp, * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp, * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp, * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp, * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/stack_zero.cpp, * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp, * ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp, * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp, * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp, * ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp, * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp, * ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp, * ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp, * ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline .hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hp p, * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp, * ports/hotspot/src/share/vm/includeDB_zero: Dropped, upstream. * Makefile.am: Remove patches and add new ones. * patches/arm.patch: Changes to Zero necessary for the ARM assembler port. Moved from local files in ports. * patches/shark-debug-option.patch: Remaining Zero changes not upstreamed. changeset d87364165dfb in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d87364165dfb author: Andrew John Hughes date: Thu Jun 17 20:27:34 2010 +0100 Merge diffstat: 213 files changed, 40872 insertions(+), 23567 deletions(-) ChangeLog | 394 Makefile.am | 91 acinclude.m4 | 65 configure.ac | 2 generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java | 119 generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java | 653 generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java | 163 generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java | 636 generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java | 42 generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java | 477 generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java | 42 generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java | 734 generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java | 255 generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java | 160 generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java | 351 generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java | 125 generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java | 2249 generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java | 403 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java | 464 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java | 607 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java | 1046 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java | 518 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java | 41 generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java | 41 generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java | 108 generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java | 153 generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java | 108 generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java | 158 generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java | 1773 generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java | 584 generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java | 164 generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java | 613 generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java | 172 generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java | 705 generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java | 381 generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java | 88 generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java | 380 generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java | 276 generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java | 179 generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java | 88 generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java | 655 generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java | 230 generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java | 583 generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java | 321 generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java | 505 generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java | 290 generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java | 41 generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java | 41 generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java | 93 generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java | 221 generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java | 678 generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java | 135 generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java | 141 generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java | 381 generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java | 42 generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java | 41 generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java | 412 generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java | 125 generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java | 706 generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java | 289 generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java | 212 generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java | 536 generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java | 151 generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java | 144 generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java | 146 generated/com/sun/java/swing/plaf/nimbus/TreePainter.java | 653 hotspot.map | 1 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java | 49 patches/arm.patch | 221 patches/ecj/bootver.patch | 14 patches/ecj/icedtea.patch | 134 patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch | 42 patches/hotspot/hs17/params-cast-size_t.patch | 252 patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch | 14 patches/hotspot/hs17/systemtap.patch | 157 patches/hotspot/original/params-cast-size_t.patch | 252 patches/hotspot/original/shark_do_nothing_on_stub_frame.patch | 15 patches/hotspot/original/systemtap.patch | 182 patches/icedtea-alpha-fixes.patch | 24 patches/icedtea-clean-crypto.patch | 91 patches/icedtea-doc-headers.patch | 181 patches/icedtea-java2d-dasher.patch | 11 patches/icedtea-jtreg-jrunscript.patch | 26 patches/icedtea-nio2.patch | 269 patches/icedtea-nomotif-6706121.patch |26836 +++++----- patches/icedtea-sh4-support.patch | 212 patches/openjdk/6616792-focus-tests-fix.patch | 1117 patches/openjdk/6798572-iso-8859-15-fix.patch | 10 patches/openjdk/6896472-missing_libjsig.patch | 20 patches/params-cast-size_t.patch | 252 patches/shark-debug-option.patch | 30 patches/shark_do_nothing_on_stub_frame.patch | 14 patches/systemtap.patch | 157 patches/xrender/icedtea-000.patch | 112 patches/zero.patch | 107 plugin/icedteanp/IcedTeaNPPlugin.cc | 30 plugin/icedteanp/IcedTeaPluginUtils.h | 16 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 4 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 4 ports/hotspot/make/linux/makefiles/zero.make | 32 ports/hotspot/make/linux/makefiles/zeroshark.make | 80 ports/hotspot/make/linux/platform_zero.in | 17 ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 72 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 63 ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp | 26 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp | 54 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 148 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp | 301 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 81 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 65 ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 164 ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp | 27 ports/hotspot/src/cpu/zero/vm/copy_zero.hpp | 178 ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp | 37 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 957 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 43 ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 31 ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 32 ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 36 ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 65 ports/hotspot/src/cpu/zero/vm/entry_zero.hpp | 74 ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp | 53 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 401 ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 74 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 151 ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 49 ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 49 ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 32 ports/hotspot/src/cpu/zero/vm/icache_zero.hpp | 36 ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 31 ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 73 ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 36 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 161 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 127 ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 66 ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 61 ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 87 ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp | 59 ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp | 108 ports/hotspot/src/cpu/zero/vm/jni_zero.h | 38 ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | 50 ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 185 ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp | 39 ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/register_zero.cpp | 39 ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 108 ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 74 ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp | 32 ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 115 ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 79 ports/hotspot/src/cpu/zero/vm/stack_zero.cpp | 86 ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 219 ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp | 48 ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 253 ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp | 31 ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 51 ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp | 52 ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp | 31 ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp | 62 ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp | 29 ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp | 32 ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 43 ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp | 26 ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 293 ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp | 40 ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 42 ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 167 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 480 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 51 ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp | 30 ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp | 39 ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp | 30 ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp | 26 ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 116 ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp | 45 ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp | 26 ports/hotspot/src/share/vm/includeDB_zero | 68 diffs (truncated from 67119 to 500 lines): diff -r be0a17ddbdb8 -r d87364165dfb ChangeLog --- a/ChangeLog Fri Jun 11 14:45:52 2010 +0100 +++ b/ChangeLog Thu Jun 17 20:27:34 2010 +0100 @@ -1,8 +1,339 @@ 2010-06-11 Andrew John Hughes + + * patches/nimbus-source-target.patch: + Upstreamed as 6961536. + * patches/zero.patch: + Dropped; old changes necessary for hs16 when we had to + support hs14 & hs16. These changes are now upstream. + * ports/hotspot/make/linux/makefiles/zero.make, + * ports/hotspot/make/linux/makefiles/zeroshark.make, + * ports/hotspot/make/linux/platform_zero.in, + * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/copy_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/icache_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/jni_zero.h, + * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/register_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/register_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/stack_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp, + * ports/hotspot/src/share/vm/includeDB_zero: + Dropped, upstream. + * Makefile.am: Remove patches and add new ones. + * patches/arm.patch: Changes to Zero necessary for the ARM assembler + port. Moved from local files in ports. + * patches/shark-debug-option.patch: + Remaining Zero changes not upstreamed. + +2010-06-14 Andrew John Hughes + + Don't print out the return value of pthread_self + which is a pthread_t. pthread_t is an opaque type + and we don't know what it actually is (it varies + from system to system; recent versions of Linux + use an unsigned long int). + * plugin/icedteanp/IcedTeaPluginUtils.h: + (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. + (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. + (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. + (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. + (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. + (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + Make available BUILD_DIR for where a relative + path needs to be built. + (BUILD_DIR): Set to openjdk.build. + (BUILD_OUTPUT_DIR): Use BUILD_DIR. + (ECJ_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-ecj'. + +2010-06-14 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug + causing 100% CPU usage (rhbz# 592553). + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (SRC_DIR_LINK): Use reflink only if hard + linking is not possible. + (liveconnect-dist.stamp): Replace $(REFLINK) with + $(SRC_DIR_LINK). + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + * acinclude.m4: + (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking + to files in the source directory from the build directory + is possible. + * configure.ac: + Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE. + +2010-06-14 Omair Majid + + * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to + incorrect assumption that 'A' > 'a'. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (REFLINK): Remove unneeded quotation. + (OPENJDK_SRC_DIR_LINK): Use reflink only + if hard linking is not possible. + (extract-openjdk.stamp): Replace $(REFLINK) + with $(OPENJDK_SRC_DIR_LINK). + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): Define once only. + (WITH_OPENJDK_SRC_DIR): Define once only. + Check that directory is valid (to the extent + this is discernable by the README being present) + and whether hardlinking is possible, defining + OPENJDK_SRC_DIR_HARDLINKABLE if it is. + +2010-06-14 Omair Majid + + * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead + of evaluate, to get page URL. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (REFLINK): Set to --reflink=auto if + CP_SUPPORTS_REFLINK is defined. + (extract-openjdk.stamp): Replace --reflink=auto + with $(REFLINK). + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): New macro to check + for a cp new enough to have --reflink. + * configure.ac: + Invoke IT_CP_SUPPORTS_REFLINK. + +2010-06-13 Andrew John Hughes + + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java: + Removed, provided upstream. + * Makefile.am: Add new nimbus-source-target.patch. + * patches/ecj/bootver.patch: Always set required version to 1.5, + don't bother checking DISABLE_NIMBUS. + * patches/nimbus-source-target.patch: Fix source/target options + for Nimbus sources to 6, due to presence of @Override on interfaces. + +2010-06-13 Andrew John Hughes + + * generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java, + * generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java, + * generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreePainter.java: + Add generated Nimbus files so SynthUI can be compiled during + bootstrap. + 2010-06-11 Andrew John Hughes * Makefile.am: (rt.stamp): Drop old dependencies no longer needed. + +2010-06-10 Andrew John Hughes + + * patches/icedtea-doc-headers.patch: + Dropped, upstream file has completely changed. + May need to be recreated, may not. + * patches/icedtea-java2d-dasher.patch: + Upstreamed by Omair as 6793344. Now in OpenJDK6. + * Makefile.am: + Remove above patches. + (JAXWS_DROP_URL): Updated. + (JAXWS_DROP_ZIP): Likewise. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAF_DROP_URL): Added. + (JAF_DROP_ZIP): Updated. + (JAF_DROP_SHA256SUM): Likewise. + (JAXP_DROP_URL): Updated. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (download-jaf-drop): Use specific JAF_DROP_URL, + not JAXWS_DROP_URL. + * patches/icedtea-nio2.patch: Converted to use + new doc generation makefile. + +2010-06-08 Andrew John Hughes + + Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ + made obsolete by previous merge. Use --reflink=auto instead + of -l to avoid cross-device issues. + * Makefile.am: + (ICEDTEA_ENV): Fix use of ICEDTEA_BUILD_DIR. + (ICEDTEA_ENV_ECJ): Fix use of ICEDTEA_BUILD_DIR_ECJ. + (distclean-local): Fix use of ICEDTEA_BUILD_DIR + and ICEDTEA_BUILD_DIR_ECJ. + (extract-openjdk.stamp): Use --reflink=auto instead + of -l. + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. 2010-06-07 Andrew John Hughes @@ -38,6 +369,13 @@ 2010-06-07 Jon VanAlten + + * patches/icedtea-alpha-fixes.patch: + Remove upstreamed JDK portion. + * patches/icedtea-sh4-support.patch: + Recreated against upstreamed alpha patch. + 2010-06-04 Jon VanAlten * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java: @@ -49,11 +387,21 @@ 2010-06-01 Xerxes R??nby * Makefile.am: - (extra-lib/about.jar): Remove redundant + (extra-lib/about.jar): Remove redundant conditional that we don't need any more. (rewrite-rhino.stamp): Use full path to jar application to avoid relying on the one on the path. + +2010-05-26 Andrew John Hughes + + * patches/ecj/icedtea.patch, + * patches/icedtea-clean-crypto.patch, + * patches/icedtea-jtreg-jrunscript.patch, + * patches/icedtea-nio2.patch, + * patches/icedtea-nomotif-6706121.patch, + * patches/xrender/icedtea-000.patch: + Update after changes to licensing headers. 2010-05-28 Andrew John Hughes @@ -80,6 +428,30 @@ 2010-05-24 Andrew John Hughes + + Remove hs17 build option as this is now the default. + * patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch: + Dropped; applied upstream. + * patches/hotspot/hs17/params-cast-size_t.patch, + * patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch, + * patches/hotspot/hs17/systemtap.patch: + Moved to top-level. + * patches/hotspot/original/params-cast-size_t.patch, + * patches/hotspot/original/shark_do_nothing_on_stub_frame.patch, + * patches/hotspot/original/systemtap.patch: + Dropped; hs16 is dead. + * patches/openjdk/6896472-missing_libjsig.patch: + Dropped; applied upstream. + * Makefile.am: + Remove differentation between original and hs17 build patches + as only build is now the hs17 one in the OpenJDK repository. + * hotspot.map: Drop hs17. + * patches/params-cast-size_t.patch, + * patches/shark_do_nothing_on_stub_frame.patch, + * patches/systemtap.patch: + Moved from hs17 to top-level. 2010-05-20 Gary Benson @@ -271,7 +643,7 @@ 2010-05-10 Gary Benson + + Use build directories outside the source + tree and link instead of copying external + source trees where possible. + * Makefile.am: + (OS_DIR): Removed. + (BUILD_OUTPUT_DIR): Set to openjdk.build. + (ECJ_BUILD_OUTPUT_DIR): Set to openjdk-ecj.build. + (ICEDTEA_ENV): Set output directory. + (ICEDTEA_ENV_ECJ): Likewise. + (distclean-local): Remove build directories. + (extract-openjdk.stamp): Link instead of copying + where possible. + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. 2010-04-24 Matthias Klose diff -r be0a17ddbdb8 -r d87364165dfb Makefile.am --- a/Makefile.am Fri Jun 11 14:45:52 2010 +0100 +++ b/Makefile.am Thu Jun 17 20:27:34 2010 +0100 @@ -18,23 +18,24 @@ VISUALVM_URL = https://visualvm.dev.java VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/ VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz -JAXWS_DROP_URL = http://kenai.com/projects/jdk6-drops/downloads/download -JAXWS_DROP_ZIP = jdk6-jaxws-2009_10_27.zip -JAXWS_DROP_SHA256SUM = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2 -JAF_DROP_ZIP = jdk6-jaf-2009_10_27.zip -JAF_DROP_SHA256SUM = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f -JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147491 -JAXP_DROP_ZIP = jdk6-jaxp-2010_01_15.zip -JAXP_DROP_SHA256SUM = 181615cfec1c3721a7d8f278fa25b392be4247a496c7774a10cb9df37684f94f +JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724 +JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip +JAXWS_DROP_SHA256SUM = 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb +JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725 +JAF_DROP_ZIP = jdk6-jaf-b20.zip +JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 +JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648 +JAXP_DROP_ZIP = jdk6-jaxp-b20.zip +JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6 # Build directories -OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR) -BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR) +BUILD_DIR = openjdk.build +BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR) DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug -ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj/build/$(OS_DIR) +ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-ecj ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes ICEDTEA_BOOT_DIR= \ @@ -177,11 +178,12 @@ else MEMORY_LIMIT = endif +ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(ICEDTEA_DEBUG_BUILD_DIR)" if WITH_CACAO ICEDTEA_BUILD_TARGET=j2se_only - ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only + ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only else - ICEDTEA_DEBUG_BUILD_TARGET=debug_build + ICEDTEA_DEBUG_BUILD_TARGET += debug_build endif # FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap @@ -195,6 +197,22 @@ else From ahughes at redhat.com Thu Jun 17 12:28:50 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 17 Jun 2010 20:28:50 +0100 Subject: The big Zero deletion In-Reply-To: References: <20100617173919.GE4284@redhat.com> Message-ID: On 17 June 2010 19:23, Andrew John Hughes wrote: > On 17 June 2010 19:08, Andrew John Hughes wrote: >> On 17 June 2010 18:39, Gary Benson wrote: >>> Andrew John Hughes wrote: >>>> There also seem to be a few minor differences that haven't been >>>> upstreamed. >>> >>> There shouldn't be :( >>>> ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp: >>>> >>>> Has the following differences left. >>>> >>>> (- is IcedTea6, + is OpenJDK6) >>>> >>>> @@ -35,7 +35,6 @@ >>>> ?define_pd_global(bool, ?UncommonNullCast, ? ? true); >>>> >>>> ?define_pd_global(intx, ?CodeEntryAlignment, ? 32); >>>> -define_pd_global(intx, ?OptoLoopAlignment, ? ?16); >>>> ?define_pd_global(intx, ?InlineFrequencyCount, 100); >>>> ?define_pd_global(intx, ?PreInflateSpin, ? ? ? 10); >>>> >>>> @@ -45,5 +44,3 @@ >>>> >>>> ?define_pd_global(bool, ?RewriteBytecodes, ? ? true); >>>> ?define_pd_global(bool, ?RewriteFrequentPairs, true); >>>> - >>>> -define_pd_global(intx, ?InlineSmallCode, ? ? ?1000); >>>> >>>> plus old Sun copyright. >>> >>> We should be able to ignore this one and just use whatever comes from >>> upstream. ?If we're changing things like this to make it build then >>> presumably that means upstream doesn't build? >>> >> >> Upstream builds. ?I wouldn't have pushed it otherwise. ?But upstream >> doesn't have Shark. ?Are these additions not needed for Shark? >> > > Ok the IcedTea6 local changes actually break the build: > > /mnt/builder/icedtea6-hg/openjdk/hotspot/src/share/vm/runtime/globals.hpp:50:1: > error: redefinition of 'const intx pd_InlineSmallCode' > /mnt/builder/icedtea6-hg/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp:49:1: > error: 'const intx pd_InlineSmallCode' previously defined here > > I presume they were added for hs14, when we're now on hs17. ?I'm > dropping these changes. > >>>> ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp: >>>> >>>> Has the following differences left >>>> >>>> +// The disassembler prints out zero code annotated >>>> +// with Java specific information. >>>> + >>>> ? ?static int pd_instruction_alignment() { >>>> - ? ?return 1; >>>> + ? ?ShouldNotCallThis(); >>>> ? ?} >>>> >>>> ? ?static const char* pd_cpu_opts() { >>>> - ? ?return ""; >>>> + ? ?ShouldNotCallThis(); >>> >>> This change is being upstreamed as part of Shark. ?It's probably best >>> to simply ignore this one and just use whatever comes from upstream. >>> It's only for a not-very-useful debug option that probably nobody even >>> knows about. >>> >> >> Ok, do you have this somewhere else if we delete it from IcedTea6? >> > > I think I'll leave this in, but convert it to a patch (shark-debug-option.patch) > >>> Cheers, >>> Gary >>> >>> -- >>> http://gbenson.net/ >>> >> >> >> >> -- >> Andrew :-) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 >> > > > > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > Here's the changeset: http://icedtea.classpath.org/hg/icedtea6-hg/rev/17f89df79552 -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Thu Jun 17 13:39:35 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 17 Jun 2010 20:39:35 +0000 Subject: [Bug 508] Aptana studio constantly crashing Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=508 ------- Comment #1 from dlila at redhat.com 2010-06-17 20:39 ------- Hello. Could you please provide some more information about the circumstances of the crashes? Is there anything that can be done to make the crash happen more reliably? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 17 13:50:12 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 17 Jun 2010 20:50:12 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #4 from jon.vanalten at redhat.com 2010-06-17 20:50 ------- I don't believe this is really a JDK bug. The NPE is thrown during initialization after a failed check that System.currentTimeMillis() > 0. Until time travel is invented, this is a sane check. Even initialization was allowed to proceed in this case, there are many classes that depend on sane return values from currentTimeMillis(). I found a very old but somewhat related bug[1]. Here upstream has said that they cannot workaround the OS flaw. I suspect they'd say the same here, and I tend to agree. The clock rolling around in 2038 is a known system limitation[2] that cannot be resolved by Java. /me hopes it will be resolved in all affected OS by then, but will be sure to have a survival kit ready in case of the worst. [1] http://bugs.sun.com/view_bug.do?bug_id=6433179 [2] http://en.wikipedia.org/wiki/Year_2038_problem -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gbenson at redhat.com Fri Jun 18 02:46:55 2010 From: gbenson at redhat.com (Gary Benson) Date: Fri, 18 Jun 2010 10:46:55 +0100 Subject: The big Zero deletion In-Reply-To: References: <20100617173919.GE4284@redhat.com> Message-ID: <20100618094654.GA3874@redhat.com> Andrew John Hughes wrote: > Ok the IcedTea6 local changes actually break the build: > > /mnt/builder/icedtea6-hg/openjdk/hotspot/src/share/vm/runtime/globals.hpp:50:1: > error: redefinition of 'const intx pd_InlineSmallCode' > /mnt/builder/icedtea6-hg/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp:49:1: > error: 'const intx pd_InlineSmallCode' previously defined here > > I presume they were added for hs14, when we're now on hs17. I'm > dropping these changes. Awesome. I was trying to figure out why they would be necessary, but I guess that's why :) > > > > ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp: [snip] > > > This change is being upstreamed as part of Shark. ?It's probably > > > best to simply ignore this one and just use whatever comes from > > > upstream. It's only for a not-very-useful debug option that > > > probably nobody even knows about. > > > > Ok, do you have this somewhere else if we delete it from IcedTea6? > > I think I'll leave this in, but convert it to a patch > (shark-debug-option.patch) I do have it elsewhere (in the Shark repo) but a patch is good too. Cheers, Gary -- http://gbenson.net/ From thebohemian at gmx.net Fri Jun 18 04:42:14 2010 From: thebohemian at gmx.net (Robert Schuster) Date: Fri, 18 Jun 2010 13:42:14 +0200 Subject: [RFC] add --with-build-for-cc option Message-ID: <4C1B5B96.8070701@gmx.net> Hi, following examples for the autotools I added a --with-cc-for-build option to IcedTea6's configure.ac, Makefile.am, acinclude.m4 that allows specifying the compiler to use for helper programs that need to be compiled with the build system's compiler (rather than the one for the target). The patch also includes a change to the ARM assembler port's makefile that makes it compile 'mkbc' with the build compiler. If used the variable CROSS_COMPILATION to absolutely make sure that nothing changes for non-cross builds. The change is only possible because the mkbc tool does not depend on the sizes of data structures - genoffsets is a different beast in that regard and I will come up with a different solution for that later. Btw: AFAIK the patch does not interfere with the soon to be removed zero sources. 2009-06-18 Robert Schuster * configure.ac: Added --with-cc-for-build option. * acinclude: New macro AC_CHECK_WITH_CC_FOR_BUILD. * Makefile.am: Provide CC_FOR_BUILD through icedtea-env. * ports/hotspot/make/linux/makefiles/zeroshark.make: Use CC_FOR_BUILD when cross-compiling. Ok, for commit? Regards Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: cc-for-build-option.patch Type: text/x-patch Size: 2768 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100618/35f46442/cc-for-build-option.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 262 bytes Desc: OpenPGP digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100618/35f46442/signature.asc From dlila at redhat.com Fri Jun 18 08:36:47 2010 From: dlila at redhat.com (Denis Lila) Date: Fri, 18 Jun 2010 11:36:47 -0400 (EDT) Subject: pushing patches for bugs 504, 506 In-Reply-To: <1119894592.451921276875087761.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <155097661.452351276875407150.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Hello. So, I would like to push patches for these 2 bugs into icedtea: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=506 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=504 I already uploaded the patches in bugzilla, so that you can look at them. I have discussed the changes for bug 506 here: http://mail.openjdk.java.net/pipermail/2d-dev/2010-June/001316.html and for bug 504 here: http://mail.openjdk.java.net/pipermail/2d-dev/2010-June/001305.html Should I go ahead and push them? Thank you, Denis. From bugzilla-daemon at icedtea.classpath.org Fri Jun 18 13:33:53 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 18 Jun 2010 20:33:53 +0000 Subject: [Bug 509] New: Antialiased horizontal or vertical lines are not drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=509 Summary: Antialiased horizontal or vertical lines are not drawn properly. Product: IcedTea Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: dlila at redhat.com They're thicker and less opaque than they should be. This is most noticeable on lines of width one. Also, it specifically says in the Graphics2D documentation that this shouldn't happen, and that for vertical and horizontal lines antialiased and aliased behaviour should be as close as possible: http://java.sun.com/javase/6/docs/api/java/awt/Graphics2D.html (second paragraph, under Rendering Compatibility Issues). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 18 13:34:50 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 18 Jun 2010 20:34:50 +0000 Subject: [Bug 509] Antialiased horizontal or vertical lines are not drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=509 ------- Comment #1 from dlila at redhat.com 2010-06-18 20:34 ------- Created an attachment (id=376) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=376&action=view) reproducer -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 18 13:41:34 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 18 Jun 2010 20:41:34 +0000 Subject: [Bug 509] Antialiased horizontal or vertical lines are not drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=509 ------- Comment #2 from dlila at redhat.com 2010-06-18 20:41 ------- Created an attachment (id=377) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=377&action=view) openjdk result -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 18 13:41:55 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 18 Jun 2010 20:41:55 +0000 Subject: [Bug 509] Antialiased horizontal or vertical lines are not drawn properly. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=509 ------- Comment #3 from dlila at redhat.com 2010-06-18 20:41 ------- Created an attachment (id=378) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=378&action=view) Sun's jdk result -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Jun 20 13:20:41 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 20 Jun 2010 20:20:41 +0000 Subject: [Bug 510] New: System.load on applet hang the second time Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=510 Summary: System.load on applet hang the second time Product: IcedTea Version: 6-1.8 Platform: 64-bit OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: amarzo at hotmail.com If you have an applet that loads a native library using System.load it will work perfectly the first time that you run the applet, but if you reload the applet it hangs (and successive loads also). Closing the browser solve the problem. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From thebohemian at gmx.net Mon Jun 21 05:54:06 2010 From: thebohemian at gmx.net (Robert Schuster) Date: Mon, 21 Jun 2010 14:54:06 +0200 Subject: [RFC] add --with-build-for-cc option In-Reply-To: <4C1B5B96.8070701@gmx.net> References: <4C1B5B96.8070701@gmx.net> Message-ID: <4C1F60EE.2080000@gmx.net> Hi all, Am 18.06.2010 13:42, schrieb Robert Schuster: > Hi, > following examples for the autotools I added a --with-cc-for-build > The documentation I am referencing here is actually this: http://makelinux.com/books/autobook-1.5/autobook_270.html Regards Robert > option to IcedTea6's configure.ac, Makefile.am, acinclude.m4 that allows > specifying the compiler to use for helper programs that need to be > compiled with the build system's compiler (rather than the one for the > target). The patch also includes a change to the ARM assembler port's > makefile that makes it compile 'mkbc' with the build compiler. If used > the variable CROSS_COMPILATION to absolutely make sure that nothing > changes for non-cross builds. The change is only possible because the > mkbc tool does not depend on the sizes of data structures - genoffsets > is a different beast in that regard and I will come up with a different > solution for that later. > > Btw: AFAIK the patch does not interfere with the soon to be removed zero > sources. > Hm, of course this stuff has been committed already ... but I had not read fully through the respective threads when I sent my mail. ;-) > 2009-06-18 Robert Schuster > > * configure.ac: Added --with-cc-for-build option. > * acinclude: New macro AC_CHECK_WITH_CC_FOR_BUILD. > * Makefile.am: Provide CC_FOR_BUILD through icedtea-env. > * ports/hotspot/make/linux/makefiles/zeroshark.make: Use > CC_FOR_BUILD when cross-compiling. > > Ok, for commit? > > Regards > Robert > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 262 bytes Desc: OpenPGP digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100621/7dcfd356/signature.asc From xerxes at zafena.se Mon Jun 21 06:47:04 2010 From: xerxes at zafena.se (=?ISO-8859-15?Q?Xerxes_R=E5nby?=) Date: Mon, 21 Jun 2010 15:47:04 +0200 Subject: [RFC] add --with-build-for-cc option In-Reply-To: <4C1F60EE.2080000@gmx.net> References: <4C1B5B96.8070701@gmx.net> <4C1F60EE.2080000@gmx.net> Message-ID: <4C1F6D58.1070500@zafena.se> On 2010-06-21 14:54, Robert Schuster wrote: > Hi all, > > Am 18.06.2010 13:42, schrieb Robert Schuster: > >> Hi, >> following examples for the autotools I added a --with-cc-for-build >> >> > The documentation I am referencing here is actually this: > http://makelinux.com/books/autobook-1.5/autobook_270.html > > Regards > Robert > > >> option to IcedTea6's configure.ac, Makefile.am, acinclude.m4 that allows >> specifying the compiler to use for helper programs that need to be >> compiled with the build system's compiler (rather than the one for the >> target). The patch also includes a change to the ARM assembler port's >> makefile that makes it compile 'mkbc' with the build compiler. If used >> the variable CROSS_COMPILATION to absolutely make sure that nothing >> changes for non-cross builds. The change is only possible because the >> mkbc tool does not depend on the sizes of data structures - genoffsets >> is a different beast in that regard and I will come up with a different >> solution for that later. >> >> Btw: AFAIK the patch does not interfere with the soon to be removed zero >> sources. >> >> > Hm, of course this stuff has been committed already ... but I had not > read fully through the respective threads when I sent my mail. ;-) > > >> 2009-06-18 Robert Schuster >> >> * configure.ac: Added --with-cc-for-build option. >> * acinclude: New macro AC_CHECK_WITH_CC_FOR_BUILD. >> * Makefile.am: Provide CC_FOR_BUILD through icedtea-env. >> * ports/hotspot/make/linux/makefiles/zeroshark.make: Use >> CC_FOR_BUILD when cross-compiling. >> >> Ok, for commit? >> >> Regards >> Robert >> >> Hi Robert! ... diff -r 1e95c787d40b ports/hotspot/make/linux/makefiles/zeroshark.make --- a/ports/hotspot/make/linux/makefiles/zeroshark.make Tue Jun 15 18:34:45 2010 +0100 +++ b/ports/hotspot/make/linux/makefiles/zeroshark.make Fri Jun 18 13:30:12 2010 +0200 @@ -35,6 +35,12 @@ #XXX and the updated calling convention for deopt (PR icedtea/484) #CFLAGS += -DHOTSPOT_ASM +ifeq ($(CROSS_COMPILATION), true) + C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) +else + C_COMPILE_FOR_MKBC = $(C_COMPILE) +endif + %.o: %.S @echo Assembling $< $(QUIETLY) $(REMOVE_TARGET) @@ -53,7 +59,7 @@ mkbc: $(GAMMADIR)/tools/mkbc.c @echo Compiling mkbc tool - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) + $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) mkoffsets: asm_helper.cpp @echo Compiling offset generator ... I do not see why we need to conditionalize the zeroshark.make code at all, I think it would be better and cleaner to always use the passed $(CC_FOR_BUILD) when compiling mkbc.c Cheers Xerxes From omajid at redhat.com Mon Jun 21 07:32:37 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 21 Jun 2010 10:32:37 -0400 Subject: [RFC] Netx: some native libraries are not found Message-ID: <4C1F7805.5070300@redhat.com> Hi, There is a bug in the current version of Netx that fails to find some native libraries [1][2]. In the current implementation of Netx, one classloader is created per JNLP file; for JNLP files loaded as extensions, the classloaders share information about where to find resources. Unfortunately, they do not share any information about where to find native libraries. This makes Web Start applications with extensions that use native libraries fail. The proposed patch [3] fixes this. Any comments concerns? Should I go ahead and commit this fix? Cheers, Omair [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=507 [2] https://bugzilla.redhat.com/show_bug.cgi?id=526247 [3] http://icedtea.classpath.org/bugzilla/attachment.cgi?id=368 From thebohemian at gmx.net Mon Jun 21 08:05:48 2010 From: thebohemian at gmx.net (Robert Schuster) Date: Mon, 21 Jun 2010 17:05:48 +0200 Subject: [RFC] add --with-build-for-cc option In-Reply-To: <4C1F6D58.1070500@zafena.se> References: <4C1B5B96.8070701@gmx.net> <4C1F60EE.2080000@gmx.net> <4C1F6D58.1070500@zafena.se> Message-ID: <4C1F7FCC.9020305@gmx.net> Hi all, Am 21.06.2010 15:47, schrieb Xerxes R?nby: > Hi Robert! > > ... > diff -r 1e95c787d40b ports/hotspot/make/linux/makefiles/zeroshark.make > > --- a/ports/hotspot/make/linux/makefiles/zeroshark.make Tue Jun 15 18:34:45 2010 +0100 > +++ b/ports/hotspot/make/linux/makefiles/zeroshark.make Fri Jun 18 13:30:12 2010 +0200 > @@ -35,6 +35,12 @@ > #XXX and the updated calling convention for deopt (PR icedtea/484) > #CFLAGS += -DHOTSPOT_ASM > > +ifeq ($(CROSS_COMPILATION), true) > + C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) > +else > + C_COMPILE_FOR_MKBC = $(C_COMPILE) > +endif > + > %.o: %.S > @echo Assembling $< > $(QUIETLY) $(REMOVE_TARGET) > @@ -53,7 +59,7 @@ > > mkbc: $(GAMMADIR)/tools/mkbc.c > @echo Compiling mkbc tool > - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) > + $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) > > mkoffsets: asm_helper.cpp > @echo Compiling offset generator > > ... > > I do not see why we need to conditionalize the zeroshark.make code at all, > I think it would be better and cleaner to always use the passed > $(CC_FOR_BUILD) when compiling mkbc.c Yep, I can understand that but there is a point for having both: a) CC_COMPILE is derived from the variables in that OpenJDK makefile that sets up gcc. AFAIK it carries optimization flags and can be modified by changing CFLAGS for example. CC_FOR_BUILD instead is a variable that only contains the value for the compiler and does not react to changes to the CFLAGS flags. I wanted to not touch the normal build in any way (so nobody could say that it broke their build on Ubuntu/Debian or Fedora ;) ) That said, I see that my patch changes the mkbc compilation from CC_COMPILE to C_COMPILE. That confusion must somehow slipped in because I originally prepared the patch against IcedTea6 1.7.3. Before committing I would fix that. b) As said in the mail before I have some different plans for dealing with mkoffsets. At the moment we 'solve' the situation by (please don't beat me) by running it through qemu's ARM emulation. In order to support that transparently (= zero effect for non-cross builders) I would like to use the "ifeq ($(CROSS_COMPILATION)" section again. Thanks for having a look at the patch! Regards, Robert -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 262 bytes Desc: OpenPGP digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100621/5ffba705/signature.asc From ahughes at redhat.com Mon Jun 21 09:02:27 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Mon, 21 Jun 2010 17:02:27 +0100 Subject: [RFC] Netx: some native libraries are not found In-Reply-To: <4C1F7805.5070300@redhat.com> References: <4C1F7805.5070300@redhat.com> Message-ID: On 21 June 2010 15:32, Omair Majid wrote: > Hi, > > There is a bug in the current version of Netx that fails to find some native > libraries [1][2]. > > In the current implementation of Netx, one classloader is created per JNLP > file; for JNLP files loaded as extensions, the classloaders share > information about where to find resources. Unfortunately, they do not share > any information about where to find native libraries. This makes Web Start > applications with extensions that use native libraries fail. The proposed > patch [3] fixes this. > > Any comments concerns? Should I go ahead and commit this fix? > > Cheers, > Omair > > > [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=507 > [2] https://bugzilla.redhat.com/show_bug.cgi?id=526247 > [3] http://icedtea.classpath.org/bugzilla/attachment.cgi?id=368 > Looks good to me, though I would drop all this use of 'this.' which isn't necessary. Let's see what Deepak has to say before commit. Thanks, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Mon Jun 21 09:59:38 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Jun 2010 16:59:38 +0000 Subject: [Bug 450] TinyLaF 1.4.0 generated gui rendered incorrect using IcedTea6 1.8pre (6b18~pre1-1ubuntu1) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=450 ------- Comment #4 from asu at redhat.com 2010-06-21 16:59 ------- scratch that about the "ok" button showing up as something else. just checked that on a couple different machines, and I've concluded that it was just my settings on the computer, so that can be scratched. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Jun 21 11:19:15 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Jun 2010 18:19:15 +0000 Subject: [Bug 510] System.load on applet hang the second time Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=510 ------- Comment #1 from jon.vanalten at redhat.com 2010-06-21 18:19 ------- Hi, Are you aware an example of this "in the wild" that we can use to reproduce/debug this? By "reload" do you mean page refresh in browser? What os/browser are you using? Thanks, jon -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Mon Jun 21 13:38:51 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 21 Jun 2010 20:38:51 +0000 Subject: /hg/icedtea: Use a Mercurial snapshot of CACAO 1.1.0pre rather t... Message-ID: changeset c829a9d16fa0 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c829a9d16fa0 author: Andrew John Hughes date: Mon Jun 21 21:38:43 2010 +0100 Use a Mercurial snapshot of CACAO 1.1.0pre rather than 0.99.4. 2010-06-21 Andrew John Hughes * patches/cacao/native-resolve.patch, * patches/cacao/no-mmap-first-page.patch, * patches/cacao/no-strict-aliasing.patch, * patches/cacao/openjdk7.patch, * patches/cacao/versioninfo.patch, * patches/cacao/xxoption-warning.patch: Dropped, either upstreamed or redundant. * Makefile.am: Use Mercurial snapshot of CACAO 1.1.0pre. Drop unneeded patches. * patches/cacao/6714758.patch: Drop Makefile.in fragment as CACAO from hg needs the autotools to be run. * patches/cacao/arm-arch-defines.patch, * patches/cacao/jsig.patch: Recreated against hg snapshot of CACAO. diffstat: 11 files changed, 48 insertions(+), 368 deletions(-) ChangeLog | 19 ++++ Makefile.am | 15 +-- patches/cacao/6714758.patch | 31 +++--- patches/cacao/arm-arch-defines.patch | 14 +-- patches/cacao/jsig.patch | 18 ---- patches/cacao/native-resolve.patch | 143 -------------------------------- patches/cacao/no-mmap-first-page.patch | 23 ----- patches/cacao/no-strict-aliasing.patch | 22 ---- patches/cacao/openjdk7.patch | 86 ------------------- patches/cacao/versioninfo.patch | 24 ----- patches/cacao/xxoption-warning.patch | 21 ---- diffs (truncated from 512 to 500 lines): diff -r 4fed9f38e501 -r c829a9d16fa0 ChangeLog --- a/ChangeLog Tue Jun 15 18:34:45 2010 +0100 +++ b/ChangeLog Mon Jun 21 21:38:43 2010 +0100 @@ -1,3 +1,22 @@ 2010-06-14 Andrew John Hughes + + * patches/cacao/native-resolve.patch, + * patches/cacao/no-mmap-first-page.patch, + * patches/cacao/no-strict-aliasing.patch, + * patches/cacao/openjdk7.patch, + * patches/cacao/versioninfo.patch, + * patches/cacao/xxoption-warning.patch: + Dropped, either upstreamed or redundant. + * Makefile.am: + Use Mercurial snapshot of CACAO 1.1.0pre. + Drop unneeded patches. + * patches/cacao/6714758.patch: + Drop Makefile.in fragment as CACAO from hg + needs the autotools to be run. + * patches/cacao/arm-arch-defines.patch, + * patches/cacao/jsig.patch: + Recreated against hg snapshot of CACAO. + 2010-06-14 Andrew John Hughes Don't print out the return value of pthread_self diff -r 4fed9f38e501 -r c829a9d16fa0 Makefile.am --- a/Makefile.am Tue Jun 15 18:34:45 2010 +0100 +++ b/Makefile.am Mon Jun 21 21:38:43 2010 +0100 @@ -18,10 +18,10 @@ LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d948a07204904f6ce60e363bd0516e22f1cae830aba84f8 OPENJDK_SHA256SUM = 93c536e6bc4e962050a00321e88e694fc4e0000e2ad887b8de22830bfda2649f -CACAO_VERSION = 0.99.4 -CACAO_SHA256SUM = 1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56 -CACAO_BASE_URL = http://www.complang.tuwien.ac.at -CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ +CACAO_VERSION = 8948a434c10d +CACAO_SHA256SUM = e472e11621c3e1f00a5f49c990e68d18db09c6c12aea100950567b1577931412 +CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive/tip.tar.bz2 +CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/145168/ @@ -339,13 +339,7 @@ if BUILD_CACAO if BUILD_CACAO ICEDTEA_PATCHES += \ patches/cacao/launcher.patch \ - patches/cacao/no-mmap-first-page.patch \ - patches/cacao/native-resolve.patch \ - patches/cacao/xxoption-warning.patch \ - patches/cacao/no-strict-aliasing.patch \ - patches/cacao/openjdk7.patch \ patches/cacao/version.patch \ - patches/cacao/versioninfo.patch \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ patches/cacao/6714758.patch @@ -2332,6 +2326,7 @@ if BUILD_CACAO if BUILD_CACAO if !USE_SYSTEM_CACAO cd cacao/cacao && \ + ./autogen.sh && \ $(ARCH_PREFIX) ./configure \ --host=$(host_alias) \ --build=$(build_alias) \ diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/6714758.patch --- a/patches/cacao/6714758.patch Tue Jun 15 18:34:45 2010 +0100 +++ b/patches/cacao/6714758.patch Mon Jun 21 21:38:43 2010 +0100 @@ -1,7 +1,18 @@ diff -Nru cacao.orig/cacao/src/native/vm -diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.c cacao/cacao/src/native/vm/openjdk/jvm.c ---- cacao.orig/cacao/src/native/vm/openjdk/jvm.c 2010-05-11 12:19:23.000000000 +0100 -+++ cacao/cacao/src/native/vm/openjdk/jvm.c 2010-05-11 12:19:47.000000000 +0100 -@@ -792,6 +792,9 @@ +diff -Nru cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product +--- cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao-8948a434c10d/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 +@@ -86,6 +86,7 @@ + JVM_EnableCompiler; + JVM_Exit; + JVM_FillInStackTrace; ++ JVM_FindClassFromBootLoader; + JVM_FindClassFromClass; + JVM_FindClassFromClassLoader; + JVM_FindLibraryEntry; +diff -Nru cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp +--- cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 +@@ -668,6 +668,9 @@ assert(throwError == false); @@ -11,7 +22,7 @@ diff -Nru cacao.orig/cacao/src/native/vm u = utf_new_char(name); cl = loader_hashtable_classloader_add((java_handle_t *) loader); -@@ -809,6 +812,15 @@ +@@ -685,6 +688,15 @@ } @@ -27,13 +38,3 @@ diff -Nru cacao.orig/cacao/src/native/vm /* JVM_FindClassFromClass */ jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from) ---- cacao.orig/cacao/contrib/mapfile-vers-product 2008-08-04 17:51:28.000000000 +0100 -+++ cacao/cacao/contrib/mapfile-vers-product 2010-05-11 12:47:51.000000000 +0100 -@@ -86,6 +86,7 @@ - JVM_EnableCompiler; - JVM_Exit; - JVM_FillInStackTrace; -+ JVM_FindClassFromBootLoader; - JVM_FindClassFromClass; - JVM_FindClassFromClassLoader; - JVM_FindLibraryEntry; diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/arm-arch-defines.patch --- a/patches/cacao/arm-arch-defines.patch Tue Jun 15 18:34:45 2010 +0100 +++ b/patches/cacao/arm-arch-defines.patch Mon Jun 21 21:38:43 2010 +0100 @@ -1,5 +1,6 @@ ---- cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h~ 2008-08-04 18:51:12.000000000 +0200 -+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2009-12-15 16:28:12.000000000 +0100 +diff -Nru cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h +--- cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100 @@ -33,7 +33,13 @@ /* NEC LE-IT: gcc has no way to easily check the arm architecture @@ -15,11 +16,12 @@ AO_INLINE void AO_nop_full() { ---- cacao/cacao/src/vm/jit/arm/md-atomic.hpp~ 2008-08-04 16:51:28.000000000 +0000 -+++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp 2009-12-16 06:40:37.000000000 +0000 -@@ -44,26 +44,7 @@ +diff -Nru cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp +--- cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp 2010-06-21 18:35:53.000000000 +0100 +@@ -45,26 +45,7 @@ */ - inline static uint32_t Atomic_compare_and_swap_32(volatile uint32_t *p, uint32_t oldval, uint32_t newval) + inline uint32_t compare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval) { - uint32_t result; - uint32_t temp; diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/jsig.patch --- a/patches/cacao/jsig.patch Tue Jun 15 18:34:45 2010 +0100 +++ b/patches/cacao/jsig.patch Mon Jun 21 21:38:43 2010 +0100 @@ -16,21 +16,3 @@ diff -Nru cacao.orig/Makefile.am cacao/M endif -diff -Nru cacao.orig/Makefile.in cacao/Makefile.in ---- cacao.orig/cacao/src/cacao/Makefile.in 2009-03-16 11:44:18.000000000 +0000 -+++ cacao/cacao/src/cacao/Makefile.in 2010-05-11 10:30:06.000000000 +0100 -@@ -625,12 +625,12 @@ - @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server - @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server - @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt -- at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so -+ at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so - - @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE at uninstall-local: - @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so - @WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt -- at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so -+ at WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_TRUE@ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/native-resolve.patch --- a/patches/cacao/native-resolve.patch Tue Jun 15 18:34:45 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,143 +0,0 @@ - -# HG changeset patch -# User Stefan Ring -# Date 1244023392 -7200 -# Node ID 8e8a38453f6c1e11e057457daf979a1acb40d9bf -# Parent 5fdb98095047abf89f3d3298417499c2c06f8d56 -Fixes PR128 (changed resolution order for native methods). -* src/native/native.c (native_method_resolve): Consider internal -methods before descending into java.lang.ClassLoader. - ---- cacao/cacao/src/native/native.c Wed Jun 03 01:35:48 2009 +0200 -+++ cacao/cacao/src/native/native.c Wed Jun 03 12:03:12 2009 +0200 -@@ -1,6 +1,6 @@ - /* src/native/native.c - native library support - -- Copyright (C) 1996-2005, 2006, 2007, 2008 -+ Copyright (C) 1996-2005, 2006, 2007, 2008, 2009 - CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO - - This file is part of CACAO. -@@ -529,39 +529,47 @@ - - newname = native_make_overloaded_function(name, m->descriptor); - -+ /* Try to find the native function symbol in the main program. */ -+ -+ f = native_method_find(m); -+ -+ if (f != NULL) -+ if (opt_verbosejni) -+ printf("internal ]\n"); -+ -+#if defined(ENABLE_DL) - /* check the library hash entries of the classloader of the - methods's class */ - -- f = NULL; -+ if (f == NULL) { -+ /* Get the classloader. */ - --#if defined(ENABLE_DL) -- /* Get the classloader. */ -+ cl = class_get_classloader(m->clazz); - -- cl = class_get_classloader(m->clazz); -+ /* normally addresses are aligned to 4, 8 or 16 bytes */ - -- /* normally addresses are aligned to 4, 8 or 16 bytes */ -+ key = ((u4) (ptrint) cl) >> 4; /* align to 16-byte */ -+ slot = key & (hashtable_library->size - 1); -+ le = hashtable_library->ptr[slot]; - -- key = ((u4) (ptrint) cl) >> 4; /* align to 16-byte */ -- slot = key & (hashtable_library->size - 1); -- le = hashtable_library->ptr[slot]; -+ /* iterate through loaders in this hash slot */ - -- /* iterate through loaders in this hash slot */ -+ while ((le != NULL) && (f == NULL)) { -+ /* iterate through names in this loader */ - -- while ((le != NULL) && (f == NULL)) { -- /* iterate through names in this loader */ -+ ne = le->namelink; - -- ne = le->namelink; -- -- while ((ne != NULL) && (f == NULL)) { -- f = (functionptr) (ptrint) system_dlsym(ne->handle, name->text); -+ while ((ne != NULL) && (f == NULL)) { -+ f = (functionptr) (ptrint) system_dlsym(ne->handle, name->text); - -- if (f == NULL) -- f = (functionptr) (ptrint) system_dlsym(ne->handle, newname->text); -+ if (f == NULL) -+ f = (functionptr) (ptrint) system_dlsym(ne->handle, newname->text); - -- ne = ne->hashlink; -+ ne = ne->hashlink; -+ } -+ -+ le = le->hashlink; - } -- -- le = le->hashlink; - } - - # if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) -@@ -577,23 +585,22 @@ - class_java_lang_ClassLoader, - true); - -- if (method_findNative == NULL) -- return NULL; -+ if (method_findNative != NULL) { -+ /* try the normal name */ - -- /* try the normal name */ -- -- s = javastring_new(name); -- -- f = (functionptr) (intptr_t) vm_call_method_long(method_findNative, -- NULL, cl, s); -- -- /* if not found, try the mangled name */ -- -- if (f == NULL) { -- s = javastring_new(newname); -+ s = javastring_new(name); - - f = (functionptr) (intptr_t) vm_call_method_long(method_findNative, - NULL, cl, s); -+ -+ /* if not found, try the mangled name */ -+ -+ if (f == NULL) { -+ s = javastring_new(newname); -+ -+ f = (functionptr) (intptr_t) vm_call_method_long(method_findNative, -+ NULL, cl, s); -+ } - } - } - # endif -@@ -602,17 +609,6 @@ - if (opt_verbosejni) - printf("JNI ]\n"); - #endif -- -- /* If not found, try to find the native function symbol in the -- main program. */ -- -- if (f == NULL) { -- f = native_method_find(m); -- -- if (f != NULL) -- if (opt_verbosejni) -- printf("internal ]\n"); -- } - - #if defined(ENABLE_JVMTI) - /* fire Native Method Bind event */ - diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/no-mmap-first-page.patch --- a/patches/cacao/no-mmap-first-page.patch Tue Jun 15 18:34:45 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ ---- cacao/cacao/src/vm/jit/trap.c.orig 2008-07-07 13:36:19.000000000 +0200 -+++ cacao/cacao/src/vm/jit/trap.c 2008-07-23 10:45:30.480113152 +0200 -@@ -59,20 +59,6 @@ - */ - void trap_init(void) - { --#if !(defined(__ARM__) && defined(__LINUX__)) -- /* On arm-linux the first memory page can't be mmap'ed, as it -- contains the exception vectors. */ -- -- int pagesize; -- -- /* mmap a memory page at address 0x0, so our hardware-exceptions -- work. */ -- -- pagesize = system_getpagesize(); -- -- (void) system_mmap_anonymous(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED); --#endif -- - TRACESUBSYSTEMINITIALIZATION("trap_init"); - - #if !defined(TRAP_INSTRUCTION_IS_LOAD) diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/no-strict-aliasing.patch --- a/patches/cacao/no-strict-aliasing.patch Tue Jun 15 18:34:45 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -diff -Nru cacao/cacao.orig/configure cacao/cacao/configure ---- cacao/cacao.orig/configure 2009-03-16 11:44:25.000000000 +0000 -+++ cacao/cacao/configure 2010-01-09 00:10:59.000000000 +0000 -@@ -2829,6 +2829,7 @@ - else - OPT_CFLAGS=$CFLAGS - fi -+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing" - - case "$host_cpu" in - alpha | alphaev56 | alphapca56 ) -diff -Nru cacao/cacao.orig/configure.ac cacao/cacao/configure.ac ---- cacao/cacao.orig/configure.ac 2009-03-16 11:42:56.000000000 +0000 -+++ cacao/cacao/configure.ac 2010-01-09 00:11:06.000000000 +0000 -@@ -41,6 +41,7 @@ - else - OPT_CFLAGS=$CFLAGS - fi -+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing" - - dnl system type - case "$host_cpu" in diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/openjdk7.patch --- a/patches/cacao/openjdk7.patch Tue Jun 15 18:34:45 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -diff -Nru src.orig/native/vm/sun_misc_Unsafe.c src/native/vm/sun_misc_Unsafe.c ---- cacao/cacao/src.orig/native/vm/sun_misc_Unsafe.c 2009-03-19 17:31:38.000000000 +0000 -+++ cacao/cacao/src/native/vm/sun_misc_Unsafe.c 2009-03-19 17:34:57.000000000 +0000 -@@ -104,14 +104,8 @@ - { "putDouble", "(JD)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_putDouble__JD }, - { "objectFieldOffset", "(Ljava/lang/reflect/Field;)J", (void *) (intptr_t) &Java_sun_misc_Unsafe_objectFieldOffset }, - { "allocateMemory", "(J)J", (void *) (intptr_t) &Java_sun_misc_Unsafe_allocateMemory }, --#if 0 -- /* OpenJDK 7 */ - { "setMemory", "(Ljava/lang/Object;JJB)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_setMemory }, - { "copyMemory", "(Ljava/lang/Object;JLjava/lang/Object;JJ)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_copyMemory }, --#else -- { "setMemory", "(JJB)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_setMemory }, -- { "copyMemory", "(JJJ)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_copyMemory }, --#endif - { "freeMemory", "(J)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_freeMemory }, - { "staticFieldOffset", "(Ljava/lang/reflect/Field;)J", (void *) (intptr_t) &Java_sun_misc_Unsafe_staticFieldOffset }, - { "staticFieldBase", "(Ljava/lang/reflect/Field;)Ljava/lang/Object;", (void *) (intptr_t) &Java_sun_misc_Unsafe_staticFieldBase }, -@@ -758,7 +752,6 @@ - } - - --#if 0 - /* OpenJDK 7 */ - - /* -@@ -816,59 +809,6 @@ - - system_memcpy(dest, src, length); - } --#else --/* -- * Class: sun/misc/Unsafe -- * Method: setMemory -- * Signature: (JJB)V -- */ --JNIEXPORT void JNICALL Java_sun_misc_Unsafe_setMemory(JNIEnv *env, sun_misc_Unsafe *this, int64_t address, int64_t bytes, int32_t value) --{ -- size_t length; -- void *p; -- -- length = (size_t) bytes; -- -- if ((length != (uint64_t) bytes) || (bytes < 0)) { -- exceptions_throw_illegalargumentexception(); -- return; -- } -- -- p = (void *) (intptr_t) address; -- -- /* XXX Not sure this is correct. */ -- -- system_memset(p, value, length); --} -- -- --/* -- * Class: sun/misc/Unsafe -- * Method: copyMemory -- * Signature: (JJJ)V -- */ --JNIEXPORT void JNICALL Java_sun_misc_Unsafe_copyMemory(JNIEnv *env, sun_misc_Unsafe *this, int64_t srcAddress, int64_t destAddress, int64_t bytes) --{ -- size_t length; -- void *src; -- void *dest; -- -- if (bytes == 0) -- return; -- -- length = (size_t) bytes; -- -- if ((length != (uint64_t) bytes) || (bytes < 0)) { -- exceptions_throw_illegalargumentexception(); -- return; -- } -- -- src = (void *) (intptr_t) srcAddress; -- dest = (void *) (intptr_t) destAddress; -- -- system_memcpy(dest, src, length); --} --#endif - - - /* diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/versioninfo.patch --- a/patches/cacao/versioninfo.patch Tue Jun 15 18:34:45 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.c cacao/cacao/src/native/vm/openjdk/jvm.c ---- cacao.orig/cacao/src/native/vm/openjdk/jvm.c 2009-08-05 01:22:03.000000000 +0100 -+++ cacao/cacao/src/native/vm/openjdk/jvm.c 2009-08-05 01:48:46.000000000 +0100 -@@ -3645,7 +3645,19 @@ - - void JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size) - { -- log_println("JVM_GetVersionInfo: IMPLEMENT ME!"); -+ TRACEJVMCALLS(("JVM_GetVersionInfo(env=%p, info=%p, info_size=%ld)", env, info, info_size)); -+ -+ memset(info, 0, sizeof(info_size)); -+ -+ int major = atoi(VERSION); -+ const char* minor_string = strchr(VERSION, '.'); -+ int minor = atoi(++minor_string); -+ int micro = atoi(strchr(minor_string, '.') + 1); -+ -+ info->jvm_version = (major << 24) | (minor << 16) | (micro << 8); -+ info->update_version = 0; -+ info->special_update_version = 0; -+ info->is_attachable = 0; - } - - diff -r 4fed9f38e501 -r c829a9d16fa0 patches/cacao/xxoption-warning.patch --- a/patches/cacao/xxoption-warning.patch Tue Jun 15 18:34:45 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - -# HG changeset patch -# User Stefan Ring -# Date 1243985748 -7200 -# Node ID 5fdb98095047abf89f3d3298417499c2c06f8d56 -# Parent 2d848ae770f5b7bfc59cf007ceae36f97adccc03 -* src/vm/options.c (options_xx): Don't clutter output with warning (print to -stderr instead). - From bugzilla-daemon at icedtea.classpath.org Mon Jun 21 13:56:35 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Jun 2010 20:56:35 +0000 Subject: [Bug 510] System.load on applet hang the second time Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=510 ------- Comment #2 from amarzo at hotmail.com 2010-06-21 20:56 ------- Hi, Of course, I will try to explain the better I can. Hardware: AMD ATHLON 64 3500+ (2Gb) OS: Ubuntu 10.04 LTS - the Lucid Lynx - Browser: Firefox 3.6.3 java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8-0ubuntu1) OpenJDK Client VM (build 14.0-b16, mixed mode, sharing) ICEDtea 6b18-1.8 >> By "reload" do you mean page refresh in browser? Yes, refresh or if you want you can surf to other webs and when you come back to the applet it will freeze (successive visits after the first one will also freeze). The only solution is to close and open the browser. >> I have attached a minimal example to reproduce this bug: /home/user1/lib.so should be a jni lib (I think any lib will do it, I have tried with my own, jogl, joal, pkcs11, ...) The applet must be signed (mine are self-signed) and executed in the browser. I know it is kind of hard to reproduce. If you consider it necessary I will make a better and easier deployable example (an applet which includes a jni lib in the jar, and whenever it is executed it deploys the lib into the temp path and loads it). Loads of thanks for your quick reply. (In reply to comment #1) > Hi, > > Are you aware an example of this "in the wild" that we can use to > reproduce/debug this? By "reload" do you mean page refresh in browser? What > os/browser are you using? > > Thanks, > > jon > -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Jun 21 13:59:48 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Jun 2010 20:59:48 +0000 Subject: [Bug 510] System.load on applet hang the second time Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=510 ------- Comment #3 from amarzo at hotmail.com 2010-06-21 20:59 ------- Created an attachment (id=379) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=379&action=view) Minimal applet test You need to compile and pack it to a jar. Replace this /home/user1/lib.so to your own path, where a jni lib should be. Sign your applet and prepare a minimal .html for loading it into your web browser. The first time everything will be alright but if you refresh it will freeze (2 would no appear). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Jun 21 17:52:00 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 22 Jun 2010 00:52:00 +0000 Subject: [Bug 511] New: chromium constantly crash when IcedTea is installed on opensuse Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=511 Summary: chromium constantly crash when IcedTea is installed on opensuse Product: IcedTea Version: 6-1.6 Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: gerald.holzinger.public at gmail.com OS: Linux opensuse 11.2 icedtea 6 comes togehter with the "Java-1_6_0-openjdk" in one pakage browser: Chromium 6.0.433.0 => crashes on nearley all most webpages. message in /var/log/messages:"[26770.865875] chrome[9695]: segfault at adf13fe5 ip ad8564f9 sp b3c36ef0 error 6 in IcedTeaNPPlugin.so[ad84e000+2e000]" after deinstallation of openjdk and installation or javasun chromium works fine. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 22 01:15:30 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 22 Jun 2010 08:15:30 +0000 Subject: [Bug 511] chromium constantly crash when IcedTea is installed on opensuse Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=511 ------- Comment #1 from aph at redhat.com 2010-06-22 08:15 ------- This isn't an OpenJDK bug, as far as I'm aware. It should in the first instance be reported to suse, since I haven't come across this on any other distro. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 22 02:46:18 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 22 Jun 2010 09:46:18 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #5 from xerxes at zafena.se 2010-06-22 09:46 ------- (In reply to comment #4) > I don't believe this is really a JDK bug. I think it still are a JDK bug since it are impossible to write any user java application that can workaround this bug. This are because the exception happen before my own java programs main are executed and thus are uncatchable from the users java application. Please correct me if i am wrong here. > The NPE is thrown during initialization after a failed check that > System.currentTimeMillis() > 0. Until time travel is invented, this is a sane > check. You dont have to invent time travel in order to hit this bug, I have hit this bug several times during 2009-2010 by simply trying to boot up any java application on newly manufactured embedded hardware where the systemclock never have been set to a sane value. Why should we not allow java applications to continue to run for people who manage to perform time travel jumps? It are perfectly possible that this bug makes any java driven time machine malfunction after the jump and prevents it to actually return back :) there also exists systems suitable for running java that are not equipped with a clock battery. > Even if initialization was allowed to proceed in this case, there are many > classes that depend on sane return values from currentTimeMillis(). > whats wrong with negative millis numbers? java doc only specify that currentTimeMillis() will return a long. If initialization would be allowed to continue then i would actually be able to create a application written in java that could detect and update the clock. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 22 06:34:01 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 22 Jun 2010 13:34:01 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #6 from aph at redhat.com 2010-06-22 13:34 ------- This one should be pretty easy to fix: when currentTimeMillis is negative, add in an offset. You'd only have to do it once. There is a problem with that, though: currentTimeMillis would no longer agree with the system clock, so wouldn't meet its spec. So perhaps we shouldn't do it... -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 22 07:49:30 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 22 Jun 2010 14:49:30 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #7 from jon.vanalten at redhat.com 2010-06-22 14:49 ------- Whoops, I realize I mis-linked in comment #5. The old bug I intended to reference was: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4038100 (In reply to comment #5) > (In reply to comment #4) > > I don't believe this is really a JDK bug. > > I think it still are a JDK bug , you're probably right. More below. > the exception happen > before my own java programs main are executed and thus are uncatchable from the > users java application. Please correct me if i am wrong here. Absolutely correct. This is static init of System class. > You dont have to invent time travel in order to hit this bug, I have hit this > bug several times during 2009-2010 by simply trying to boot up any java > application on newly manufactured embedded hardware where the systemclock never > have been set to a sane value. I hadn't considered this, sorry. > > Why should we not allow java applications to continue to run for people who > manage to perform time travel jumps? I suppose if they manage this, we should accommodate them as much as possible. Their technology must be superior to, at least, my own. :) > It are perfectly possible that this bug makes any java driven time machine > malfunction after the jump and prevents it to actually return back :) Actually until 2038 overflow is solved, this will still be a possibility. Assuming their system clock changes to match their destination, if they travel back in time or far enough forward to reach overflow, there are a number of classes that will complain loudly. A common general pattern of such a class is: old_time = System.currentTimeMillis(); // DO STUFF new_time = System.currentTimeMillis(); if ((new_time - old_time) < 0) { throw Exception | System.exit() | other undesirable action } > > whats wrong with negative millis numbers? java doc only specify that > currentTimeMillis() will return a long. Indeed. Funny, even though I looked at that when making previous comment, I have always read "the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC." as something like "time since January 1 1970". My bad. > > If initialization would be allowed to continue then i would actually be able to > create a application written in java that could detect and update the clock. > That would be nice. Although, for reasons mentioned above, this may or may not cause other issues. Regardless, uncaught NPE at this point is not really acceptable. So from System.java: "/** * The following two methods exist because in, out, and err must be * initialized to null. The compiler, however, cannot be permitted to * inline access to them, since they are later set to more sensible values * by initializeSystemClass(). */" This comment precedes the method in which the previously mentioned (currentTimeMillis() > 0) check is made. So the call is mainly to prevent inlining, rather than being an meaningful check of the system time. Maybe we can change the check to (currentTimeMillis() > Long.MIN_VALUE), this will at least reduce the possibility of halting at this point to a single millisecond clock value. Or even use ">=", although I honestly am unsure whether compiler will be smart enough to inline that. I will try both. Or if there is another method that is safe to call at this stage to prevent the inlining, perhaps someone has a suggestion for this. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Tue Jun 22 08:00:32 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 22 Jun 2010 15:00:32 +0000 Subject: /hg/icedtea: Double CACAO's heap (to 256MB) so that the langtool... Message-ID: changeset 37170bd13e08 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=37170bd13e08 author: Andrew John Hughes date: Tue Jun 22 16:00:26 2010 +0100 Double CACAO's heap (to 256MB) so that the langtools build doesn't run out of memory. 2010-06-21 Andrew John Hughes * patches/cacao/memory.patch: Increase the memory used in the langtools build when using CACAO. * Makefile.am: Apply above patch when building with CACAO. diffstat: 3 files changed, 20 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ Makefile.am | 3 ++- patches/cacao/memory.patch | 10 ++++++++++ diffs (42 lines): diff -r c829a9d16fa0 -r 37170bd13e08 ChangeLog --- a/ChangeLog Mon Jun 21 21:38:43 2010 +0100 +++ b/ChangeLog Tue Jun 22 16:00:26 2010 +0100 @@ -1,3 +1,11 @@ 2010-06-21 Andrew John Hughes + + * patches/cacao/memory.patch: + Increase the memory used in the langtools + build when using CACAO. + * Makefile.am: Apply above patch when + building with CACAO. + 2010-06-21 Andrew John Hughes * patches/cacao/native-resolve.patch, diff -r c829a9d16fa0 -r 37170bd13e08 Makefile.am --- a/Makefile.am Mon Jun 21 21:38:43 2010 +0100 +++ b/Makefile.am Tue Jun 22 16:00:26 2010 +0100 @@ -342,7 +342,8 @@ ICEDTEA_PATCHES += \ patches/cacao/version.patch \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ - patches/cacao/6714758.patch + patches/cacao/6714758.patch \ + patches/cacao/memory.patch endif if WITH_CACAO diff -r c829a9d16fa0 -r 37170bd13e08 patches/cacao/memory.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/memory.patch Tue Jun 22 16:00:26 2010 +0100 @@ -0,0 +1,10 @@ +--- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100 ++++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100 +@@ -554,6 +554,7 @@ + + + ++ + + + From andrew at icedtea.classpath.org Tue Jun 22 08:56:05 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 22 Jun 2010 15:56:05 +0000 Subject: /hg/icedtea6-hg: Bump to b20 tarball. Message-ID: changeset 946a062e9027 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=946a062e9027 author: Andrew John Hughes date: Tue Jun 22 16:55:55 2010 +0100 Bump to b20 tarball. 2010-06-22 Andrew John Hughes * Makefile.am: Bump to b20 tarball. diffstat: 2 files changed, 8 insertions(+), 3 deletions(-) ChangeLog | 5 +++++ Makefile.am | 6 +++--- diffs (27 lines): diff -r d87364165dfb -r 946a062e9027 ChangeLog --- a/ChangeLog Thu Jun 17 20:27:34 2010 +0100 +++ b/ChangeLog Tue Jun 22 16:55:55 2010 +0100 @@ -1,3 +1,8 @@ 2010-06-17 Andrew John Hughes + + * Makefile.am: + Bump to b20 tarball. + 2010-06-17 Andrew John Hughes * patches/nimbus-source-target.patch: diff -r d87364165dfb -r 946a062e9027 Makefile.am --- a/Makefile.am Thu Jun 17 20:27:34 2010 +0100 +++ b/Makefile.am Tue Jun 22 16:55:55 2010 +0100 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_DATE = 15_apr_2010 -OPENJDK_MD5SUM = 39bbf623a6c83ca63b92593062a28146 -OPENJDK_VERSION = b19 +OPENJDK_DATE = 21_jun_2010 +OPENJDK_MD5SUM = 0b36adbf67e4f261e1b827ed4be4f447 +OPENJDK_VERSION = b20 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = 0.99.4 From bugzilla-daemon at icedtea.classpath.org Tue Jun 22 09:04:24 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 22 Jun 2010 16:04:24 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #8 from aph at redhat.com 2010-06-22 16:04 ------- I suspect that when currentTimeMillis is negative it'll break elsewhere. So, I doubt that a fix in one place will help. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Tue Jun 22 10:04:39 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 22 Jun 2010 17:04:39 +0000 Subject: /hg/icedtea6: 20 new changesets Message-ID: changeset fc6cf0c52f7a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc6cf0c52f7a author: Andrew John Hughes date: Mon Apr 26 22:20:50 2010 +0100 Use build directories outside the source tree and link instead of copying external source trees where possible. 2010-04-26 Andrew John Hughes Use build directories outside the source tree and link instead of copying external source trees where possible. * Makefile.am: (OS_DIR): Removed. (BUILD_OUTPUT_DIR): Set to openjdk.build. (ECJ_BUILD_OUTPUT_DIR): Set to openjdk-ecj.build. (ICEDTEA_ENV): Set output directory. (ICEDTEA_ENV_ECJ): Likewise. (distclean-local): Remove build directories. (extract-openjdk.stamp): Link instead of copying where possible. (liveconnect-dist.stamp): Likewise. (netx-dist.stamp): Likewise. (plugin- tests.stamp): Likewise. changeset e545400a3022 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e545400a3022 author: Andrew John Hughes date: Mon May 24 17:29:35 2010 +0100 Support hs17 as the new upstream HotSpot. 2010-05-20 Andrew John Hughes Remove hs17 build option as this is now the default. * patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch: Dropped; applied upstream. * patches/hotspot/hs17/params-cast-size_t.patch, * patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch, * patches/hotspot/hs17/systemtap.patch: Moved to top-level. * patches/hotspot/original/params-cast-size_t.patch, * patches/hotspot/original/shark_do_nothing_on_stub_frame.patch, * patches/hotspot/original/systemtap.patch: Dropped; hs16 is dead. * patches/openjdk/6896472-missing_libjsig.patch, * Makefile.am: Remove differentation between original and hs17 build patches as only build is now the hs17 one in the OpenJDK repository. * hotspot.map: Drop hs17. * patches/params-cast-size_t.patch, * patches/shark_do_nothing_on_stub_frame.patch, * patches/systemtap.patch: Moved from hs17 to top-level. changeset 6806c95769a8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6806c95769a8 author: Andrew John Hughes date: Mon May 24 17:36:05 2010 +0100 Merge changeset f7e56d57d9ab in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f7e56d57d9ab author: Andrew John Hughes date: Mon May 24 19:47:38 2010 +0100 Merge changeset 9c5fd8e744c9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9c5fd8e744c9 author: Andrew John Hughes date: Wed May 26 15:45:18 2010 +0100 Fix patches due to changes in licensing headers. 2010-05-26 Andrew John Hughes * patches/ecj/icedtea.patch, * patches/icedtea-clean-crypto.patch, * patches/icedtea-jtreg-jrunscript.patch, * patches/icedtea-nio2.patch, * patches/icedtea-nomotif-6706121.patch, * patches/xrender/icedtea-000.patch: Update after changes to licensing headers. changeset 9d88047a7756 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9d88047a7756 author: Andrew John Hughes date: Mon Jun 07 08:57:08 2010 +0100 Remove upstreamed portion of alpha-fixes.patch. 2010-06-06 Andrew John Hughes * patches/icedtea-alpha-fixes.patch: Remove upstreamed JDK portion. * patches/icedtea-sh4-support.patch: Recreated against upstreamed alpha patch. changeset a9e03245843f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a9e03245843f author: Andrew John Hughes date: Mon Jun 07 09:03:51 2010 +0100 Merge changeset a7f911a081bb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a7f911a081bb author: Andrew John Hughes date: Mon Jun 07 19:48:08 2010 +0100 Merge changeset f93e99e857af in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f93e99e857af author: Andrew John Hughes date: Tue Jun 08 23:57:58 2010 +0100 Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ made obsolete by previous merge. Use --reflink=auto instead of -l to avoid cross-device issues. 2010-06-08 Andrew John Hughes Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ made obsolete by previous merge. Use --reflink=auto instead of -l to avoid cross-device issues. * Makefile.am: (ICEDTEA_ENV): Fix use of ICEDTEA_BUILD_DIR. (ICEDTEA_ENV_ECJ): Fix use of ICEDTEA_BUILD_DIR_ECJ. (distclean-local): Fix use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ. (extract-openjdk.stamp): Use --reflink=auto instead of -l. (liveconnect- dist.stamp): Likewise. (netx-dist.stamp): Likewise. (plugin-tests.stamp): Likewise. changeset c8a3736ab6de in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c8a3736ab6de author: Andrew John Hughes date: Fri Jun 11 01:47:22 2010 +0100 Drop upstreamed patches and update to new drop tarballs. 2010-06-10 Andrew John Hughes * patches/icedtea-doc-headers.patch: Dropped, upstream file has completely changed. May need to be recreated, may not. * patches/icedtea-java2d-dasher.patch: Upstreamed by Omair as 6793344. Now in OpenJDK6. * Makefile.am: Remove above patches. (JAXWS_DROP_URL): Updated. (JAXWS_DROP_ZIP): Likewise. (JAXWS_DROP_SHA256SUM): Likewise. (JAF_DROP_URL): Added. (JAF_DROP_ZIP): Updated. (JAF_DROP_SHA256SUM): Likewise. (JAXP_DROP_URL): Updated. (JAXP_DROP_ZIP): Likewise. (JAXP_DROP_SHA256SUM): Likewise. (download-jaf-drop): Use specific JAF_DROP_URL, not JAXWS_DROP_URL. * patches/icedtea-nio2.patch: Converted to use new doc generation makefile. changeset 183783e975ca in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=183783e975ca author: Andrew John Hughes date: Sun Jun 13 01:39:55 2010 +0100 Add generated Nimbus files so we can build SynthUI during bootstrap. 2010-06-13 Andrew John Hughes * generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.jav a, * generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditable State.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter. java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.ja va, * generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java, * generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java, * generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.j ava, * generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneClose ButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneClose ButtonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconi fyButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconi fyButtonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim izeButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim izeButtonWindowMaximizedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaxim izeButtonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuB uttonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuB uttonWindowNotFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePaint er.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindo wFocusedState.java, * generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedS tate.java, * generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java, * generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java, * generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java, * generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java, * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOption PaneLabelPainter.java, * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainte r.java, * generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java, * generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java, * generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.j ava, * generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.ja va, * generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateSta te.java, * generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter. java, * generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java , * generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java, * generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState. java, * generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState. java, * generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.ja va, * generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormatte dTextFieldPainter.java, * generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainte r.java, * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.jav a, * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalSta te.java, * generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java , * generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.ja va, * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter. java, * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedSt ate.java, * generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneStat e.java, * generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter. java, * generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java, * generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java, * generated/com/sun/java/swing/plaf/nimbus/TreePainter.java: Add generated Nimbus files so SynthUI can be compiled during bootstrap. changeset f7f32c0c87c1 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f7f32c0c87c1 author: Andrew John Hughes date: Sun Jun 13 01:41:08 2010 +0100 Merge changeset 609c64d51922 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=609c64d51922 author: Andrew John Hughes date: Mon Jun 14 00:21:47 2010 +0100 Make source & target 1.6 when building Nimbus to allow @Override on interfaces. 2010-06-13 Andrew John Hughes * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/D efaultSelectorProvider.java: Removed, provided upstream. * Makefile.am: Add new nimbus-source-target.patch. * patches/ecj/bootver.patch: Always set required version to 1.5, don't bother checking DISABLE_NIMBUS. * patches/nimbus-source-target.patch: Fix source/target options for Nimbus sources to 6, due to presence of @Override on interfaces. changeset 9a43545ed562 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9a43545ed562 author: Andrew John Hughes date: Mon Jun 14 18:35:47 2010 +0100 Check that cp supports --reflink and use only if it does. 2010-06-14 Andrew John Hughes * Makefile.am: (REFLINK): Set to --reflink=auto if CP_SUPPORTS_REFLINK is defined. (extract-openjdk.stamp): Replace --reflink=auto with $(REFLINK). (generated.stamp): Likewise. (liveconnect-dist.stamp): Likewise. (netx-dist.stamp): Likewise. (plugin- tests.stamp): Likewise. * acinclude.m4: (IT_CP_SUPPORTS_REFLINK): New macro to check for a cp new enough to have --reflink. * configure.ac: Invoke IT_CP_SUPPORTS_REFLINK. changeset edee5dc4edad in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=edee5dc4edad author: Andrew John Hughes date: Mon Jun 14 16:27:40 2010 +0100 Hard link external OpenJDK source directories if possible, and check that ${OPENJDK_SRC_DIR}/README exists. 2010-06-14 Andrew John Hughes * Makefile.am: (REFLINK): Remove unneeded quotation. (OPENJDK_SRC_DIR_LINK): Use reflink only if hard linking is not possible. * acinclude.m4: (IT_CP_SUPPORTS_REFLINK): Define once only. (WITH_OPENJDK_SRC_DIR): Define once only. Check that directory is valid (to the extent this is discernable by the README being present) and whether hardlinking is possible, defining OPENJDK_SRC_DIR_HARDLINKABLE if it is. changeset 152d9e45c454 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=152d9e45c454 author: Andrew John Hughes date: Mon Jun 14 18:39:11 2010 +0100 Hardlink to files in the source directory from the build directory, if possible. 2010-06-14 Andrew John Hughes * Makefile.am: (SRC_DIR_LINK): Use reflink only if hard linking is not possible. (liveconnect- dist.stamp): Replace $(REFLINK) with $(SRC_DIR_LINK). (netx-dist.stamp): Likewise. (plugin-tests.stamp): Likewise. * acinclude.m4: (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking to files in the source directory from the build directory is possible. * configure.ac: Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE. changeset aa48b7afc30b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=aa48b7afc30b author: Andrew John Hughes date: Mon Jun 14 18:44:51 2010 +0100 Support using the build directory in a relative path. 2010-06-14 Andrew John Hughes Make available BUILD_DIR for where a relative path needs to be built. (BUILD_DIR): Set to openjdk.build. (BUILD_OUTPUT_DIR): Use BUILD_DIR. (ECJ_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-ecj'. changeset 17f89df79552 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=17f89df79552 author: Andrew John Hughes date: Thu Jun 17 20:25:25 2010 +0100 Remove the local copy of Zero, now available upstream. Replace remaining local changes with patches. 2010-06-17 Andrew John Hughes * patches/nimbus-source-target.patch: Upstreamed as 6961536. * patches/zero.patch: Dropped; old changes necessary for hs16 when we had to support hs14 & hs16. These changes are now upstream. * ports/hotspot/make/linux/makefiles/zero.make, * ports/hotspot/make/linux/makefiles/zeroshark.make, * ports/hotspot/make/linux/platform_zero.in, * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp, * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp, * ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp, * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp, * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp, * ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp, * ports/hotspot/src/cpu/zero/vm/copy_zero.hpp, * ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp, * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp, * ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp, * ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp, * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp, * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp, * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp, * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp, * ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp, * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp, * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp, * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp, * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp, * ports/hotspot/src/cpu/zero/vm/icache_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp, * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp, * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp, * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp, * ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp, * ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp, * ports/hotspot/src/cpu/zero/vm/jni_zero.h, * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp, * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp, * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp, * ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp, * ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp, * ports/hotspot/src/cpu/zero/vm/register_zero.cpp, * ports/hotspot/src/cpu/zero/vm/register_zero.hpp, * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp, * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp, * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp, * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp, * ports/hotspot/src/cpu/zero/vm/stack_zero.cpp, * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp, * ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp, * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp, * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp, * ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp, * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp, * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp, * ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp, * ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp, * ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp, * ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp, * ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp, * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline .hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hp p, * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp, * ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp, * ports/hotspot/src/share/vm/includeDB_zero: Dropped, upstream. * Makefile.am: Remove patches and add new ones. * patches/arm.patch: Changes to Zero necessary for the ARM assembler port. Moved from local files in ports. * patches/shark-debug-option.patch: Remaining Zero changes not upstreamed. changeset d87364165dfb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d87364165dfb author: Andrew John Hughes date: Thu Jun 17 20:27:34 2010 +0100 Merge changeset 946a062e9027 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=946a062e9027 author: Andrew John Hughes date: Tue Jun 22 16:55:55 2010 +0100 Bump to b20 tarball. 2010-06-22 Andrew John Hughes * Makefile.am: Bump to b20 tarball. diffstat: 473 files changed, 41847 insertions(+), 40999 deletions(-) AUTHORS | 1 ChangeLog | 801 Makefile.am | 262 acinclude.m4 | 65 configure.ac | 2 generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java | 119 generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java | 653 generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java | 163 generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java | 636 generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java | 42 generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java | 477 generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java | 42 generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java | 734 generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java | 255 generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java | 160 generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java | 351 generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java | 125 generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java | 2249 generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java | 403 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java | 464 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java | 607 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java | 1046 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java | 518 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java | 51 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java | 41 generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java | 41 generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java | 108 generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java | 153 generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java | 108 generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java | 158 generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java | 1773 generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java | 584 generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java | 164 generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java | 613 generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java | 172 generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java | 705 generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java | 381 generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java | 88 generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java | 380 generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java | 276 generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java | 179 generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java | 106 generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java | 88 generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java | 655 generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java | 40 generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java | 230 generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java | 583 generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java | 321 generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java | 505 generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java | 290 generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java | 41 generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java | 89 generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java | 41 generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java | 93 generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java | 221 generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java | 678 generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java | 135 generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java | 141 generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java | 381 generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java | 42 generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java | 41 generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java | 412 generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java | 382 generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java | 125 generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java | 706 generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java | 289 generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java | 212 generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java | 536 generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java | 43 generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java | 151 generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java | 144 generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java | 146 generated/com/sun/java/swing/plaf/nimbus/TreePainter.java | 653 hotspot.map | 1 netx/net/sourceforge/jnlp/Launcher.java | 28 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 48 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java | 49 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/GetFormat.java | 41 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/ToFloatArray.java | 162 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Available.java | 81 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Close.java | 72 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFormat.java | 74 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFrameLength.java | 74 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/MarkSupported.java | 74 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Read.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArray.java | 81 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArrayIntInt.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Reset.java | 87 overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Skip.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 52 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 119 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetInputStream.java | 91 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetRoot.java | 82 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Load.java | 89 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/LoadAll.java | 93 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArray.java | 84 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java | 86 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFile.java | 88 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFileLongLong.java | 88 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java | 107 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java | 104 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java | 129 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java | 106 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java | 117 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java | 118 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java | 118 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java | 131 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLong.java | 92 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLong.java | 92 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLongBoolean.java | 98 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Unload.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/WriteTo.java | 92 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetAttenuation.java | 97 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetChannels.java | 97 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopLength.java | 96 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopStart.java | 96 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetPitchCorrection.java | 97 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java | 94 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java | 94 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java | 94 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java | 96 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Open.java | 92 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Set8BitExtensionBuffer.java | 119 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/SetLoopType.java | 96 overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestination.java | 46 overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestinationModelIdentifier.java | 46 overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetIdentifier.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetTransform.java | 46 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/EqualsObject.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierString.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringInt.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringString.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringStringInt.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetInstance.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetObject.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetVariable.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/GetOscillators.java | 44 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetConnectionBlocks.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetDefaultConnectionsEnabled.java | 49 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetExclusiveClass.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyFrom.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyTo.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetName.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetSelfNonExclusive.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelFrom.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelTo.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSource.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifier.java | 46 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBoolean.java | 49 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java | 51 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java | 56 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierModelTransform.java | 47 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetIdentifier.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetTransform.java | 46 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransform.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBoolean.java | 48 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java | 50 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java | 51 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetDirection.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetPolarity.java | 45 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetTransform.java | 74 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformAbsolute.java | 73 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConcave.java | 98 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConvex.java | 98 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformLinear.java | 90 overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformSwitch.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Available.java | 78 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Close.java | 72 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetFilePointer.java | 78 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetSize.java | 77 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/HasNextChunk.java | 85 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Read.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByte.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByteArrayIntInt.java | 81 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadInt.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadLong.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadShort.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadString.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedByte.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedInt.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedShort.java | 79 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Skip.java | 78 overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/WriteOutputStream.java | 81 overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 52 overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 119 overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrument.java | 86 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntInt.java | 91 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntInt.java | 97 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java | 97 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformer.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArray.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntInt.java | 89 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntInt.java | 89 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntInt.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/Clear.java | 73 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetName.java | 72 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetPatch.java | 75 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddInstrument.java | 51 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddResource.java | 52 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/GetInstrument.java | 50 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/RemoveInstrument.java | 58 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetDescription.java | 47 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetName.java | 47 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVendor.java | 47 overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVersion.java | 47 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Array.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Clear.java | 56 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Get.java | 68 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/NewSoftAudioBuffer.java | 55 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java | 232 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetFormat.java | 61 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetPropertyInfo.java | 53 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/Open.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/OpenStream.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllNotesOff.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllSoundOff.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ChannelPressure.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Controller.java | 62 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/LocalControl.java | 60 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mono.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mute.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff2.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOn.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Omni.java | 61 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PitchBend.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PolyPressure.java | 61 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ProgramChange.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ResetAllControllers.java | 132 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/SoftTestUtils.java | 111 overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Solo.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java | 113 overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java | 99 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLanczosResampler/Interpolate.java | 113 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java | 96 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java | 84 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java | 83 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler/Interpolate.java | 113 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler2/Interpolate.java | 113 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java | 106 overlays/openjdk/jdk/test/com/sun/media/sound/SoftPointResampler/Interpolate.java | 113 overlays/openjdk/jdk/test/com/sun/media/sound/SoftProvider/GetDevice.java | 70 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Close.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ActiveSense.java | 82 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllNotesOff.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllSoundOff.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ChannelPressure.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Controller.java | 66 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Mono.java | 75 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOff.java | 65 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn.java | 65 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_AllChannels.java | 71 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Delayed.java | 67 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Multiple.java | 76 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Omni.java | 74 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PitchBend.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PolyPressure.java | 65 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ProgramChange.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ResetAllControllers.java | 136 overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/SoftTestUtils.java | 111 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSincResampler/Interpolate.java | 113 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Close.java | 58 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java | 232 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetAvailableInstruments.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetChannels.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDefaultSoundbank.java | 58 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDeviceInfo.java | 56 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLatency.java | 58 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLoadedInstruments.java | 65 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxPolyphony.java | 58 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxReceivers.java | 56 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxTransmitters.java | 56 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMicrosecondPosition.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver2.java | 62 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceivers.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitter.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitters.java | 58 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetVoiceStatus.java | 61 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/ImplicitOpenClose.java | 105 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsOpen.java | 59 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsSoundbankSupported.java | 95 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadAllInstruments.java | 73 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstrument.java | 73 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstruments.java | 73 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Open.java | 64 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/OpenStream.java | 58 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/RemapInstrument.java | 76 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java | 214 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadAllInstruments.java | 69 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstrument.java | 75 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstruments.java | 75 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetName.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuning.java | 56 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuningInt.java | 53 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load1.java | 101 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load2.java | 71 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load4.java | 104 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load5.java | 87 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load6.java | 91 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load7.java | 72 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load8.java | 65 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load9.java | 69 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuning.java | 56 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningByteArray.java | 63 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatch.java | 54 overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatchByteArray.java | 65 patches/arm.patch | 221 patches/ecj/bootver.patch | 14 patches/ecj/icedtea.patch | 138 patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch | 42 patches/hotspot/hs17/params-cast-size_t.patch | 252 patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch | 14 patches/hotspot/hs17/systemtap.patch | 157 patches/hotspot/original/params-cast-size_t.patch | 252 patches/hotspot/original/shark_do_nothing_on_stub_frame.patch | 15 patches/hotspot/original/systemtap.patch | 182 patches/icedtea-alpha-fixes.patch | 24 patches/icedtea-clean-crypto.patch | 91 patches/icedtea-doc-headers.patch | 181 patches/icedtea-java2d-dasher.patch | 11 patches/icedtea-jtreg-jrunscript.patch | 26 patches/icedtea-nio2.patch | 269 patches/icedtea-nomotif-6706121.patch |26836 +++++----- patches/icedtea-sh4-support.patch | 212 patches/icedtea-shark.patch | 21 patches/openjdk/6896472-missing_libjsig.patch | 20 patches/params-cast-size_t.patch | 252 patches/shark-debug-option.patch | 30 patches/shark_do_nothing_on_stub_frame.patch | 14 patches/systemtap-gcc-4.5.patch | 11 patches/systemtap.patch | 157 patches/xrender/icedtea-000.patch | 112 patches/zero.patch | 107 plugin/icedteanp/IcedTeaNPPlugin.cc | 30 plugin/icedteanp/IcedTeaPluginUtils.h | 16 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 9 plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 4 plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 4 ports/hotspot/make/linux/makefiles/zero.make | 32 ports/hotspot/make/linux/makefiles/zeroshark.make | 78 ports/hotspot/make/linux/platform_zero.in | 17 ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 72 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 63 ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp | 26 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp | 54 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 148 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp | 301 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 81 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 65 ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 164 ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp | 27 ports/hotspot/src/cpu/zero/vm/copy_zero.hpp | 178 ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp | 37 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 986 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 47 ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 31 ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 32 ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 36 ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 65 ports/hotspot/src/cpu/zero/vm/entry_zero.hpp | 64 ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp | 53 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 401 ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 77 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 151 ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 56 ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 49 ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 32 ports/hotspot/src/cpu/zero/vm/icache_zero.hpp | 36 ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 31 ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 75 ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 36 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 162 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 127 ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 66 ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 61 ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 72 ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp | 59 ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp | 108 ports/hotspot/src/cpu/zero/vm/jni_zero.h | 38 ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | 50 ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 185 ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp | 39 ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/register_zero.cpp | 39 ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 108 ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 74 ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp | 32 ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 115 ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 79 ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 197 ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 251 ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp | 31 ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 51 ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp | 26 ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp | 52 ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp | 26 ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp | 31 ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp | 62 ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp | 29 ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp | 32 ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 43 ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp | 26 ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 293 ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp | 40 ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 42 ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 167 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 480 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 51 ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp | 30 ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp | 39 ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp | 30 ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp | 26 ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 104 ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp | 45 ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp | 26 ports/hotspot/src/share/vm/includeDB_shark | 3 ports/hotspot/src/share/vm/includeDB_zero | 55 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 24 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 16 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 1 ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 11 ports/hotspot/src/share/vm/shark/sharkContext.cpp | 6 ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 7 ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 10 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 35 ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 4 ports/hotspot/src/share/vm/shark/sharkStack.cpp | 110 ports/hotspot/src/share/vm/shark/sharkStack.hpp | 41 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 290 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 29 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 4 diffs (truncated from 87215 to 500 lines): diff -r 727bee274d9e -r 946a062e9027 AUTHORS --- a/AUTHORS Sat Apr 24 15:32:51 2010 +0200 +++ b/AUTHORS Tue Jun 22 16:55:55 2010 +0100 @@ -31,6 +31,7 @@ Marc Schoenefeld Marc Schoenefeld Keith Seitz Joshua Sumali +Pavel Tisnovsky Christian Thalinger Dalibor Topic Arnaud Vandyck diff -r 727bee274d9e -r 946a062e9027 ChangeLog --- a/ChangeLog Sat Apr 24 15:32:51 2010 +0200 +++ b/ChangeLog Tue Jun 22 16:55:55 2010 +0100 @@ -1,3 +1,804 @@ 2010-04-24 Matthias Klose + + * Makefile.am: + Bump to b20 tarball. + +2010-06-17 Andrew John Hughes + + * patches/nimbus-source-target.patch: + Upstreamed as 6961536. + * patches/zero.patch: + Dropped; old changes necessary for hs16 when we had to + support hs14 & hs16. These changes are now upstream. + * ports/hotspot/make/linux/makefiles/zero.make, + * ports/hotspot/make/linux/makefiles/zeroshark.make, + * ports/hotspot/make/linux/platform_zero.in, + * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/copy_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/icache_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/jni_zero.h, + * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/register_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/register_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/stack_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp, + * ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp, + * ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp, + * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp, + * ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp, + * ports/hotspot/src/share/vm/includeDB_zero: + Dropped, upstream. + * Makefile.am: Remove patches and add new ones. + * patches/arm.patch: Changes to Zero necessary for the ARM assembler + port. Moved from local files in ports. + * patches/shark-debug-option.patch: + Remaining Zero changes not upstreamed. + +2010-06-14 Andrew John Hughes + + Don't print out the return value of pthread_self + which is a pthread_t. pthread_t is an opaque type + and we don't know what it actually is (it varies + from system to system; recent versions of Linux + use an unsigned long int). + * plugin/icedteanp/IcedTeaPluginUtils.h: + (PLUGIN_DEBUG_0ARG(str)): Don't print the thread_t. + (PLUGIN_DEBUG_1ARG(str,arg1)): Likewise. + (PLUGIN_DEBUG_2ARG(str,arg1,arg2)): Likewise. + (PLUGIN_DEBUG_3ARG(str,arg1,arg2,arg3)): Likewise. + (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. + (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + Make available BUILD_DIR for where a relative + path needs to be built. + (BUILD_DIR): Set to openjdk.build. + (BUILD_OUTPUT_DIR): Use BUILD_DIR. + (ECJ_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-ecj'. + +2010-06-14 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug + causing 100% CPU usage (rhbz# 592553). + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (SRC_DIR_LINK): Use reflink only if hard + linking is not possible. + (liveconnect-dist.stamp): Replace $(REFLINK) with + $(SRC_DIR_LINK). + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + * acinclude.m4: + (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking + to files in the source directory from the build directory + is possible. + * configure.ac: + Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE. + +2010-06-14 Omair Majid + + * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to + incorrect assumption that 'A' > 'a'. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (REFLINK): Remove unneeded quotation. + (OPENJDK_SRC_DIR_LINK): Use reflink only + if hard linking is not possible. + (extract-openjdk.stamp): Replace $(REFLINK) + with $(OPENJDK_SRC_DIR_LINK). + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): Define once only. + (WITH_OPENJDK_SRC_DIR): Define once only. + Check that directory is valid (to the extent + this is discernable by the README being present) + and whether hardlinking is possible, defining + OPENJDK_SRC_DIR_HARDLINKABLE if it is. + +2010-06-14 Omair Majid + + * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead + of evaluate, to get page URL. + +2010-06-14 Andrew John Hughes + + * Makefile.am: + (REFLINK): Set to --reflink=auto if + CP_SUPPORTS_REFLINK is defined. + (extract-openjdk.stamp): Replace --reflink=auto + with $(REFLINK). + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + * acinclude.m4: + (IT_CP_SUPPORTS_REFLINK): New macro to check + for a cp new enough to have --reflink. + * configure.ac: + Invoke IT_CP_SUPPORTS_REFLINK. + +2010-06-13 Andrew John Hughes + + * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java: + Removed, provided upstream. + * Makefile.am: Add new nimbus-source-target.patch. + * patches/ecj/bootver.patch: Always set required version to 1.5, + don't bother checking DISABLE_NIMBUS. + * patches/nimbus-source-target.patch: Fix source/target options + for Nimbus sources to 6, due to presence of @Override on interfaces. + +2010-06-13 Andrew John Hughes + + * generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/CheckBoxMenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/CheckBoxPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxEditableState.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ComboBoxTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/DesktopIconPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/DesktopPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/EditorPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/FileChooserPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/FormattedTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFramePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/InternalFrameWindowFocusedState.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuBarMenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/MenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/NimbusDefaults.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/OptionPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PasswordFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PopupMenuPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/PopupMenuSeparatorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarFinishedState.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarIndeterminateState.java, + * generated/com/sun/java/swing/plaf/nimbus/ProgressBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/RadioButtonMenuItemPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/RadioButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarThumbPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollBarTrackPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ScrollPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SeparatorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderThumbArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderThumbPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderTrackArrowShapeState.java, + * generated/com/sun/java/swing/plaf/nimbus/SliderTrackPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerNextButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneDividerVerticalState.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/SplitPaneVerticalState.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TabbedPaneTabPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableEditorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TableHeaderRendererSortedState.java, + * generated/com/sun/java/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java, + * generated/com/sun/java/swing/plaf/nimbus/TextAreaPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TextFieldPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TextPanePainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToggleButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarEastState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarNorthState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarSouthState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarToggleButtonPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolBarWestState.java, + * generated/com/sun/java/swing/plaf/nimbus/ToolTipPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreeCellEditorPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreeCellPainter.java, + * generated/com/sun/java/swing/plaf/nimbus/TreePainter.java: + Add generated Nimbus files so SynthUI can be compiled during + bootstrap. + +2010-06-11 Andrew John Hughes + + * Makefile.am: + (rt.stamp): Drop old dependencies no + longer needed. + +2010-06-10 Andrew John Hughes + + * patches/icedtea-doc-headers.patch: + Dropped, upstream file has completely changed. + May need to be recreated, may not. + * patches/icedtea-java2d-dasher.patch: + Upstreamed by Omair as 6793344. Now in OpenJDK6. + * Makefile.am: + Remove above patches. + (JAXWS_DROP_URL): Updated. + (JAXWS_DROP_ZIP): Likewise. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAF_DROP_URL): Added. + (JAF_DROP_ZIP): Updated. + (JAF_DROP_SHA256SUM): Likewise. + (JAXP_DROP_URL): Updated. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (download-jaf-drop): Use specific JAF_DROP_URL, + not JAXWS_DROP_URL. + * patches/icedtea-nio2.patch: Converted to use + new doc generation makefile. + +2010-06-08 Andrew John Hughes + + Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ + made obsolete by previous merge. Use --reflink=auto instead + of -l to avoid cross-device issues. + * Makefile.am: + (ICEDTEA_ENV): Fix use of ICEDTEA_BUILD_DIR. + (ICEDTEA_ENV_ECJ): Fix use of ICEDTEA_BUILD_DIR_ECJ. + (distclean-local): Fix use of ICEDTEA_BUILD_DIR + and ICEDTEA_BUILD_DIR_ECJ. + (extract-openjdk.stamp): Use --reflink=auto instead + of -l. + (liveconnect-dist.stamp): Likewise. + (netx-dist.stamp): Likewise. + (plugin-tests.stamp): Likewise. + +2010-06-07 Andrew John Hughes + + Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR + absolute and dispense with ICEDTEA_BUILD_DIR and + ICEDTEA_BUILD_DIR_ECJ. + * Makefile.am: + (BUILD_OUTPUT_DIR): Make absolute. + (ICEDTEA_BUILD_DIR): Dropped. + (ECJ_BUILD_OUTPUT_DIR): Likewise. + (ICEDTEA_CLS_DIR): Make relative to BUILD_OUTPUT_DIR. + (ICEDTEA_CLS_DIR): Likewise for ECJ_BUILD_OUTPUT_DIR. + (ICEDTEA_BUILD_DIR_ECJ): Dropped. + (ICEDTEA_ENV): Don't pass ICEDTEA_BUILD_DIR. + (ICEDTEA_ENV_ECJ): Likewise. + (bootstrap-directory.stamp): Use ECJ_BUILD_OUTPUT_DIR + rather than ICEDTEA_BUILD_DIR_ECJ. Remove unneeded + $(abs_top_builddir). + (icedtea.stamp): Drop unneeded use of $(abs_top_builddir) + from pulse java src.zip update. + (icedtea-debug.stamp): Add pulse java src.zip update. + (ADD_ZERO_CONFIGURE_ARGS): Drop unneeded $(abs_top_builddir). + (ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR + with BUILD_OUTPUT_DIR. + (check-hotspot): Replace unneeded use of pwd. + (check-jdk): Likewise. + (check-langtools): Likewise. + * patches/ecj/icedtea.patch: Use already defined + CLASSBINDIR instead of passing in ICEDTEA_BUILD_DIR. + +2010-06-07 Jon VanAlten + + * Makefile.am + (stamps/icedtea.stamp): Use full path when adding PulseAudio sources to src.zip + +2010-06-06 Andrew John Hughes + + * patches/icedtea-alpha-fixes.patch: + Remove upstreamed JDK portion. + * patches/icedtea-sh4-support.patch: + Recreated against upstreamed alpha patch. + +2010-06-04 Jon VanAlten + + * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java: + (isControlSupported): Correctly determine if control-type is + supported. + * Makefile.am + (stamps/icedtea.stamp): Add PulseAudio sources to src.zip + +2010-06-01 Xerxes R??nby + + * Makefile.am: + (extra-lib/about.jar): Remove redundant + conditional that we don't need any more. + (rewrite-rhino.stamp): Use full path to + jar application to avoid relying on the one + on the path. + +2010-05-26 Andrew John Hughes + + * patches/ecj/icedtea.patch, + * patches/icedtea-clean-crypto.patch, + * patches/icedtea-jtreg-jrunscript.patch, + * patches/icedtea-nio2.patch, + * patches/icedtea-nomotif-6706121.patch, + * patches/xrender/icedtea-000.patch: + Update after changes to licensing headers. + +2010-05-28 Andrew John Hughes + + * Makefile.am: + (bootstrap-directory-ecj.stamp): Join dependent parts + using &&. + (rewriter.stamp): Likewise. + (rewrite-rhino.stamp): Likewise. + +2010-05-28 Andrew John Hughes + + * Makefile.am: + (DEBUG_BUILD_OUTPUT_DIR): New variable to represent + debug build output directory. + (BUILD_DEBUG_JRE_ARCH_DIR): Use DEBUG_BUILD_OUTPUT_DIR. + (icedtea): Remove errorneous use of -debug. + (icedtea-debug): Replace use of -debug with + DEBUG_BUILD_OUTPUT_DIR. + +2010-05-24 Andrew John Hughes + + * Makefile.am: + The --enable-hg option should take precedence + over any --with-openjdk-src-zip/dir options. + Using a live Mercurial checkout only makes + sense in this context. + +2010-05-20 Andrew John Hughes + + Remove hs17 build option as this is now the default. + * patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch: + Dropped; applied upstream. + * patches/hotspot/hs17/params-cast-size_t.patch, + * patches/hotspot/hs17/shark_do_nothing_on_stub_frame.patch, + * patches/hotspot/hs17/systemtap.patch: + Moved to top-level. + * patches/hotspot/original/params-cast-size_t.patch, + * patches/hotspot/original/shark_do_nothing_on_stub_frame.patch, + * patches/hotspot/original/systemtap.patch: + Dropped; hs16 is dead. + * patches/openjdk/6896472-missing_libjsig.patch: + Dropped; applied upstream. + * Makefile.am: + Remove differentation between original and hs17 build patches + as only build is now the hs17 one in the OpenJDK repository. + * hotspot.map: Drop hs17. + * patches/params-cast-size_t.patch, + * patches/shark_do_nothing_on_stub_frame.patch, + * patches/systemtap.patch: + Moved from hs17 to top-level. + +2010-05-20 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp + (InlineSmallCode): Moved from here... + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp + (InlineSmallCode): ...to here. + +2010-05-20 Gary Benson + + PR icedtea/494 + * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp + (SharkCompileInvariants::java_lang_Throwable_klass): New method. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp + (SharkTopLevelBlock::_exc_handlers): New field. + (SharkTopLevelBlock::_exceptions): Likewise. + (SharkTopLevelBlock::compute_exceptions): New method. + (SharkTopLevelBlock::num_exceptions): Rewritten. + (SharkTopLevelBlock::exc_handler): New method. + (SharkTopLevelBlock::exception): Rewritten. + (SharkTopLevelBlock::marshal_exception_fast): New method. + (SharkTopLevelBlock::marshal_exception_slow): Likewise. + (SharkTopLevelBlock::handler_for_exception): Likewise. + (SharkTopLevelBlock::make_trap): Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp + (SharkTopLevelBlock::enter): Compute exceptions on entry, From ahughes at redhat.com Tue Jun 22 10:15:04 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 18:15:04 +0100 Subject: IcedTea6 Now Supports b20 Message-ID: New downloads: http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-b20-21_jun_2010.tar.gz https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip Other changes: The build directory for OpenJDK is now specified explicitly as ${abs_top_builddir}/openjdk.build (and ${abs_top_builddir}/openjdk.build-ecj for the bootstrap, ${abs_top_builddir}/openjdk.build-debug for debug). This means your resulting image is in openjdk.build/j2sdk-image rather than openjdk/build/${os}-${arch}/j2sdk-image, which means there is now a static path regardless of OS or architecture. Packagers please take note. If for some reason you need to override this, you can do make ICEDTEA_BUILD_TARGET='ALT_OUTPUT_DIR='. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Tue Jun 22 10:15:46 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 22 Jun 2010 17:15:46 +0000 Subject: /hg/icedtea6: Fix use of non-existent ICEDTEA_DEBUG_BUILD_DIR. Message-ID: changeset 507d3308f9c9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=507d3308f9c9 author: Andrew John Hughes date: Tue Jun 22 18:15:40 2010 +0100 Fix use of non-existent ICEDTEA_DEBUG_BUILD_DIR. 2010-06-22 Andrew John Hughes * Makefile.am: Replace ICEDTEA_DEBUG_BUILD_DIR with DEBUG_BUILD_OUTPUT_DIR. diffstat: 2 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 6 ++++++ Makefile.am | 2 +- diffs (25 lines): diff -r 946a062e9027 -r 507d3308f9c9 ChangeLog --- a/ChangeLog Tue Jun 22 16:55:55 2010 +0100 +++ b/ChangeLog Tue Jun 22 18:15:40 2010 +0100 @@ -1,3 +1,9 @@ 2010-06-22 Andrew John Hughes + + * Makefile.am: + Replace ICEDTEA_DEBUG_BUILD_DIR with + DEBUG_BUILD_OUTPUT_DIR. + 2010-06-22 Andrew John Hughes * Makefile.am: diff -r 946a062e9027 -r 507d3308f9c9 Makefile.am --- a/Makefile.am Tue Jun 22 16:55:55 2010 +0100 +++ b/Makefile.am Tue Jun 22 18:15:40 2010 +0100 @@ -178,7 +178,7 @@ else MEMORY_LIMIT = endif -ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(ICEDTEA_DEBUG_BUILD_DIR)" +ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(DEBUG_BUILD_OUTPUT_DIR)" if WITH_CACAO ICEDTEA_BUILD_TARGET=j2se_only ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only From ahughes at redhat.com Tue Jun 22 10:39:00 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 18:39:00 +0100 Subject: IcedTea6 Now Supports b20 In-Reply-To: References: Message-ID: On 22 June 2010 18:15, Andrew John Hughes wrote: > New downloads: > > http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-b20-21_jun_2010.tar.gz > https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip > https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip > https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip > > Other changes: > > The build directory for OpenJDK is now specified explicitly as > ${abs_top_builddir}/openjdk.build (and > ${abs_top_builddir}/openjdk.build-ecj for the bootstrap, > ${abs_top_builddir}/openjdk.build-debug for debug). ?This means your > resulting image is in openjdk.build/j2sdk-image rather than > openjdk/build/${os}-${arch}/j2sdk-image, which means there is now a > static path regardless of OS or architecture. ?Packagers please take > note. ?If for some reason you need to override this, you can do make > ICEDTEA_BUILD_TARGET='ALT_OUTPUT_DIR='. > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8 > It also includes the Zero cleanup I mentioned last week. I now like to start planning for an IcedTea6 1.19 release. Does anyone have anything pending they'd still like to commit for 1.19? I plan to add: 6961732 (Mario's font fix: http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/thread.html) the new Xrender code (http://mail.openjdk.java.net/pipermail/2d-dev/2010-May/001276.html) -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Tue Jun 22 11:06:01 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 22 Jun 2010 14:06:01 -0400 Subject: [RFC] JNLP: jars with native libraries in incorrect locations In-Reply-To: <4C178331.6000802@redhat.com> References: <4C178331.6000802@redhat.com> Message-ID: <4C20FB89.3070305@redhat.com> On 06/15/2010 09:42 AM, Omair Majid wrote: > Hi, > > I recently ran into a problem with SweetHome3D [1] not working under > Netx. The jnlp file contains no 'nativelib' elements which initially led > me to believe that it contains no native code. However, one of the jars > it references [2] contains native code under /linux/x64/. Both of these > things (no nativelib element and placing .so's anywhere other than under > /) seem to go against the developer guide's guidelines. Of course, > without reading the JSR, I can not say if this is against the JNLP spec > or not. > > That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx > should work too. The attached patch modifies Netx so that it always > tries to look for .so's (placed anywhere) in jar files. If it finds > them, it activates them as if the .so's were in a nativelib jar. > > Any thoughts or comments? > > Cheers, > Omair > > > [1] http://www.sweethome3d.com/SweetHome3D.jnlp > [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar Anyone? From andrew at icedtea.classpath.org Tue Jun 22 11:10:36 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 22 Jun 2010 18:10:36 +0000 Subject: /hg/icedtea6: Remove linking of non-existent platform_zero.in Message-ID: changeset 038bfe38cab1 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=038bfe38cab1 author: Andrew John Hughes date: Tue Jun 22 19:10:30 2010 +0100 Remove linking of non-existent platform_zero.in 2010-06-22 Andrew John Hughes * Makefile.am: (ports.stamp): Remove unneeded linking of platform_zero (no longer exists). diffstat: 2 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 3 +-- diffs (26 lines): diff -r 507d3308f9c9 -r 038bfe38cab1 ChangeLog --- a/ChangeLog Tue Jun 22 18:15:40 2010 +0100 +++ b/ChangeLog Tue Jun 22 19:10:30 2010 +0100 @@ -1,3 +1,9 @@ 2010-06-22 Andrew John Hughes + + * Makefile.am: + (ports.stamp): Remove unneeded linking of + platform_zero (no longer exists). + 2010-06-22 Andrew John Hughes * Makefile.am: diff -r 507d3308f9c9 -r 038bfe38cab1 Makefile.am --- a/Makefile.am Tue Jun 22 18:15:40 2010 +0100 +++ b/Makefile.am Tue Jun 22 19:10:30 2010 +0100 @@ -896,8 +896,7 @@ clean-replace-hotspot: # Copy ports sources into tree stamps/ports.stamp: stamps/replace-hotspot.stamp - for target in $(abs_top_srcdir)/ports/hotspot/make/*/platform_zero.in \ - $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \ + for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \ $(abs_top_srcdir)/ports/hotspot/tools \ $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \ $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \ From andrew at icedtea.classpath.org Tue Jun 22 11:14:38 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 22 Jun 2010 18:14:38 +0000 Subject: /hg/icedtea6: S6961732: FontMetrics.getLeading() may be negative... Message-ID: changeset da2ba8396450 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=da2ba8396450 author: Andrew John Hughes date: Tue Jun 22 19:14:32 2010 +0100 S6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds 2010-06-22 Andrew John Hughes * Makefile.am: Add new patch. * patches/openjdk/6961732.patch: Backport of 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds diffstat: 3 files changed, 54 insertions(+), 1 deletion(-) ChangeLog | 7 ++++++ Makefile.am | 3 +- patches/openjdk/6961732.patch | 45 +++++++++++++++++++++++++++++++++++++++++ diffs (76 lines): diff -r 038bfe38cab1 -r da2ba8396450 ChangeLog --- a/ChangeLog Tue Jun 22 19:10:30 2010 +0100 +++ b/ChangeLog Tue Jun 22 19:14:32 2010 +0100 @@ -1,3 +1,10 @@ 2010-06-22 Andrew John Hughes + + * Makefile.am: Add new patch. + * patches/openjdk/6961732.patch: + Backport of 6961732: FontMetrics.getLeading() + may be negative in freetype-based OpenJDK builds + 2010-06-22 Andrew John Hughes * Makefile.am: diff -r 038bfe38cab1 -r da2ba8396450 Makefile.am --- a/Makefile.am Tue Jun 22 19:10:30 2010 +0100 +++ b/Makefile.am Tue Jun 22 19:14:32 2010 +0100 @@ -311,7 +311,8 @@ ICEDTEA_PATCHES = \ patches/extensions/netx-umask.patch \ patches/icedtea-jtreg-httpTest.patch \ patches/arm.patch \ - patches/shark-debug-option.patch + patches/shark-debug-option.patch \ + patches/openjdk/6961732.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 038bfe38cab1 -r da2ba8396450 patches/openjdk/6961732.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6961732.patch Tue Jun 22 19:14:32 2010 +0100 @@ -0,0 +1,45 @@ +# HG changeset patch +# User neugens +# Date 1276713970 -7200 +# Node ID 388276965253fbfd368d9d095cfb1efd746181d9 +# Parent 40ad1b388fc2df199ee50d233fdc3f1eac273701 +6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds. +Summary: Fix premature integer roundings to preserve correct height, width and descent values for fonts +Reviewed-by: prr + +diff -r 40ad1b388fc2 -r 388276965253 src/share/native/sun/font/freetypeScaler.c +--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c Fri Jun 18 01:18:22 2010 -0700 ++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c Wed Jun 16 20:46:10 2010 +0200 +@@ -490,22 +490,23 @@ + + /* ascent */ + ax = 0; +- ay = -(jfloat) FT26Dot6ToFloat( +- scalerInfo->face->size->metrics.ascender + +- bmodifier/2); ++ ay = -(jfloat) FT26Dot6ToFloat(FT_MulFix( ++ ((jlong) scalerInfo->face->ascender + bmodifier/2), ++ (jlong) scalerInfo->face->size->metrics.y_scale)); + /* descent */ + dx = 0; +- dy = -(jfloat) FT26Dot6ToFloat( +- scalerInfo->face->size->metrics.descender + +- bmodifier/2); ++ dy = -(jfloat) FT26Dot6ToFloat(FT_MulFix( ++ ((jlong) scalerInfo->face->descender + bmodifier/2), ++ (jlong) scalerInfo->face->size->metrics.y_scale)); + /* baseline */ + bx = by = 0; + + /* leading */ + lx = 0; +- ly = (jfloat) FT26Dot6ToFloat( +- scalerInfo->face->size->metrics.height + +- bmodifier) + ay - dy; ++ ly = (jfloat) FT26Dot6ToFloat(FT_MulFix( ++ (jlong) scalerInfo->face->height + bmodifier, ++ (jlong) scalerInfo->face->size->metrics.y_scale)) ++ + ay - dy; + /* max advance */ + mx = (jfloat) FT26Dot6ToFloat( + scalerInfo->face->size->metrics.max_advance + From omajid at redhat.com Tue Jun 22 11:21:43 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 22 Jun 2010 14:21:43 -0400 Subject: [RFC] Netx: make the single instance server thread a daemon Message-ID: <4C20FF37.8010708@redhat.com> Hi, The attached thread makes the single instance server thread in Netx a daemon thread. This allows the JVM to shutdown even if the server is the only thread running. The unexpected shutdown of the server should not cause any problems - the only cleanup the server does is shutting down the port. Ok to commit? Cheers, Omair -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: netx-make-single-instance-server-daemon.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100622/1066b54f/netx-make-single-instance-server-daemon.patch From bugzilla-daemon at icedtea.classpath.org Tue Jun 22 13:32:28 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 22 Jun 2010 20:32:28 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #9 from jon.vanalten at redhat.com 2010-06-22 20:32 ------- (In reply to comment #8) > I suspect that when currentTimeMillis is negative it'll break elsewhere. > So, I doubt that a fix in one place will help. > Definitely, there are plenty of other potential 2038-affected bugs in IcedTea/OpenJDK. But, most of them are such that they expect time to move forwards and then terrible things happen if the clock rolls over during runtime, rather than this simple "time should not be negative" thing. Any checks that are failing simply because currentTimeMillis() is negative are bugs in themselves IMO (unless they really mean to check that the system clock is later than 1970), and should be fixed separately if found. The rolling over of the clock is entirely system dependent, we are not reaching the limits of Long._VALUE here on the return values of currentTimeMillis(), but rather the limits of how the epoch time is being stored in the OS. So, I still think that any bugs that are truly due to the system clock overflowing cannot be resolved within the JDK. In fact, when we start to approach the overflow value in around 292 million years[1], and if openJDK still exists at that time, I will be proud to have the notoriety of refusing to fix it here in 2010. ;) Thoughts? [1] http://www.wolframalpha.com/input/?i=2^63+milliseconds+after+January+1%2C+1970 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Tue Jun 22 13:47:06 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 21:47:06 +0100 Subject: [RFC] JNLP: jars with native libraries in incorrect locations In-Reply-To: <4C20FB89.3070305@redhat.com> References: <4C178331.6000802@redhat.com> <4C20FB89.3070305@redhat.com> Message-ID: On 22 June 2010 19:06, Omair Majid wrote: > On 06/15/2010 09:42 AM, Omair Majid wrote: >> >> Hi, >> >> I recently ran into a problem with SweetHome3D [1] not working under >> Netx. The jnlp file contains no 'nativelib' elements which initially led >> me to believe that it contains no native code. However, one of the jars >> it references [2] contains native code under /linux/x64/. Both of these >> things (no nativelib element and placing .so's anywhere other than under >> /) seem to go against the developer guide's guidelines. Of course, >> without reading the JSR, I can not say if this is against the JNLP spec >> or not. >> >> That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx >> should work too. The attached patch modifies Netx so that it always >> tries to look for .so's (placed anywhere) in jar files. If it finds >> them, it activates them as if the .so's were in a nativelib jar. >> >> Any thoughts or comments? >> >> Cheers, >> Omair >> >> >> [1] http://www.sweethome3d.com/SweetHome3D.jnlp >> [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar > > Anyone? > Sorry, didn't see this until your ping. The code you have to find the file component of the path could be more portably written as new File(e.getName()).getName(): http://java.sun.com/j2se/1.5.0/docs/api/java/io/File.html#getName%28%29 That also deals with the issue of the path ending in a '/', which would currently result in an IndexOutOfBoundsException. Sadly I can't see a method for obtaining the dynamic library name extension (System has mapLibraryName to do x -> x.so, but nothing to check an existing path; maybe something to suggest upstream). Checking for .so, .dll and .dylib should cover most cases. Cheers, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Tue Jun 22 14:08:18 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 22 Jun 2010 17:08:18 -0400 Subject: [RFC] JNLP: jars with native libraries in incorrect locations In-Reply-To: References: <4C178331.6000802@redhat.com> <4C20FB89.3070305@redhat.com> Message-ID: <4C212642.5030808@redhat.com> On 06/22/2010 04:47 PM, Andrew John Hughes wrote: > On 22 June 2010 19:06, Omair Majid wrote: >> On 06/15/2010 09:42 AM, Omair Majid wrote: >>> >>> Hi, >>> >>> I recently ran into a problem with SweetHome3D [1] not working under >>> Netx. The jnlp file contains no 'nativelib' elements which initially led >>> me to believe that it contains no native code. However, one of the jars >>> it references [2] contains native code under /linux/x64/. Both of these >>> things (no nativelib element and placing .so's anywhere other than under >>> /) seem to go against the developer guide's guidelines. Of course, >>> without reading the JSR, I can not say if this is against the JNLP spec >>> or not. >>> >>> That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx >>> should work too. The attached patch modifies Netx so that it always >>> tries to look for .so's (placed anywhere) in jar files. If it finds >>> them, it activates them as if the .so's were in a nativelib jar. >>> >>> Any thoughts or comments? >>> >>> Cheers, >>> Omair >>> >>> >>> [1] http://www.sweethome3d.com/SweetHome3D.jnlp >>> [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar >> >> Anyone? >> > > Sorry, didn't see this until your ping. > > The code you have to find the file component of the path could be more > portably written as new File(e.getName()).getName(): > http://java.sun.com/j2se/1.5.0/docs/api/java/io/File.html#getName%28%29 > That also deals with the issue of the path ending in a '/', which > would currently result in an IndexOutOfBoundsException. > Ah, that sounds just like what I was looking for. Thanks. Still, this code only executes if the entry is not a directory, so the exception should never happen (at least on a unix-like system). But your way makes a lot more sense :) > Sadly I can't see a method for obtaining the dynamic library name > extension (System has mapLibraryName to do x -> x.so, but nothing to > check an existing path; maybe something to suggest upstream). > Checking for .so, .dll and .dylib should cover most cases. > Yup, I was hoping to find something in the JRE to check for a library name but couldn't. I guess I will manually add checks for .so, .dll and .dylib. Do you know of any reference where I could find a list of possible extensions? I ask because I have never seen .dylib before, and I would hate to miss other possible library extensions. More importantly, can I take this to mean that violating (what I think is) the spec is ok in this case? Thanks, Omair From ahughes at redhat.com Tue Jun 22 15:22:05 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 23:22:05 +0100 Subject: [RFC] JNLP: jars with native libraries in incorrect locations In-Reply-To: <4C212642.5030808@redhat.com> References: <4C178331.6000802@redhat.com> <4C20FB89.3070305@redhat.com> <4C212642.5030808@redhat.com> Message-ID: On 22 June 2010 22:08, Omair Majid wrote: > On 06/22/2010 04:47 PM, Andrew John Hughes wrote: >> >> On 22 June 2010 19:06, Omair Majid ?wrote: >>> >>> On 06/15/2010 09:42 AM, Omair Majid wrote: >>>> >>>> Hi, >>>> >>>> I recently ran into a problem with SweetHome3D [1] not working under >>>> Netx. The jnlp file contains no 'nativelib' elements which initially led >>>> me to believe that it contains no native code. However, one of the jars >>>> it references [2] contains native code under /linux/x64/. Both of these >>>> things (no nativelib element and placing .so's anywhere other than under >>>> /) seem to go against the developer guide's guidelines. Of course, >>>> without reading the JSR, I can not say if this is against the JNLP spec >>>> or not. >>>> >>>> That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx >>>> should work too. The attached patch modifies Netx so that it always >>>> tries to look for .so's (placed anywhere) in jar files. If it finds >>>> them, it activates them as if the .so's were in a nativelib jar. >>>> >>>> Any thoughts or comments? >>>> >>>> Cheers, >>>> Omair >>>> >>>> >>>> [1] http://www.sweethome3d.com/SweetHome3D.jnlp >>>> [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar >>> >>> Anyone? >>> >> >> Sorry, didn't see this until your ping. >> >> The code you have to find the file component of the path could be more >> portably written as new File(e.getName()).getName(): >> http://java.sun.com/j2se/1.5.0/docs/api/java/io/File.html#getName%28%29 >> ?That also deals with the issue of the path ending in a '/', which >> would currently result in an IndexOutOfBoundsException. >> > > Ah, that sounds just like what I was looking for. Thanks. Still, this code > only executes if the entry is not a directory, so the exception should never > happen (at least on a unix-like system). But your way makes a lot more sense > :) > >> Sadly I can't see a method for obtaining the dynamic library name >> extension (System has mapLibraryName to do x -> ?x.so, but nothing to >> check an existing path; maybe something to suggest upstream). >> Checking for .so, .dll and .dylib should cover most cases. >> > > Yup, I was hoping to find something in the JRE to check for a library name > but couldn't. I guess I will manually add checks for .so, .dll and .dylib. > Do you know of any reference where I could find a list of possible > extensions? I ask because I have never seen .dylib before, and I would hate > to miss other possible library extensions. > There's http://en.wikipedia.org/wiki/Dynamic_libraries#Naming Most systems are .so (GNU/Linux, Solaris, *BSD). The exceptions are MacOS X which renames them to .dylib (though they are essentially the same thing) and also has bundles of them which we should also probably allow for (.framework as mentioned in the link), along with Windows which uses the .dll system as it always has to be different. > More importantly, can I take this to mean that violating (what I think is) > the spec is ok in this case? > I'd say their proprietary implementation is the spec. for all intents and purposes, and if it works with that so be it. > Thanks, > Omair > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Jun 22 15:32:08 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 22 Jun 2010 23:32:08 +0100 Subject: VisualVM's New Home Message-ID: http://icedtea.classpath.org/people/andrew/visualvm now has the independent build machinery for VisualVM. (Mark, can you please move this to icedtea.classpath.org/hg/visualvm; seems you are still the only one with permission to write to /hg) This is based on the existing support in IcedTea6 & 7, which will shortly be dropped. I was able to use this to build VisualVM on a F13 machine as follows: $ ./autogen.sh $ ./configure --prefix= $ make $ make install VisualVM is installed in the specified prefix as with normal packages. To achieve the effect of IcedTea, just use a prefix equal to the JDK's location. - Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Tue Jun 22 16:15:59 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 22 Jun 2010 23:15:59 +0000 Subject: /hg/icedtea: Drop VisualVM, now maintained independently of Iced... Message-ID: changeset 03c860266712 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=03c860266712 author: Andrew John Hughes date: Wed Jun 23 00:15:52 2010 +0100 Drop VisualVM, now maintained independently of IcedTea. 2010-06-22 Andrew John Hughes Remove VisualVM support, now maintained at http://icedtea.classpath.org/hg/visualvm * Makefile.am: Remove VisualVM targets, references and aliases. (NETBEANS_PROFILER_URL): Removed. (NETBEANS_PROFILER_SRC_ZIP): Likewise. (NETBEANS_PROFILER_SHA256SUM): Likewise. (VISUALVM_URL): Likewise. (VISUALVM_SRC_ZIP): Likewise. (VISUALVM_SHA256SUM): Likewise. (EXTRA_DIST): Remove visualvm.desktop. (clean-local): Remove clean-visualvm and clean-nbplatform. (.PHONY): Likewise. (download): Don't depend on download-visualvm.stamp (clean-download): Don't depend on clean-download-visualvm (download-visualvm): Removed. (clean-download-visualvm): Likewise. (extract): Don't depend on extract-visualvm.stamp (clean- extract): Don't depend on clean-extract-visualvm. (extract- visualvm): Removed. (clean-extract-visualvm): Likewise. (icedtea-stage2): Don't depend on visualvm.stamp (icedtea- debug-stage2): Likewise. (nbplatform): Removed. (visualvm): Removed. * acinclude.m4: Remove VisualVM-related macros. (FIND_NETBEANS): Removed. (WITH_NETBEANS_PROFILER_ZIP): Removed. (WITH_VISUALVM_ZIP): Removed. * configure.ac: Remove --with-netbeans-home and --enable-visualvm options. Don't invoke VisualVM macros. * visualvm.desktop: Removed. diffstat: 5 files changed, 49 insertions(+), 281 deletions(-) ChangeLog | 38 +++++++++++ Makefile.am | 181 +++--------------------------------------------------- acinclude.m4 | 64 ------------------- configure.ac | 38 ----------- visualvm.desktop | 9 -- diffs (477 lines): diff -r 37170bd13e08 -r 03c860266712 ChangeLog --- a/ChangeLog Tue Jun 22 16:00:26 2010 +0100 +++ b/ChangeLog Wed Jun 23 00:15:52 2010 +0100 @@ -1,3 +1,41 @@ 2010-06-21 Andrew John Hughes + + Remove VisualVM support, now maintained at + http://icedtea.classpath.org/hg/visualvm + * Makefile.am: + Remove VisualVM targets, references and aliases. + (NETBEANS_PROFILER_URL): Removed. + (NETBEANS_PROFILER_SRC_ZIP): Likewise. + (NETBEANS_PROFILER_SHA256SUM): Likewise. + (VISUALVM_URL): Likewise. + (VISUALVM_SRC_ZIP): Likewise. + (VISUALVM_SHA256SUM): Likewise. + (EXTRA_DIST): Remove visualvm.desktop. + (clean-local): Remove clean-visualvm and clean-nbplatform. + (.PHONY): Likewise. + (download): Don't depend on download-visualvm.stamp + (clean-download): Don't depend on clean-download-visualvm + (download-visualvm): Removed. + (clean-download-visualvm): Likewise. + (extract): Don't depend on extract-visualvm.stamp + (clean-extract): Don't depend on clean-extract-visualvm. + (extract-visualvm): Removed. + (clean-extract-visualvm): Likewise. + (icedtea-stage2): Don't depend on visualvm.stamp + (icedtea-debug-stage2): Likewise. + (nbplatform): Removed. + (visualvm): Removed. + * acinclude.m4: + Remove VisualVM-related macros. + (FIND_NETBEANS): Removed. + (WITH_NETBEANS_PROFILER_ZIP): Removed. + (WITH_VISUALVM_ZIP): Removed. + * configure.ac: + Remove --with-netbeans-home and + --enable-visualvm options. Don't invoke + VisualVM macros. + * visualvm.desktop: Removed. + 2010-06-21 Andrew John Hughes * patches/cacao/memory.patch: diff -r 37170bd13e08 -r 03c860266712 Makefile.am --- a/Makefile.am Tue Jun 22 16:00:26 2010 +0100 +++ b/Makefile.am Wed Jun 23 00:15:52 2010 +0100 @@ -23,14 +23,6 @@ CACAO_BASE_URL = http://mips.complang.tu CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive/tip.tar.bz2 CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 - -NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/145168/ -NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release67.tar.gz -NETBEANS_PROFILER_SHA256SUM = 611736b4e6dac2f7ddb669a23a474fb052f4141c04dc2ba5888b9e9db61fe59b - -VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/145167/ -VISUALVM_SRC_ZIP = visualvm_121-src.tar.gz -VISUALVM_SHA256SUM = b561207d85da4916e809cc4c104098e1ca979b30192c207b9d6087a31c91b8b0 JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip @@ -731,7 +723,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr $(top_srcdir)/patches/security/*.patch \ $(top_srcdir)/patches/xrender/*.patch \ tools-copy contrib ports extra overlays \ - javaws.png javaws.desktop visualvm.desktop \ + javaws.png javaws.desktop \ jconsole.desktop policytool.desktop \ $(JTREG_SRCS) \ HACKING $(PULSEAUDIO_SRCS) fsg.sh \ @@ -754,8 +746,7 @@ check-local: jtregcheck clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \ - clean-extra clean-netx clean-visualvm clean-nbplatform \ - clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \ + clean-extra clean-netx clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \ clean-extract clean-generated clean-plugin clean-liveconnect clean-native-ecj \ clean-hgforest clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \ @@ -781,9 +772,8 @@ install: clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ clean-icedtea icedtea-stage2 clean-icedtea-boot \ - clean-visualvm clean-nbplatform clean-rt clean-plugin hotspot \ - hotspot-helper clean-extra clean-jtreg clean-jtreg-reports clean-netx \ - clean-drops + clean-rt clean-plugin hotspot hotspot-helper clean-extra clean-jtreg \ + clean-jtreg-reports clean-netx clean-drops env: @echo 'unset JAVA_HOME' @@ -829,12 +819,11 @@ clean-hgforest: # Download OpenJDK sources. stamps/download.stamp: stamps/download-drops.stamp stamps/download-openjdk.stamp \ - stamps/download-cacao.stamp stamps/download-visualvm.stamp + stamps/download-cacao.stamp mkdir -p stamps touch $@ -clean-download: clean-drops clean-download-openjdk clean-download-cacao \ - clean-download-visualvm +clean-download: clean-drops clean-download-openjdk clean-download-cacao rm -f stamps/download.stamp stamps/download-jaxp-drop.stamp: @@ -1126,60 +1115,12 @@ clean-download-cacao: rm -f $(CACAO_SRC_ZIP) rm -f stamps/download-cacao.stamp -stamps/download-visualvm.stamp: -if WITH_VISUALVM -if USE_ALT_NETBEANS_PROFILER_ZIP - ln -sf $(ALT_NETBEANS_PROFILER_ZIP) $(NETBEANS_PROFILER_SRC_ZIP) -endif - if ! echo "$(NETBEANS_PROFILER_SHA256SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then \ - if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ - then \ - mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ - -O $(NETBEANS_PROFILER_SRC_ZIP) ; \ - if ! echo "$(NETBEANS_PROFILER_SHA256SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of NetBeans profiler zip"; false; \ - fi; \ - fi - -if USE_ALT_VISUALVM_ZIP - ln -sf $(ALT_VISUALVM_ZIP) $(VISUALVM_SRC_ZIP) -endif - if ! echo "$(VISUALVM_SHA256SUM) $(VISUALVM_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then \ - if [ $(VISUALVM_SRC_ZIP) ] ; \ - then \ - mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) \ - -O $(VISUALVM_SRC_ZIP) ; \ - if ! echo "$(VISUALVM_SHA256SUM) $(VISUALVM_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of VisualVM zip"; false; \ - fi; \ - fi -endif +stamps/extract.stamp: stamps/extract-openjdk.stamp \ + stamps/extract-cacao.stamp stamps/extract-jaxws.stamp mkdir -p stamps touch $@ -clean-download-visualvm: - rm -f $(VISUALVM_SRC_ZIP) - rm -f $(NETBEANS_PROFILER_SRC_ZIP) - rm -f stamps/download-visualvm.stamp - -stamps/extract.stamp: stamps/extract-openjdk.stamp \ - stamps/extract-visualvm.stamp stamps/extract-cacao.stamp \ - stamps/extract-jaxws.stamp - mkdir -p stamps - touch $@ - -clean-extract: clean-extract-openjdk clean-extract-visualvm \ - clean-extract-cacao clean-extract-jaxws +clean-extract: clean-extract-openjdk clean-extract-cacao clean-extract-jaxws rm -f stamps/extract.stamp stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp @@ -1296,30 +1237,6 @@ clean-extract-openjdk: clean-overlay cle clean-ports clean-patch-fsg rm -rf openjdk rm -f stamps/extract-openjdk.stamp - -stamps/extract-visualvm.stamp: stamps/download-visualvm.stamp -if WITH_VISUALVM - set -e ; \ - if ! test -d netbeans ; \ - then \ - mkdir netbeans ; \ - $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \ - fi - - set -e ; \ - if ! test -d visualvm ; \ - then \ - $(TAR) xf $(VISUALVM_SRC_ZIP) ; \ - fi -endif - mkdir -p stamps - touch $@ - -clean-extract-visualvm: -if WITH_VISUALVM - rm -rf netbeans visualvm -endif - rm -f stamps/extract-visualvm.stamp stamps/extract-cacao.stamp: stamps/download-cacao.stamp if BUILD_CACAO @@ -1942,7 +1859,7 @@ clean-icedtea: rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp stamps/visualvm.stamp + stamps/add-zero.stamp mkdir -p stamps touch $@ @@ -1950,8 +1867,7 @@ clean-icedtea-stage2: rm -f stamps/icedtea-stage2.stamp stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ - stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ - stamps/visualvm.stamp + stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp mkdir -p stamps touch $@ @@ -2251,75 +2167,6 @@ endif endif mkdir -p stamps touch stamps/rewrite-rhino.stamp - -# VisualVM - -stamps/nbplatform.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) stamps/extract-visualvm.stamp -if WITH_VISUALVM - cd netbeans ; \ - rm nbbuild/external/binaries-list ; \ - mkdir -p ./nbbuild/netbeans_visualvm/ ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \ - if ! (uname -a | grep x86_64) ; then \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ - buildscript=./buildnative-linux-15.sh ; \ - else \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ - buildscript=./buildnative-linux64-15.sh ; \ - fi ; \ - cd lib.profiler/native/build ; \ - JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ - $$buildscript ; \ - cd ../../.. ; \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \ - -f nbbuild/build.xml bootstrap ; \ - for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler ; do \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091020 \ - -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \ - -f $$dir/build.xml ; \ - done -endif - mkdir -p stamps - touch $@ - -clean-nbplatform: - rm -rf netbeans - rm -f stamps/nbplatform.stamp - -stamps/visualvm.stamp: stamps/icedtea.stamp stamps/nbplatform.stamp -if WITH_VISUALVM - cd visualvm ; \ - ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans_visualvm netbeans ; \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) build - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \ - visualvm/launcher/visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - cp visualvm/launcher/visualvm.conf \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - echo visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - echo profiler3 >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - cp -r visualvm/build/cluster/* \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm -endif - mkdir -p stamps - touch $@ - -clean-visualvm: - rm -rf visualvm - rm -f stamps/visualvm.stamp # CACAO @@ -2686,15 +2533,11 @@ download-jaxws-drop: stamps/download-jax download-openjdk: stamps/download-openjdk.stamp -download-visualvm: stamps/download-visualvm.stamp - extract: stamps/extract.stamp extract-cacao: stamps/extract-cacao.stamp extract-openjdk: stamps/extract-openjdk.stamp - -extract-visualvm: stamps/extract-visualvm.stamp generated: stamps/generated.stamp @@ -2747,5 +2590,3 @@ rt: stamps/rt.stamp rt: stamps/rt.stamp rt-class-files: stamps/rt-class-files.stamp - -visualvm: stamps/visualvm.stamp diff -r 37170bd13e08 -r 03c860266712 acinclude.m4 --- a/acinclude.m4 Tue Jun 22 16:00:26 2010 +0100 +++ b/acinclude.m4 Wed Jun 23 00:15:52 2010 +0100 @@ -647,38 +647,6 @@ AC_DEFUN([FIND_XERCES2_JAR], fi AC_MSG_RESULT(${XERCES2_JAR}) AC_SUBST(XERCES2_JAR) -]) - -AC_DEFUN([FIND_NETBEANS], -[ - AC_MSG_CHECKING([if the location of NetBeans is specified]) - AC_ARG_WITH([netbeans], - [AS_HELP_STRING(--with-netbeans,specify location of netbeans)], - [ - if test "x${withval}" = "xyes"; then - NETBEANS=no - else - NETBEANS="${withval}" - fi - ], - [ - NETBEANS=no - ]) - AC_MSG_RESULT(${NETBEANS}) - if ! test -f "${NETBEANS}"; then - if test "x${NETBEANS}" = "xno"; then - NETBEANS= - else - AC_PATH_PROG(NETBEANS, "${NETBEANS}") - fi - fi - if test -z "${NETBEANS}"; then - AC_PATH_PROG(NETBEANS, "netbeans") - fi - if test -z "${NETBEANS}"; then - AC_MSG_ERROR("NetBeans was not found.") - fi - AC_SUBST(NETBEANS) ]) AC_DEFUN([FIND_RHINO_JAR], @@ -1652,38 +1620,6 @@ AC_PROVIDE([$0])dnl AC_PROVIDE([$0])dnl ]) -AC_DEFUN([WITH_NETBEANS_PROFILER_ZIP], -[ - AC_MSG_CHECKING(for a NetBeans profiler zip) - AC_ARG_WITH([netbeans-profiler-zip], - [AS_HELP_STRING(--with-netbeans-profiler-zip,specify the location of the NetBeans profiler zip)], - [ - ALT_NETBEANS_PROFILER_ZIP=${withval} - ], - [ - ALT_NETBEANS_PROFILER_ZIP="not specified" - ]) - AC_MSG_RESULT(${ALT_NETBEANS_PROFILER_ZIP}) - AM_CONDITIONAL(USE_ALT_NETBEANS_PROFILER_ZIP, test "x$ALT_NETBEANS_PROFILER_ZIP" != "xnot specified") - AC_SUBST(ALT_NETBEANS_PROFILER_ZIP) -]) - -AC_DEFUN([WITH_VISUALVM_ZIP], -[ - AC_MSG_CHECKING(for a VisualVM zip) - AC_ARG_WITH([visualvm-zip], - [AS_HELP_STRING(--with-visualvm-zip,specify the location of the VisualVM zip)], - [ - ALT_VISUALVM_ZIP=${withval} - ], - [ - ALT_VISUALVM_ZIP="not specified" - ]) - AC_MSG_RESULT(${ALT_VISUALVM_ZIP}) - AM_CONDITIONAL(USE_ALT_VISUALVM_ZIP, test "x$ALT_VISUALVM_ZIP" != "xnot specified") - AC_SUBST(ALT_VISUALVM_ZIP) -]) - AC_DEFUN_ONCE([IT_GET_PKGVERSION], [ AC_MSG_CHECKING([for distribution package version]) diff -r 37170bd13e08 -r 03c860266712 configure.ac --- a/configure.ac Tue Jun 22 16:00:26 2010 +0100 +++ b/configure.ac Wed Jun 23 00:15:52 2010 +0100 @@ -50,32 +50,6 @@ IT_FIND_NUMBER_OF_PROCESSORS IT_FIND_NUMBER_OF_PROCESSORS IT_CP_SUPPORTS_REFLINK IT_CAN_HARDLINK_TO_SOURCE_TREE - -AC_MSG_CHECKING([for a NetBeans installation]) -AC_ARG_WITH([netbeans-home], - [AS_HELP_STRING([--with-netbeans-home], - [NetBeans home directory (default is /usr/share/netbeans)])], - [ - if test "x${withval}" = x - then - SYSTEM_NETBEANS_DIR=/usr/share/netbeans - else - SYSTEM_NETBEANS_DIR=${withval} - fi - ], - [ - SYSTEM_NETBEANS_DIR=/usr/share/netbeans - ]) -AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}]) -AC_SUBST(SYSTEM_NETBEANS_DIR) - -AC_MSG_CHECKING([whether to build VisualVM]) -AC_ARG_ENABLE([visualvm], - [AS_HELP_STRING([--enable-visualvm], - [Enable compilation of visualvm.])], - [enable_visualvm="${enableval}"], [enable_visualvm="no"]) -AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes") -AC_MSG_RESULT(${enable_visualvm}) AC_MSG_CHECKING([whether to build the LiveConnect plugin]) AC_ARG_ENABLE([plugin], @@ -188,8 +162,6 @@ WITH_JAXP_DROP_ZIP WITH_JAXP_DROP_ZIP WITH_JAF_DROP_ZIP WITH_JAXWS_DROP_ZIP -WITH_NETBEANS_PROFILER_ZIP -WITH_VISUALVM_ZIP AC_CHECK_ENABLE_CACAO AC_CHECK_WITH_CACAO_HOME @@ -218,16 +190,6 @@ AC_SUBST([GCJ]) dnl Plugin IT_CHECK_XULRUNNER_VERSION - -if test "x${enable_visualvm}" = "xyes" -then - FIND_NETBEANS -fi - -if test "x${enable_visualvm}" = "xyes" -then - FIND_NETBEANS -fi dnl pkgconfig cannot be used to find these headers and libraries. AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] diff -r 37170bd13e08 -r 03c860266712 visualvm.desktop --- a/visualvm.desktop Tue Jun 22 16:00:26 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=OpenJDK VisualVM -Comment=Integrates commandline JDK tools and profiling capabilites. -Exec=/usr/bin/jvisualvm -Icon=java -Terminal=false -Type=Application -Categories=Development;Java; -Version=1.0 From thebohemian at gmx.net Wed Jun 23 00:35:41 2010 From: thebohemian at gmx.net (Robert Schuster) Date: Wed, 23 Jun 2010 09:35:41 +0200 Subject: IcedTea6 Now Supports b20 In-Reply-To: References: Message-ID: <4C21B94D.2090009@gmx.net> Hi, Am 22.06.2010 19:39, schrieb Andrew John Hughes: > It also includes the Zero cleanup I mentioned last week. > I now like to start planning for an IcedTea6 1.19 release. > > Does anyone have anything pending they'd still like to commit for 1.19? > Yes, me. There is the --with-cc-for-build patch and I will also send another one which makes IcedTea6 compatible with the cmake-built llvm 2.7 shared libraries (which is unfortunately different from building it with the autotools). Regards, Robert > I plan to add: > > 6961732 (Mario's font fix: > http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/thread.html) > the new Xrender code > (http://mail.openjdk.java.net/pipermail/2d-dev/2010-May/001276.html) > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 262 bytes Desc: OpenPGP digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100623/a6f53202/signature.asc From mark at klomp.org Wed Jun 23 01:33:02 2010 From: mark at klomp.org (Mark Wielaard) Date: Wed, 23 Jun 2010 10:33:02 +0200 Subject: VisualVM's New Home In-Reply-To: References: Message-ID: <1277281982.5161.11.camel@springer.wildebeest.org> On Tue, 2010-06-22 at 23:32 +0100, Andrew John Hughes wrote: > http://icedtea.classpath.org/people/andrew/visualvm now has the > independent build machinery for VisualVM. > > (Mark, can you please move this to icedtea.classpath.org/hg/visualvm; > seems you are still the only one with permission to write to /hg) Done. http://icedtea.classpath.org/hg/visualvm And yes, sorry. That is deliberate for now. Setting up a new repo that gets mail-notification and external backups still is a manual step. Will fix/script when we move to the new server (which I have been promising for weeks now...) Cheers, Mark From ahughes at redhat.com Wed Jun 23 05:40:53 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 23 Jun 2010 13:40:53 +0100 Subject: VisualVM's New Home In-Reply-To: <1277281982.5161.11.camel@springer.wildebeest.org> References: <1277281982.5161.11.camel@springer.wildebeest.org> Message-ID: On 23 June 2010 09:33, Mark Wielaard wrote: > On Tue, 2010-06-22 at 23:32 +0100, Andrew John Hughes wrote: >> http://icedtea.classpath.org/people/andrew/visualvm now has the >> independent build machinery for VisualVM. >> >> (Mark, can you please move this to icedtea.classpath.org/hg/visualvm; >> seems you are still the only one with permission to write to /hg) > > Done. http://icedtea.classpath.org/hg/visualvm > And yes, sorry. That is deliberate for now. Setting up a new repo that > gets mail-notification and external backups still is a manual step. Will > fix/script when we move to the new server (which I have been promising > for weeks now...) > > Cheers, > > Mark > > Thanks. And I forgot about the other stuff that needs doing, so I guess it's a bit more complicated than I assumed. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Wed Jun 23 06:55:46 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 23 Jun 2010 14:55:46 +0100 Subject: IcedTea6 Now Supports b20 In-Reply-To: <4C21B94D.2090009@gmx.net> References: <4C21B94D.2090009@gmx.net> Message-ID: On 23 June 2010 08:35, Robert Schuster wrote: > Hi, > > Am 22.06.2010 19:39, schrieb Andrew John Hughes: >> It also includes the Zero cleanup I mentioned last week. >> I now like to start planning for an IcedTea6 1.19 release. >> >> Does anyone have anything pending they'd still like to commit for 1.19? >> > Yes, me. There is the --with-cc-for-build patch and I will also send > another one which makes IcedTea6 compatible with the cmake-built llvm > 2.7 shared libraries (which is unfortunately different from building it > with the autotools). > --with-cc-for-build sound suspiciously like what is already supported by autoconf's host/build/target support. The LLVM stuff I'll leave to Gary, Doko and Xerxes to review. > Regards, > Robert > >> I plan to add: >> >> 6961732 (Mario's font fix: >> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/thread.html) >> the new Xrender code >> (http://mail.openjdk.java.net/pipermail/2d-dev/2010-May/001276.html) >> > > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Wed Jun 23 11:00:11 2010 From: omajid at redhat.com (Omair Majid) Date: Wed, 23 Jun 2010 14:00:11 -0400 Subject: [RFC] JNLP: jars with native libraries in incorrect locations In-Reply-To: References: <4C178331.6000802@redhat.com> <4C20FB89.3070305@redhat.com> <4C212642.5030808@redhat.com> Message-ID: <4C224BAB.9080906@redhat.com> On 06/22/2010 06:22 PM, Andrew John Hughes wrote: > On 22 June 2010 22:08, Omair Majid wrote: >> On 06/22/2010 04:47 PM, Andrew John Hughes wrote: >>> >>> On 22 June 2010 19:06, Omair Majid wrote: >>>> >>>> On 06/15/2010 09:42 AM, Omair Majid wrote: >>>>> >>>>> Hi, >>>>> >>>>> I recently ran into a problem with SweetHome3D [1] not working under >>>>> Netx. The jnlp file contains no 'nativelib' elements which initially led >>>>> me to believe that it contains no native code. However, one of the jars >>>>> it references [2] contains native code under /linux/x64/. Both of these >>>>> things (no nativelib element and placing .so's anywhere other than under >>>>> /) seem to go against the developer guide's guidelines. Of course, >>>>> without reading the JSR, I can not say if this is against the JNLP spec >>>>> or not. >>>>> >>>>> That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx >>>>> should work too. The attached patch modifies Netx so that it always >>>>> tries to look for .so's (placed anywhere) in jar files. If it finds >>>>> them, it activates them as if the .so's were in a nativelib jar. >>>>> >>>>> Any thoughts or comments? >>>>> >>>>> Cheers, >>>>> Omair >>>>> >>>>> >>>>> [1] http://www.sweethome3d.com/SweetHome3D.jnlp >>>>> [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar >>>> >>>> Anyone? >>>> >>> >>> Sorry, didn't see this until your ping. >>> >>> The code you have to find the file component of the path could be more >>> portably written as new File(e.getName()).getName(): >>> http://java.sun.com/j2se/1.5.0/docs/api/java/io/File.html#getName%28%29 >>> That also deals with the issue of the path ending in a '/', which >>> would currently result in an IndexOutOfBoundsException. >>> >> >> Ah, that sounds just like what I was looking for. Thanks. Still, this code >> only executes if the entry is not a directory, so the exception should never >> happen (at least on a unix-like system). But your way makes a lot more sense >> :) >> >>> Sadly I can't see a method for obtaining the dynamic library name >>> extension (System has mapLibraryName to do x -> x.so, but nothing to >>> check an existing path; maybe something to suggest upstream). >>> Checking for .so, .dll and .dylib should cover most cases. >>> >> >> Yup, I was hoping to find something in the JRE to check for a library name >> but couldn't. I guess I will manually add checks for .so, .dll and .dylib. >> Do you know of any reference where I could find a list of possible >> extensions? I ask because I have never seen .dylib before, and I would hate >> to miss other possible library extensions. >> > > There's http://en.wikipedia.org/wiki/Dynamic_libraries#Naming > > Most systems are .so (GNU/Linux, Solaris, *BSD). The exceptions are > MacOS X which renames them to .dylib (though they are essentially the > same thing) and also has bundles of them which we should also probably > allow for (.framework as mentioned in the link), along with Windows > which uses the .dll system as it always has to be different. > I added ".so", ".dylib", ".jnilib", ".framework" and ".dll". Apple's JNI documentation suggests they prefer people using jnilib for JNI libraries. >> More importantly, can I take this to mean that violating (what I think is) >> the spec is ok in this case? >> > > I'd say their proprietary implementation is the spec. for all intents > and purposes, and if it works with that so be it. > How about this version of the patch? Thanks, Omair -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-jnlp-bad-native-library-jars.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100623/1615a2f4/icedtea6-jnlp-bad-native-library-jars.patch From ahughes at redhat.com Wed Jun 23 14:54:03 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 23 Jun 2010 22:54:03 +0100 Subject: [RFC] JNLP: jars with native libraries in incorrect locations In-Reply-To: <4C224BAB.9080906@redhat.com> References: <4C178331.6000802@redhat.com> <4C20FB89.3070305@redhat.com> <4C212642.5030808@redhat.com> <4C224BAB.9080906@redhat.com> Message-ID: <20100623215403.GC6928@rivendell.middle-earth.co.uk> On 14:00 Wed 23 Jun , Omair Majid wrote: > On 06/22/2010 06:22 PM, Andrew John Hughes wrote: > > On 22 June 2010 22:08, Omair Majid wrote: > >> On 06/22/2010 04:47 PM, Andrew John Hughes wrote: > >>> > >>> On 22 June 2010 19:06, Omair Majid wrote: > >>>> > >>>> On 06/15/2010 09:42 AM, Omair Majid wrote: > >>>>> > >>>>> Hi, > >>>>> > >>>>> I recently ran into a problem with SweetHome3D [1] not working under > >>>>> Netx. The jnlp file contains no 'nativelib' elements which initially led > >>>>> me to believe that it contains no native code. However, one of the jars > >>>>> it references [2] contains native code under /linux/x64/. Both of these > >>>>> things (no nativelib element and placing .so's anywhere other than under > >>>>> /) seem to go against the developer guide's guidelines. Of course, > >>>>> without reading the JSR, I can not say if this is against the JNLP spec > >>>>> or not. > >>>>> > >>>>> That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx > >>>>> should work too. The attached patch modifies Netx so that it always > >>>>> tries to look for .so's (placed anywhere) in jar files. If it finds > >>>>> them, it activates them as if the .so's were in a nativelib jar. > >>>>> > >>>>> Any thoughts or comments? > >>>>> > >>>>> Cheers, > >>>>> Omair > >>>>> > >>>>> > >>>>> [1] http://www.sweethome3d.com/SweetHome3D.jnlp > >>>>> [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar > >>>> > >>>> Anyone? > >>>> > >>> > >>> Sorry, didn't see this until your ping. > >>> > >>> The code you have to find the file component of the path could be more > >>> portably written as new File(e.getName()).getName(): > >>> http://java.sun.com/j2se/1.5.0/docs/api/java/io/File.html#getName%28%29 > >>> That also deals with the issue of the path ending in a '/', which > >>> would currently result in an IndexOutOfBoundsException. > >>> > >> > >> Ah, that sounds just like what I was looking for. Thanks. Still, this code > >> only executes if the entry is not a directory, so the exception should never > >> happen (at least on a unix-like system). But your way makes a lot more sense > >> :) > >> > >>> Sadly I can't see a method for obtaining the dynamic library name > >>> extension (System has mapLibraryName to do x -> x.so, but nothing to > >>> check an existing path; maybe something to suggest upstream). > >>> Checking for .so, .dll and .dylib should cover most cases. > >>> > >> > >> Yup, I was hoping to find something in the JRE to check for a library name > >> but couldn't. I guess I will manually add checks for .so, .dll and .dylib. > >> Do you know of any reference where I could find a list of possible > >> extensions? I ask because I have never seen .dylib before, and I would hate > >> to miss other possible library extensions. > >> > > > > There's http://en.wikipedia.org/wiki/Dynamic_libraries#Naming > > > > Most systems are .so (GNU/Linux, Solaris, *BSD). The exceptions are > > MacOS X which renames them to .dylib (though they are essentially the > > same thing) and also has bundles of them which we should also probably > > allow for (.framework as mentioned in the link), along with Windows > > which uses the .dll system as it always has to be different. > > > > I added ".so", ".dylib", ".jnilib", ".framework" and ".dll". Apple's JNI > documentation suggests they prefer people using jnilib for JNI libraries. > > >> More importantly, can I take this to mean that violating (what I think is) > >> the spec is ok in this case? > >> > > > > I'd say their proprietary implementation is the spec. for all intents > > and purposes, and if it works with that so be it. > > > > How about this version of the patch? > Looks good. I like the 1.5 updates too; there's a lot of that needs fixing in NetX from what I've seen. I assume nativeCounter is an unused variable? > Thanks, > Omair > diff -r da2ba8396450 netx/net/sourceforge/jnlp/SecurityDesc.java > --- a/netx/net/sourceforge/jnlp/SecurityDesc.java Tue Jun 22 19:14:32 2010 +0100 > +++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Wed Jun 23 13:55:11 2010 -0400 > @@ -31,12 +31,9 @@ > */ > public class SecurityDesc { > > - // todo: make sure classloader's native code support checks > - // the security permissions > - > - // shouldn't need to verify that native code only runs in > - // trusted environment because the parser and/or classloader > - // should kick it. > + /* > + * We do not verify security here, the classloader deals with security > + */ > > /** All permissions. */ > public static final Object ALL_PERMISSIONS = "All"; > diff -r da2ba8396450 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jun 22 19:14:32 2010 +0100 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Jun 23 13:55:11 2010 -0400 > @@ -80,9 +80,6 @@ > /** map from JNLPFile url to shared classloader */ > private static Map urlToLoader = new HashMap(); // never garbage collected! > > - /** number of times a classloader with native code is created */ > - private static int nativeCounter = 0; > - > /** the directory for native code */ > private File nativeDir = null; // if set, some native code exists > > @@ -642,8 +639,8 @@ > ex.printStackTrace(); > } > > - if (jar.isNative()) > - activateNative(jar); > + // some programs place a native library in any jar > + activateNative(jar); > } > > return null; > @@ -654,9 +651,9 @@ > } > > /** > - * Enable the native code contained in a JAR by copying the > - * native files into the filesystem. Called in the security > - * context of the classloader. > + * Search for and enable any native code contained in a JAR by copying the > + * native files into the filesystem. Called in the security context of the > + * classloader. > */ > protected void activateNative(JARDesc jar) { > if (JNLPRuntime.isDebug()) > @@ -669,17 +666,33 @@ > if (nativeDir == null) > nativeDir = getNativeDir(); > > + String[] librarySuffixes = { ".so", ".dylib", ".jnilib", ".framework", ".dll" }; > + > try { > JarFile jarFile = new JarFile(localFile, false); > - Enumeration entries = jarFile.entries(); > + Enumeration entries = jarFile.entries(); > > while (entries.hasMoreElements()) { > - JarEntry e = (JarEntry) entries.nextElement(); > + JarEntry e = entries.nextElement(); > > - if (e.isDirectory() || e.getName().indexOf('/') != -1) > + if (e.isDirectory()) { > continue; > + } > > - File outFile = new File(nativeDir, e.getName()); > + String name = new File(e.getName()).getName(); > + boolean isLibrary = false; > + > + for (String suffix: librarySuffixes) { > + if (name.endsWith(suffix)) { > + isLibrary = true; > + break; > + } > + } > + if (!isLibrary) { > + continue; > + } > + > + File outFile = new File(nativeDir, name); > > CacheUtil.streamCopy(jarFile.getInputStream(e), > new FileOutputStream(outFile)); -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Wed Jun 23 15:07:02 2010 From: omajid at redhat.com (Omair Majid) Date: Wed, 23 Jun 2010 18:07:02 -0400 Subject: [RFC] JNLP: jars with native libraries in incorrect locations In-Reply-To: <20100623215403.GC6928@rivendell.middle-earth.co.uk> References: <4C178331.6000802@redhat.com> <4C20FB89.3070305@redhat.com> <4C212642.5030808@redhat.com> <4C224BAB.9080906@redhat.com> <20100623215403.GC6928@rivendell.middle-earth.co.uk> Message-ID: <4C228586.7010107@redhat.com> On 06/23/2010 05:54 PM, Andrew John Hughes wrote: > On 14:00 Wed 23 Jun , Omair Majid wrote: >> On 06/22/2010 06:22 PM, Andrew John Hughes wrote: >>> On 22 June 2010 22:08, Omair Majid wrote: >>>> On 06/22/2010 04:47 PM, Andrew John Hughes wrote: >>>>> >>>>> On 22 June 2010 19:06, Omair Majid wrote: >>>>>> >>>>>> On 06/15/2010 09:42 AM, Omair Majid wrote: >>>>>>> >>>>>>> Hi, >>>>>>> >>>>>>> I recently ran into a problem with SweetHome3D [1] not working under >>>>>>> Netx. The jnlp file contains no 'nativelib' elements which initially led >>>>>>> me to believe that it contains no native code. However, one of the jars >>>>>>> it references [2] contains native code under /linux/x64/. Both of these >>>>>>> things (no nativelib element and placing .so's anywhere other than under >>>>>>> /) seem to go against the developer guide's guidelines. Of course, >>>>>>> without reading the JSR, I can not say if this is against the JNLP spec >>>>>>> or not. >>>>>>> >>>>>>> That said, since the Sun/Oracle Webstart works with SweetHome3D, Netx >>>>>>> should work too. The attached patch modifies Netx so that it always >>>>>>> tries to look for .so's (placed anywhere) in jar files. If it finds >>>>>>> them, it activates them as if the .so's were in a nativelib jar. >>>>>>> >>>>>>> Any thoughts or comments? >>>>>>> >>>>>>> Cheers, >>>>>>> Omair >>>>>>> >>>>>>> >>>>>>> [1] http://www.sweethome3d.com/SweetHome3D.jnlp >>>>>>> [2] http://www.sweethome3d.com/lib/linux/x64/java3d.jar >>>>>> >>>>>> Anyone? >>>>>> >>>>> >>>>> Sorry, didn't see this until your ping. >>>>> >>>>> The code you have to find the file component of the path could be more >>>>> portably written as new File(e.getName()).getName(): >>>>> http://java.sun.com/j2se/1.5.0/docs/api/java/io/File.html#getName%28%29 >>>>> That also deals with the issue of the path ending in a '/', which >>>>> would currently result in an IndexOutOfBoundsException. >>>>> >>>> >>>> Ah, that sounds just like what I was looking for. Thanks. Still, this code >>>> only executes if the entry is not a directory, so the exception should never >>>> happen (at least on a unix-like system). But your way makes a lot more sense >>>> :) >>>> >>>>> Sadly I can't see a method for obtaining the dynamic library name >>>>> extension (System has mapLibraryName to do x -> x.so, but nothing to >>>>> check an existing path; maybe something to suggest upstream). >>>>> Checking for .so, .dll and .dylib should cover most cases. >>>>> >>>> >>>> Yup, I was hoping to find something in the JRE to check for a library name >>>> but couldn't. I guess I will manually add checks for .so, .dll and .dylib. >>>> Do you know of any reference where I could find a list of possible >>>> extensions? I ask because I have never seen .dylib before, and I would hate >>>> to miss other possible library extensions. >>>> >>> >>> There's http://en.wikipedia.org/wiki/Dynamic_libraries#Naming >>> >>> Most systems are .so (GNU/Linux, Solaris, *BSD). The exceptions are >>> MacOS X which renames them to .dylib (though they are essentially the >>> same thing) and also has bundles of them which we should also probably >>> allow for (.framework as mentioned in the link), along with Windows >>> which uses the .dll system as it always has to be different. >>> >> >> I added ".so", ".dylib", ".jnilib", ".framework" and ".dll". Apple's JNI >> documentation suggests they prefer people using jnilib for JNI libraries. >> >>>> More importantly, can I take this to mean that violating (what I think is) >>>> the spec is ok in this case? >>>> >>> >>> I'd say their proprietary implementation is the spec. for all intents >>> and purposes, and if it works with that so be it. >>> >> >> How about this version of the patch? >> > > Looks good. I like the 1.5 updates too; there's a lot of that needs fixing in NetX > from what I've seen. I assume nativeCounter is an unused variable? > Yup, there are a ton of problems. I am hoping to go through and fix as much as I can. As far as nativeCounter is concerned, I cant find a record of it ever being used. Cheers, Omair From doko at icedtea.classpath.org Wed Jun 23 15:57:23 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Wed, 23 Jun 2010 22:57:23 +0000 Subject: /hg/icedtea6: Update CACAO to 1.1.0pre (mostly backports from ic... Message-ID: changeset a4bc545c483a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4bc545c483a author: doko at ubuntu.com date: Thu Jun 24 00:56:40 2010 +0200 Update CACAO to 1.1.0pre (mostly backports from icedtea7). Builds, not yet tested otherwise. 2010-06-24 Andrew John Hughes Matthias Klose * patches/cacao/no-strict-aliasing.patch: Remove, applied upstream. * patches/icedtea-cacao-no-mmap-first-page.patch: Likewise. * patches/icedtea-cacao.patch: Remove, replaced by ... * patches/cacao/launcher.patch: New. * patches/cacao/memory.patch: Increase the memory used in the langtools build when using CACAO. * patches/cacao/arm-arch-defines.patch: Update. * patches/cacao/6714758.patch: Add JVM_FindClassFromBootLoader introduced by 6714758 and modified in 6864003. http://server.complang.tuwien.ac.at/cgi- bin/bugzilla/show_bug.cgi?id=137 * patches/icedtea-cacao-ignore-tests.patch: Remove, replaced by ... * patches/cacao/ignore-tests.patch: New. * patches/cacao/jsig.patch: Update. * patches/cacao/package-version.diff: Drop 'preX' from the cacao package version. * patches/cacao/version.patch: Update * Makefile.am (ICEDTEA_PATCHES): Add/remove patches. Use Mercurial snapshot of CACAO 1.1.0pre. diffstat: 15 files changed, 226 insertions(+), 162 deletions(-) ChangeLog | 35 ++++++++++++++++ Makefile.am | 24 ++++++----- patches/cacao/6714758.patch | 40 +++++++++++++++++++ patches/cacao/arm-arch-defines.patch | 14 +++--- patches/cacao/ignore-tests.patch | 11 +++++ patches/cacao/jsig.patch | 18 ++++++++ patches/cacao/launcher.patch | 50 ++++++++++++++++++++++++ patches/cacao/memory.patch | 18 ++++++++ patches/cacao/nio2.patch | 41 ------------------- patches/cacao/no-strict-aliasing.patch | 22 ---------- patches/cacao/package-version.diff | 11 +++++ patches/cacao/version.patch | 21 ++++++++++ patches/icedtea-cacao-ignore-tests.patch | 10 ---- patches/icedtea-cacao-no-mmap-first-page.patch | 23 ----------- patches/icedtea-cacao.patch | 50 ------------------------ diffs (489 lines): diff -r da2ba8396450 -r a4bc545c483a ChangeLog --- a/ChangeLog Tue Jun 22 19:14:32 2010 +0100 +++ b/ChangeLog Thu Jun 24 00:56:40 2010 +0200 @@ -1,3 +1,38 @@ 2010-06-22 Andrew John Hughes + Matthias Klose + + * patches/cacao/no-strict-aliasing.patch: Remove, applied upstream. + * patches/icedtea-cacao-no-mmap-first-page.patch: Likewise. + * patches/icedtea-cacao.patch: Remove, replaced by ... + * patches/cacao/launcher.patch: New. + * patches/cacao/memory.patch: Increase the memory used in the langtools + build when using CACAO. + * patches/cacao/arm-arch-defines.patch: Update. + * patches/cacao/6714758.patch: Add JVM_FindClassFromBootLoader + introduced by 6714758 and modified in 6864003. + http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=137 + * patches/icedtea-cacao-ignore-tests.patch: Remove, replaced by ... + * patches/cacao/ignore-tests.patch: New. + * patches/cacao/jsig.patch: Update. + * patches/cacao/package-version.diff: Drop 'preX' from the cacao + package version. + * patches/cacao/version.patch: Update + * Makefile.am (ICEDTEA_PATCHES): Add/remove patches. + Use Mercurial snapshot of CACAO 1.1.0pre. + +2010-05-11 Andrew John Hughes + + Fix issues with the CACAO build so it at + least builds again (though it still fails to + bootstrap). + * Makefile.am: Add new patches. + * patches/cacao/6714758.patch: + Add JVM_FindClassFromBootLoader introduced by + 6714758 and modified in 6864003. + http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=137 + * patches/cacao/jsig.patch: + Place fake libjsig.so in correct location for HotSpot 17+. + 2010-06-22 Andrew John Hughes * Makefile.am: Add new patch. diff -r da2ba8396450 -r a4bc545c483a Makefile.am --- a/Makefile.am Tue Jun 22 19:14:32 2010 +0100 +++ b/Makefile.am Thu Jun 24 00:56:40 2010 +0200 @@ -5,10 +5,10 @@ OPENJDK_VERSION = b20 OPENJDK_VERSION = b20 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = 0.99.4 -CACAO_MD5SUM = c5e6525c5212ddbb6026e4a7cde37ca6 -CACAO_BASE_URL = http://www.complang.tuwien.ac.at -CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/ +CACAO_VERSION = 8948a434c10d +CACAO_SHA256SUM = e472e11621c3e1f00a5f49c990e68d18db09c6c12aea100950567b1577931412 +CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive/tip.tar.bz2 +CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 NETBEANS_PROFILER_MD5SUM = 40dd3183b345737ca22162d164c2d5a2 NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/149581/ @@ -180,8 +180,8 @@ endif ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(DEBUG_BUILD_OUTPUT_DIR)" if WITH_CACAO - ICEDTEA_BUILD_TARGET=j2se_only - ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only + ICEDTEA_BUILD_TARGET=jdk_only + ICEDTEA_DEBUG_BUILD_TARGET += jdk_fastdebug_only else ICEDTEA_DEBUG_BUILD_TARGET += debug_build endif @@ -327,10 +327,13 @@ endif if BUILD_CACAO ICEDTEA_PATCHES += \ - patches/icedtea-cacao.patch \ - patches/icedtea-cacao-no-mmap-first-page.patch \ - patches/cacao/no-strict-aliasing.patch \ - patches/cacao/arm-arch-defines.patch + patches/cacao/launcher.patch \ + patches/cacao/version.patch \ + patches/cacao/arm-arch-defines.patch \ + patches/cacao/jsig.patch \ + patches/cacao/6714758.patch \ + patches/cacao/memory.patch \ + patches/cacao/package-version.diff if ENABLE_NIO2 ICEDTEA_PATCHES += patches/cacao/nio2.patch endif @@ -1779,6 +1782,7 @@ if BUILD_CACAO if BUILD_CACAO if !USE_SYSTEM_CACAO cd cacao/cacao && \ + ./autogen.sh && \ $(ARCH_PREFIX) ./configure \ --host=$(host_alias) \ --build=$(build_alias) \ diff -r da2ba8396450 -r a4bc545c483a patches/cacao/6714758.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/6714758.patch Thu Jun 24 00:56:40 2010 +0200 @@ -0,0 +1,40 @@ +diff -Nru cacao.orig/cacao/contrib/mapfile-vers-product cacao/cacao/contrib/mapfile-vers-product +--- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 +@@ -86,6 +86,7 @@ + JVM_EnableCompiler; + JVM_Exit; + JVM_FillInStackTrace; ++ JVM_FindClassFromBootLoader; + JVM_FindClassFromClass; + JVM_FindClassFromClassLoader; + JVM_FindLibraryEntry; +diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp cacao/cacao/src/native/vm/openjdk/jvm.cpp +--- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 +@@ -668,6 +668,9 @@ + + assert(throwError == false); + ++ if (name == NULL) ++ return NULL; ++ + u = utf_new_char(name); + cl = loader_hashtable_classloader_add((java_handle_t *) loader); + +@@ -685,6 +688,15 @@ + } + + ++/* JVM_FindClassFromBootLoader */ ++ ++jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char* name) ++{ ++ TRACEJVMCALLS(("JVM_FindClassFromBootLoader(name=%s)", name)); ++ return JVM_FindClassFromClassLoader(env, name, JNI_FALSE, ++ (jobject)NULL, false); ++} ++ + /* JVM_FindClassFromClass */ + + jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from) diff -r da2ba8396450 -r a4bc545c483a patches/cacao/arm-arch-defines.patch --- a/patches/cacao/arm-arch-defines.patch Tue Jun 22 19:14:32 2010 +0100 +++ b/patches/cacao/arm-arch-defines.patch Thu Jun 24 00:56:40 2010 +0200 @@ -1,5 +1,6 @@ ---- cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h~ 2008-08-04 18:51:12.000000000 +0200 -+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2009-12-15 16:28:12.000000000 +0100 +diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h +--- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100 @@ -33,7 +33,13 @@ /* NEC LE-IT: gcc has no way to easily check the arm architecture @@ -15,11 +16,12 @@ AO_INLINE void AO_nop_full() { ---- cacao/cacao/src/vm/jit/arm/md-atomic.hpp~ 2008-08-04 16:51:28.000000000 +0000 -+++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp 2009-12-16 06:40:37.000000000 +0000 -@@ -44,26 +44,7 @@ +diff -Nru cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp cacao/cacao/src/vm/jit/arm/md-atomic.hpp +--- cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp 2010-06-21 18:35:53.000000000 +0100 +@@ -45,26 +45,7 @@ */ - inline static uint32_t Atomic_compare_and_swap_32(volatile uint32_t *p, uint32_t oldval, uint32_t newval) + inline uint32_t compare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval) { - uint32_t result; - uint32_t temp; diff -r da2ba8396450 -r a4bc545c483a patches/cacao/ignore-tests.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/ignore-tests.patch Thu Jun 24 00:56:40 2010 +0200 @@ -0,0 +1,11 @@ +diff -Nru openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java +--- openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2010-05-10 15:04:14.000000000 +0100 ++++ openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2010-05-10 23:42:41.000000000 +0100 +@@ -37,6 +37,7 @@ + * @compile ProducerConsumerLoops.java + * @run main/timeout=3600 ProducerConsumerLoops + * @summary multiple producers and consumers using blocking queues ++ * @ignore cacao test hog, ignore for the sake of buildds + */ + + import java.util.concurrent.*; diff -r da2ba8396450 -r a4bc545c483a patches/cacao/jsig.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/jsig.patch Thu Jun 24 00:56:40 2010 +0200 @@ -0,0 +1,18 @@ +diff -Nru cacao.orig/Makefile.am cacao/Makefile.am +--- cacao.orig/cacao/src/cacao/Makefile.am 2008-08-04 17:51:28.000000000 +0100 ++++ cacao/cacao/src/cacao/Makefile.am 2010-05-11 10:29:35.000000000 +0100 +@@ -96,12 +96,12 @@ + $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server + $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server + $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt +- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so ++ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so + + uninstall-local: + rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so + rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt +- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so ++ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so + endif + + diff -r da2ba8396450 -r a4bc545c483a patches/cacao/launcher.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/launcher.patch Thu Jun 24 00:56:40 2010 +0200 @@ -0,0 +1,50 @@ +--- openjdk/jdk/make/docs/Makefile.orig 2010-06-21 21:15:08.000000000 +0000 ++++ openjdk/jdk/make/docs/Makefile 2010-06-23 18:35:55.529822335 +0000 +@@ -70,7 +70,7 @@ + ifeq ($(ARCH_DATA_MODEL),64) + MAX_VM_MEMORY = 1024 + else +- MAX_VM_MEMORY = 512 ++ MAX_VM_MEMORY = 768 + endif + + # List of all possible directories for javadoc to look for sources +--- openjdk/jdk/src/share/bin/java.c.orig 2010-06-23 18:32:51.889824337 +0000 ++++ openjdk/jdk/src/share/bin/java.c 2010-06-23 18:35:55.529822335 +0000 +@@ -199,6 +199,8 @@ + InvocationFunctions ifn; + }; + ++#define JNI_VERSION_CACAO 0xcaca0000 ++ + /* + * Entry point. + */ +@@ -387,6 +389,8 @@ + + { /* Create a new thread to create JVM and invoke main method */ + struct JavaMainArgs args; ++ struct JDK1_1InitArgs cacao_args; ++ int jvm_init_rv; + + args.argc = argc; + args.argv = argv; +@@ -394,7 +398,17 @@ + args.classname = classname; + args.ifn = ifn; + +- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); ++ memset((void*)&cacao_args, 0, sizeof(cacao_args)); ++ cacao_args.version = JNI_VERSION_CACAO; ++ ++ jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args); ++ if (_launcher_debug) ++ printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); ++ ++ if (jvm_init_rv == 0) ++ return JavaMain((void*)&args); ++ else ++ return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); + } + } + diff -r da2ba8396450 -r a4bc545c483a patches/cacao/memory.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/memory.patch Thu Jun 24 00:56:40 2010 +0200 @@ -0,0 +1,18 @@ +--- openjdk/langtools/make/build.xml~ 2010-06-21 23:16:19.000000000 +0200 ++++ openjdk/langtools/make/build.xml 2010-06-23 20:51:31.649822343 +0200 +@@ -524,6 +524,7 @@ + source="@{javac.source}" + target="@{javac.target}"> + ++ + + + +@@ -541,6 +542,7 @@ + debuglevel="${javac.debuglevel}"> + + ++ + + + diff -r da2ba8396450 -r a4bc545c483a patches/cacao/nio2.patch --- a/patches/cacao/nio2.patch Tue Jun 22 19:14:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ ---- cacao/cacao/src/native/vm/sun_misc_Unsafe.c.orig 2010-01-11 16:20:51.000000000 +0000 -+++ cacao/cacao/src/native/vm/sun_misc_Unsafe.c 2010-01-11 16:22:15.000000000 +0000 -@@ -107,9 +107,10 @@ - #if 0 - /* OpenJDK 7 */ - { "setMemory", "(Ljava/lang/Object;JJB)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_setMemory }, -+#endif - { "copyMemory", "(Ljava/lang/Object;JLjava/lang/Object;JJ)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_copyMemory }, --#else - { "setMemory", "(JJB)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_setMemory }, -+#if 0 - { "copyMemory", "(JJJ)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_copyMemory }, - #endif - { "freeMemory", "(J)V", (void *) (intptr_t) &Java_sun_misc_Unsafe_freeMemory }, -@@ -786,7 +787,7 @@ - - system_memset(p, value, length); - } -- -+#endif - - /* - * Class: sun/misc/Unsafe -@@ -816,7 +817,7 @@ - - system_memcpy(dest, src, length); - } --#else -+ - /* - * Class: sun/misc/Unsafe - * Method: setMemory -@@ -841,7 +842,7 @@ - system_memset(p, value, length); - } - -- -+#if 0 - /* - * Class: sun/misc/Unsafe - * Method: copyMemory diff -r da2ba8396450 -r a4bc545c483a patches/cacao/no-strict-aliasing.patch --- a/patches/cacao/no-strict-aliasing.patch Tue Jun 22 19:14:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -diff -Nru cacao/cacao.orig/configure cacao/cacao/configure ---- cacao/cacao.orig/configure 2009-03-16 11:44:25.000000000 +0000 -+++ cacao/cacao/configure 2010-01-09 00:10:59.000000000 +0000 -@@ -2829,6 +2829,7 @@ - else - OPT_CFLAGS=$CFLAGS - fi -+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing" - - case "$host_cpu" in - alpha | alphaev56 | alphapca56 ) -diff -Nru cacao/cacao.orig/configure.ac cacao/cacao/configure.ac ---- cacao/cacao.orig/configure.ac 2009-03-16 11:42:56.000000000 +0000 -+++ cacao/cacao/configure.ac 2010-01-09 00:11:06.000000000 +0000 -@@ -41,6 +41,7 @@ - else - OPT_CFLAGS=$CFLAGS - fi -+OPT_CFLAGS="$OPT_CFLAGS -fno-strict-aliasing" - - dnl system type - case "$host_cpu" in diff -r da2ba8396450 -r a4bc545c483a patches/cacao/package-version.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/package-version.diff Thu Jun 24 00:56:40 2010 +0200 @@ -0,0 +1,11 @@ +--- cacao/cacao/m4/version.m4~ 2010-06-23 17:18:58.000000000 +0200 ++++ cacao/cacao/m4/version.m4 2010-06-23 21:00:36.739828757 +0200 +@@ -24,7 +24,7 @@ + dnl define detailed version numbers + + AC_DEFUN([AC_VERSION_DETAIL],[ +-version="$PACKAGE_VERSION" ++version=$(echo "$PACKAGE_VERSION" | sed 's/pre.*//') + if test x`echo "$version" | $SED -e 's/[[0-9a-z+]]*//g'` = "x.."; + then + major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` diff -r da2ba8396450 -r a4bc545c483a patches/cacao/version.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/version.patch Thu Jun 24 00:56:40 2010 +0200 @@ -0,0 +1,21 @@ +diff -Nru cacao.orig2/cacao/src/vm/global.h cacao2/cacao/src/vm/global.h +--- cacao.orig/cacao/src/vm/global.h 2009-08-05 01:12:02.000000000 +0100 ++++ cacao/cacao/src/vm/global.h 2009-08-05 01:51:01.000000000 +0100 +@@ -132,14 +132,14 @@ + + /* some Java related defines **************************************************/ + +-#define JAVA_VERSION "1.5.0" /* this version is supported by CACAO */ +-#define CLASS_VERSION "50.0" ++#define JAVA_VERSION "1.6.0" /* this version is supported by CACAO */ ++#define CLASS_VERSION "51.0" + + + /* Java class file constants **************************************************/ + + #define MAGIC 0xCAFEBABE +-#define MAJOR_VERSION 50 ++#define MAJOR_VERSION 51 + #define MINOR_VERSION 0 + + diff -r da2ba8396450 -r a4bc545c483a patches/icedtea-cacao-ignore-tests.patch --- a/patches/icedtea-cacao-ignore-tests.patch Tue Jun 22 19:14:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ ---- openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java~ 2008-08-28 10:20:49.000000000 +0200 -+++ openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2008-10-19 17:02:41.000000000 +0200 -@@ -37,6 +37,7 @@ - * @compile -source 1.5 ProducerConsumerLoops.java - * @run main/timeout=3600 ProducerConsumerLoops - * @summary multiple producers and consumers using blocking queues -+ * @ignore cacao test hog, ignore for the sake of buildds - */ - - import java.util.concurrent.*; diff -r da2ba8396450 -r a4bc545c483a patches/icedtea-cacao-no-mmap-first-page.patch --- a/patches/icedtea-cacao-no-mmap-first-page.patch Tue Jun 22 19:14:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ ---- cacao/cacao/src/vm/jit/trap.c.orig 2008-07-07 13:36:19.000000000 +0200 -+++ cacao/cacao/src/vm/jit/trap.c 2008-07-23 10:45:30.480113152 +0200 -@@ -59,20 +59,6 @@ - */ - void trap_init(void) - { --#if !(defined(__ARM__) && defined(__LINUX__)) -- /* On arm-linux the first memory page can't be mmap'ed, as it -- contains the exception vectors. */ -- -- int pagesize; -- -- /* mmap a memory page at address 0x0, so our hardware-exceptions -- work. */ -- -- pagesize = system_getpagesize(); -- -- (void) system_mmap_anonymous(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED); --#endif -- - TRACESUBSYSTEMINITIALIZATION("trap_init"); - - #if !defined(TRAP_INSTRUCTION_IS_LOAD) diff -r da2ba8396450 -r a4bc545c483a patches/icedtea-cacao.patch --- a/patches/icedtea-cacao.patch Tue Jun 22 19:14:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ ---- openjdk/jdk/src/share/bin/java.c.orig 2009-03-02 23:21:31.000000000 +0000 -+++ openjdk/jdk/src/share/bin/java.c 2009-03-02 23:23:53.000000000 +0000 -@@ -199,6 +199,8 @@ - InvocationFunctions ifn; - }; - -+#define JNI_VERSION_CACAO 0xcaca0000 -+ - /* - * Entry point. - */ -@@ -360,6 +389,8 @@ - - { /* Create a new thread to create JVM and invoke main method */ - struct JavaMainArgs args; -+ struct JDK1_1InitArgs cacao_args; -+ int jvm_init_rv; - - args.argc = argc; - args.argv = argv; -@@ -367,7 +398,17 @@ - args.classname = classname; - args.ifn = ifn; - -- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); -+ memset((void*)&cacao_args, 0, sizeof(cacao_args)); -+ cacao_args.version = JNI_VERSION_CACAO; -+ -+ jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args); -+ if (_launcher_debug) -+ printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no"); -+ -+ if (jvm_init_rv == 0) -+ return JavaMain((void*)&args); -+ else -+ return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); - } - } - ---- openjdk/jdk/make/docs/Makefile~ 2008-05-30 09:50:36.000000000 +0200 -+++ openjdk/jdk/make/docs/Makefile 2008-07-02 14:26:54.306671792 +0200 -@@ -58,7 +58,7 @@ - ifeq ($(ARCH_DATA_MODEL),64) - MAX_VM_MEMORY = 1024 - else -- MAX_VM_MEMORY = 512 -+ MAX_VM_MEMORY = 768 - endif - - # From thebohemian at gmx.net Thu Jun 24 01:15:48 2010 From: thebohemian at gmx.net (Robert Schuster) Date: Thu, 24 Jun 2010 10:15:48 +0200 Subject: IcedTea6 Now Supports b20 In-Reply-To: References: <4C21B94D.2090009@gmx.net> Message-ID: <4C231434.40908@gmx.net> Am 23.06.2010 15:55, schrieb Andrew John Hughes: > On 23 June 2010 08:35, Robert Schuster wrote: >> Hi, >> >> Am 22.06.2010 19:39, schrieb Andrew John Hughes: >>> It also includes the Zero cleanup I mentioned last week. >>> I now like to start planning for an IcedTea6 1.19 release. >>> >>> Does anyone have anything pending they'd still like to commit for 1.19? >>> >> Yes, me. There is the --with-cc-for-build patch and I will also send >> another one which makes IcedTea6 compatible with the cmake-built llvm >> 2.7 shared libraries (which is unfortunately different from building it >> with the autotools). >> > > --with-cc-for-build sound suspiciously like what is already supported > by autoconf's > host/build/target support. Hey, lets discuss the details in the right thread. I provided a link to the autotools documentation. Maybe I am misreading things. Regards Robert > The LLVM stuff I'll leave to Gary, Doko and Xerxes to review. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 262 bytes Desc: OpenPGP digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100624/fc002bc4/signature.asc From xerxes at zafena.se Thu Jun 24 01:51:19 2010 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Thu, 24 Jun 2010 10:51:19 +0200 Subject: The big Zero deletion In-Reply-To: References: <20100617173919.GE4284@redhat.com> Message-ID: <4C231C87.7050405@zafena.se> On 2010-06-17 20:23, Andrew John Hughes wrote: > On 17 June 2010 19:08, Andrew John Hughes wrote: > >> On 17 June 2010 18:39, Gary Benson wrote: >> >>> Andrew John Hughes wrote: >>> >>>> There also seem to be a few minor differences that haven't been >>>> upstreamed. >>>> >>> There shouldn't be :( >>> >>>> ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp: >>>> >>>> Has the following differences left. >>>> >>>> (- is IcedTea6, + is OpenJDK6) >>>> >>>> @@ -35,7 +35,6 @@ >>>> define_pd_global(bool, UncommonNullCast, true); >>>> >>>> define_pd_global(intx, CodeEntryAlignment, 32); >>>> -define_pd_global(intx, OptoLoopAlignment, 16); >>>> define_pd_global(intx, InlineFrequencyCount, 100); >>>> define_pd_global(intx, PreInflateSpin, 10); >>>> >>>> @@ -45,5 +44,3 @@ >>>> >>>> define_pd_global(bool, RewriteBytecodes, true); >>>> define_pd_global(bool, RewriteFrequentPairs, true); >>>> - >>>> -define_pd_global(intx, InlineSmallCode, 1000); >>>> >>>> plus old Sun copyright. >>>> >>> We should be able to ignore this one and just use whatever comes from >>> upstream. If we're changing things like this to make it build then >>> presumably that means upstream doesn't build? >>> >>> >> Upstream builds. I wouldn't have pushed it otherwise. But upstream >> doesn't have Shark. Are these additions not needed for Shark? >> >> > Ok the IcedTea6 local changes actually break the build: > > /mnt/builder/icedtea6-hg/openjdk/hotspot/src/share/vm/runtime/globals.hpp:50:1: > error: redefinition of 'const intx pd_InlineSmallCode' > /mnt/builder/icedtea6-hg/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp:49:1: > error: 'const intx pd_InlineSmallCode' previously defined here > > I presume they were added for hs14, when we're now on hs17. I'm > dropping these changes. > > Hi Now after the bump to openjdk-b20 in icedtea6 and bump to hs17-b16 im hitting this new shark build error that seems related to the above pd_InlineSmallCode to be or not to be discussion: ../icedtea6/configure --enable-shark --with-openjdk -disable-docs make ... Compiling /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp rm -f globals.o g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32 -DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/asm -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/c1 -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/ci -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/classfile -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/code -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/compiler -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/g1 -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/parNew -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/shared -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_interface -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/interpreter -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/memory -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/oops -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/prims -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/services -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/shark -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/utilities -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/cpu/zero/vm -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/os/linux/vm -I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/os_cpu/linux_zero/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"17.0-b16\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"xerxes\"" -DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.6.0_20-b20\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6 1.9pre+ra4bc545c483a\"" -DDISTRIBUTION_ID="\"Built on Ubuntu 10.04 LTS (Thu Jun 24 10:15:19 CEST 2010)\"" -DSHARK -I/usr/local/include -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DSHARK_LLVM_VERSION=27 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -m32 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith -Wsign-compare -c -o globals.o /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp:34: error: 'pd_InlineSmallCode' was not declared in this scope make[7]: *** [globals.o] Error 1 Any idea? Cheers Xerxes From doko at ubuntu.com Thu Jun 24 03:33:18 2010 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 24 Jun 2010 12:33:18 +0200 Subject: The big Zero deletion In-Reply-To: <4C231C87.7050405@zafena.se> References: <20100617173919.GE4284@redhat.com> <4C231C87.7050405@zafena.se> Message-ID: <4C23346E.8000906@ubuntu.com> On 24.06.2010 10:51, Xerxes R?nby wrote: > /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp > > /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp:34: > error: 'pd_InlineSmallCode' was not declared in this scope > make[7]: *** [globals.o] Error 1 just a me too, didn't find out the reason yet. From thierry.reding at avionic-design.de Thu Jun 24 05:56:50 2010 From: thierry.reding at avionic-design.de (Thierry Reding) Date: Thu, 24 Jun 2010 14:56:50 +0200 Subject: [PATCH] Collapse XUL version using awk. Message-ID: <20100624125650.GA19457@avionic-design.de> The patch replaces the C program used to collapse the XUL version string with an awk one-liner. This is particularly useful for cross-compilation where the C program cannot be executed. -------------- next part -------------- A non-text attachment was scrubbed... Name: xul-collapse-awk.patch Type: text/x-diff Size: 1420 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100624/c2fc59c9/xul-collapse-awk.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100624/c2fc59c9/attachment.bin From omajid at icedtea.classpath.org Thu Jun 24 06:47:26 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 24 Jun 2010 13:47:26 +0000 Subject: /hg/icedtea6: netx: handle JNLP files which use native libraries... Message-ID: changeset c09ec1d01ca3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c09ec1d01ca3 author: Omair Majid date: Thu Jun 24 09:40:43 2010 -0400 netx: handle JNLP files which use native libraries but do not indiate it 2010-06-24 Omair Majid * netx/net/sourceforge/jnlp/SecurityDesc.java: Fix comments. * netx/net/sourceforge/jnlp/JNLPClassLoader.java (activateJars): Always call activateNative. (activateNative): Search for native code anywhere in the jar. diffstat: 3 files changed, 35 insertions(+), 18 deletions(-) ChangeLog | 7 +++ netx/net/sourceforge/jnlp/SecurityDesc.java | 9 +-- netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 37 ++++++++++------ diffs (108 lines): diff -r a4bc545c483a -r c09ec1d01ca3 ChangeLog --- a/ChangeLog Thu Jun 24 00:56:40 2010 +0200 +++ b/ChangeLog Thu Jun 24 09:40:43 2010 -0400 @@ -1,3 +1,10 @@ 2010-06-24 Andrew John Hughes + + * netx/net/sourceforge/jnlp/SecurityDesc.java: Fix comments. + * netx/net/sourceforge/jnlp/JNLPClassLoader.java + (activateJars): Always call activateNative. + (activateNative): Search for native code anywhere in the jar. + 2010-06-24 Andrew John Hughes Matthias Klose diff -r a4bc545c483a -r c09ec1d01ca3 netx/net/sourceforge/jnlp/SecurityDesc.java --- a/netx/net/sourceforge/jnlp/SecurityDesc.java Thu Jun 24 00:56:40 2010 +0200 +++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Thu Jun 24 09:40:43 2010 -0400 @@ -31,12 +31,9 @@ import java.awt.AWTPermission; */ public class SecurityDesc { - // todo: make sure classloader's native code support checks - // the security permissions - - // shouldn't need to verify that native code only runs in - // trusted environment because the parser and/or classloader - // should kick it. + /* + * We do not verify security here, the classloader deals with security + */ /** All permissions. */ public static final Object ALL_PERMISSIONS = "All"; diff -r a4bc545c483a -r c09ec1d01ca3 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jun 24 00:56:40 2010 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jun 24 09:40:43 2010 -0400 @@ -79,9 +79,6 @@ public class JNLPClassLoader extends URL /** map from JNLPFile url to shared classloader */ private static Map urlToLoader = new HashMap(); // never garbage collected! - - /** number of times a classloader with native code is created */ - private static int nativeCounter = 0; /** the directory for native code */ private File nativeDir = null; // if set, some native code exists @@ -642,8 +639,8 @@ public class JNLPClassLoader extends URL ex.printStackTrace(); } - if (jar.isNative()) - activateNative(jar); + // some programs place a native library in any jar + activateNative(jar); } return null; @@ -654,9 +651,9 @@ public class JNLPClassLoader extends URL } /** - * Enable the native code contained in a JAR by copying the - * native files into the filesystem. Called in the security - * context of the classloader. + * Search for and enable any native code contained in a JAR by copying the + * native files into the filesystem. Called in the security context of the + * classloader. */ protected void activateNative(JARDesc jar) { if (JNLPRuntime.isDebug()) @@ -669,17 +666,33 @@ public class JNLPClassLoader extends URL if (nativeDir == null) nativeDir = getNativeDir(); + String[] librarySuffixes = { ".so", ".dylib", ".jnilib", ".framework", ".dll" }; + try { JarFile jarFile = new JarFile(localFile, false); - Enumeration entries = jarFile.entries(); + Enumeration entries = jarFile.entries(); while (entries.hasMoreElements()) { - JarEntry e = (JarEntry) entries.nextElement(); + JarEntry e = entries.nextElement(); - if (e.isDirectory() || e.getName().indexOf('/') != -1) + if (e.isDirectory()) { continue; + } - File outFile = new File(nativeDir, e.getName()); + String name = new File(e.getName()).getName(); + boolean isLibrary = false; + + for (String suffix: librarySuffixes) { + if (name.endsWith(suffix)) { + isLibrary = true; + break; + } + } + if (!isLibrary) { + continue; + } + + File outFile = new File(nativeDir, name); CacheUtil.streamCopy(jarFile.getInputStream(e), new FileOutputStream(outFile)); From doko at icedtea.classpath.org Thu Jun 24 07:02:58 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Thu, 24 Jun 2010 14:02:58 +0000 Subject: /hg/icedtea6: Fix build --with-addition-vms=cacao Message-ID: changeset 5ecaa9185c34 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5ecaa9185c34 author: doko at ubuntu.com date: Thu Jun 24 16:02:09 2010 +0200 Fix build --with-addition-vms=cacao 2010-06-24 Matthias Klose * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao- debug.stamp): Update libjsig.so installation location. diffstat: 2 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 5 +++++ Makefile.am | 4 ++-- diffs (33 lines): diff -r c09ec1d01ca3 -r 5ecaa9185c34 ChangeLog --- a/ChangeLog Thu Jun 24 09:40:43 2010 -0400 +++ b/ChangeLog Thu Jun 24 16:02:09 2010 +0200 @@ -1,3 +1,8 @@ 2010-06-24 Omair Majid + + * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp): + Update libjsig.so installation location. + 2010-06-24 Omair Majid * netx/net/sourceforge/jnlp/SecurityDesc.java: Fix comments. diff -r c09ec1d01ca3 -r 5ecaa9185c34 Makefile.am --- a/Makefile.am Thu Jun 24 09:40:43 2010 -0400 +++ b/Makefile.am Thu Jun 24 16:02:09 2010 +0200 @@ -1810,7 +1810,7 @@ if ADD_CACAO_BUILD mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao install -m 644 cacao/install/lib/libjvm.so \ $(BUILD_JRE_ARCH_DIR)/cacao/ - install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \ $(BUILD_JRE_ARCH_DIR)/cacao/ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ $(BUILD_JRE_ARCH_DIR)/cacao/ @@ -1827,7 +1827,7 @@ if ADD_CACAO_BUILD mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao install -m 644 cacao/install/lib/libjvm.so \ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ - install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ From doko at icedtea.classpath.org Thu Jun 24 07:21:22 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Thu, 24 Jun 2010 14:21:22 +0000 Subject: /hg/icedtea: Fix build --with-addition-vms=cacao, update patches... Message-ID: changeset 64285e351dc5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=64285e351dc5 author: doko at ubuntu.com date: Thu Jun 24 16:20:37 2010 +0200 Fix build --with-addition-vms=cacao, update patches for cacao prerelease builds 2010-06-24 Matthias Klose * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao- debug.stamp): Update libjsig.so installation location. * patches/cacao/package-version.diff: Drop 'preX' from the cacao package version. * patches/cacao/arm-arch-defines.patch: Remove cacao version fromi patched files. * patches/cacao/package-version.patch: Likewise. diffstat: 5 files changed, 37 insertions(+), 15 deletions(-) ChangeLog | 10 ++++++++++ Makefile.am | 7 ++++--- patches/cacao/6714758.patch | 12 ++++++------ patches/cacao/arm-arch-defines.patch | 12 ++++++------ patches/cacao/package-version.patch | 11 +++++++++++ diffs (115 lines): diff -r 03c860266712 -r 64285e351dc5 ChangeLog --- a/ChangeLog Wed Jun 23 00:15:52 2010 +0100 +++ b/ChangeLog Thu Jun 24 16:20:37 2010 +0200 @@ -1,3 +1,13 @@ 2010-06-22 Andrew John Hughes + + * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp): + Update libjsig.so installation location. + * patches/cacao/package-version.diff: Drop 'preX' from the cacao + package version. + * patches/cacao/arm-arch-defines.patch: Remove cacao version fromi + patched files. + * patches/cacao/package-version.patch: Likewise. + 2010-06-22 Andrew John Hughes Remove VisualVM support, now maintained at diff -r 03c860266712 -r 64285e351dc5 Makefile.am --- a/Makefile.am Wed Jun 23 00:15:52 2010 +0100 +++ b/Makefile.am Thu Jun 24 16:20:37 2010 +0200 @@ -335,7 +335,8 @@ ICEDTEA_PATCHES += \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ patches/cacao/6714758.patch \ - patches/cacao/memory.patch + patches/cacao/memory.patch \ + patches/cacao/package-version.patch endif if WITH_CACAO @@ -2202,7 +2203,7 @@ if ADD_CACAO_BUILD mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao install -m 644 cacao/install/lib/libjvm.so \ $(BUILD_JRE_ARCH_DIR)/cacao/ - install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \ $(BUILD_JRE_ARCH_DIR)/cacao/ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ $(BUILD_JRE_ARCH_DIR)/cacao/ @@ -2222,7 +2223,7 @@ if ADD_CACAO_BUILD mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao install -m 644 cacao/install/lib/libjvm.so \ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ - install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ + install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ diff -r 03c860266712 -r 64285e351dc5 patches/cacao/6714758.patch --- a/patches/cacao/6714758.patch Wed Jun 23 00:15:52 2010 +0100 +++ b/patches/cacao/6714758.patch Thu Jun 24 16:20:37 2010 +0200 @@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ -diff -Nru cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product ---- cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao-8948a434c10d/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 +diff -Nru cacao.orig/cacaog/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product +--- cacao.orig/cacaog/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacaog/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 @@ -86,6 +86,7 @@ JVM_EnableCompiler; JVM_Exit; @@ -9,9 +9,9 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ JVM_FindClassFromClass; JVM_FindClassFromClassLoader; JVM_FindLibraryEntry; -diff -Nru cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp ---- cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 +diff -Nru cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp +--- cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacaog/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 @@ -668,6 +668,9 @@ assert(throwError == false); diff -r 03c860266712 -r 64285e351dc5 patches/cacao/arm-arch-defines.patch --- a/patches/cacao/arm-arch-defines.patch Wed Jun 23 00:15:52 2010 +0100 +++ b/patches/cacao/arm-arch-defines.patch Thu Jun 24 16:20:37 2010 +0200 @@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ -diff -Nru cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h ---- cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100 +diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h +--- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100 @@ -33,7 +33,13 @@ /* NEC LE-IT: gcc has no way to easily check the arm architecture @@ -16,9 +16,9 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ AO_INLINE void AO_nop_full() { -diff -Nru cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp ---- cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp 2010-06-21 18:35:53.000000000 +0100 +diff -Nru cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp cacao/cacao/src/vm/jit/arm/md-atomic.hpp +--- cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp 2010-06-21 18:35:53.000000000 +0100 @@ -45,26 +45,7 @@ */ inline uint32_t compare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval) diff -r 03c860266712 -r 64285e351dc5 patches/cacao/package-version.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/package-version.patch Thu Jun 24 16:20:37 2010 +0200 @@ -0,0 +1,11 @@ +--- cacao/cacao/m4/version.m4~ 2010-06-23 17:18:58.000000000 +0200 ++++ cacao/cacao/m4/version.m4 2010-06-23 21:00:36.739828757 +0200 +@@ -24,7 +24,7 @@ + dnl define detailed version numbers + + AC_DEFUN([AC_VERSION_DETAIL],[ +-version="$PACKAGE_VERSION" ++version=$(echo "$PACKAGE_VERSION" | sed 's/pre.*//') + if test x`echo "$version" | $SED -e 's/[[0-9a-z+]]*//g'` = "x.."; + then + major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` From ahughes at redhat.com Thu Jun 24 08:27:54 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 24 Jun 2010 16:27:54 +0100 Subject: The big Zero deletion In-Reply-To: <4C23346E.8000906@ubuntu.com> References: <20100617173919.GE4284@redhat.com> <4C231C87.7050405@zafena.se> <4C23346E.8000906@ubuntu.com> Message-ID: On 24 June 2010 11:33, Matthias Klose wrote: > On 24.06.2010 10:51, Xerxes R?nby wrote: >> >> >> /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp >> >> >> /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp:34: >> error: 'pd_InlineSmallCode' was not declared in this scope >> make[7]: *** [globals.o] Error 1 > > just a me too, didn't find out the reason yet. > At a guess, you need to revert http://icedtea.classpath.org/hg/icedtea6/rev/ae50851aec72 -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Thu Jun 24 09:04:07 2010 From: omajid at redhat.com (Omair Majid) Date: Thu, 24 Jun 2010 12:04:07 -0400 Subject: [RFC] Netx: clean up path sanitization code Message-ID: <4C2381F7.9030205@redhat.com> Hi, The attached patch does a little bit of refactoring, moving path manipulation functions to a common location. Any comments? Cheers, Omair -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-jnlp-filename-sanitization.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100624/7bf375b8/icedtea6-jnlp-filename-sanitization.patch From doko at ubuntu.com Thu Jun 24 09:19:38 2010 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 24 Jun 2010 18:19:38 +0200 Subject: The big Zero deletion In-Reply-To: References: <20100617173919.GE4284@redhat.com> <4C231C87.7050405@zafena.se> <4C23346E.8000906@ubuntu.com> Message-ID: <4C23859A.1040101@ubuntu.com> On 24.06.2010 17:27, Andrew John Hughes wrote: > On 24 June 2010 11:33, Matthias Klose wrote: >> On 24.06.2010 10:51, Xerxes R?nby wrote: >>> >>> >>> /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp >>> >>> >>> /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp:34: >>> error: 'pd_InlineSmallCode' was not declared in this scope >>> make[7]: *** [globals.o] Error 1 >> >> just a me too, didn't find out the reason yet. >> > > At a guess, you need to revert > http://icedtea.classpath.org/hg/icedtea6/rev/ae50851aec72 yes, getting a bit further (with llvm-2.7): until In file included from ../generated/incls/_sharkBlock.cpp.incl:11, from /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hot spot/src/share/vm/shark/sharkBlock.cpp:27: /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar k/sharkBuilder.hpp: In member function 'llvm::Value* SharkBuilder::CreateInlineOop(ciObject*, co nst char*)': /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar k/sharkBuilder.hpp:195: error: 'class ciObject' has no member named 'encoding' In file included from ../generated/incls/_sharkCacheDecache.cpp.incl:10, from /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hot spot/src/share/vm/shark/sharkCacheDecache.cpp:27: /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar k/sharkBuilder.hpp: In member function 'llvm::Value* SharkBuilder::CreateInlineOop(ciObject*, co nst char*)': /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar k/sharkBuilder.hpp:195: error: 'class ciObject' has no member named 'encoding'In file included f rom ../generated/incls/_sharkBuilder.cpp.incl:10, from /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hot spot/src/share/vm/shark/sharkBuilder.cpp:27: /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp: In member function 'llvm::Value* SharkBuilder::CreateInlineOop(ciObject*, const char*)': /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp:195: error: 'class ciObject' has no member named 'encoding' In file included from ../generated/incls/_sharkCompiler.cpp.incl:11, from /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:27: /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp: In member function 'llvm::Value* SharkBuilder::CreateInlineOop(ciObject*, const char*)': /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp:195: error: 'class ciObject' has no member named 'encoding' From ahughes at redhat.com Thu Jun 24 11:25:42 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 24 Jun 2010 19:25:42 +0100 Subject: IcedTea6 Now Supports b20 In-Reply-To: <4C231434.40908@gmx.net> References: <4C21B94D.2090009@gmx.net> <4C231434.40908@gmx.net> Message-ID: <20100624182542.GB11109@rivendell.middle-earth.co.uk> On 10:15 Thu 24 Jun , Robert Schuster wrote: > Am 23.06.2010 15:55, schrieb Andrew John Hughes: > > On 23 June 2010 08:35, Robert Schuster wrote: > >> Hi, > >> > >> Am 22.06.2010 19:39, schrieb Andrew John Hughes: > >>> It also includes the Zero cleanup I mentioned last week. > >>> I now like to start planning for an IcedTea6 1.19 release. > >>> > >>> Does anyone have anything pending they'd still like to commit for 1.19? > >>> > >> Yes, me. There is the --with-cc-for-build patch and I will also send > >> another one which makes IcedTea6 compatible with the cmake-built llvm > >> 2.7 shared libraries (which is unfortunately different from building it > >> with the autotools). > >> > > > > --with-cc-for-build sound suspiciously like what is already supported > > by autoconf's > > host/build/target support. > Hey, lets discuss the details in the right thread. I provided a link to > the autotools documentation. Maybe I am misreading things. > What thread? This is the only one I've seen regarding this. > Regards > Robert > > > > The LLVM stuff I'll leave to Gary, Doko and Xerxes to review. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Thu Jun 24 11:58:43 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 24 Jun 2010 18:58:43 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Platform|all |32-bit ------- Comment #10 from gnu_andrew at member.fsf.org 2010-06-24 18:58 ------- The Y2038 bug is an issue with 32-bit systems only as time_t = pointer size. So it affects x86 and arm, but not x86_64 where time_t will be 64-bit. src/os/linux/vm/os_linux.cpp, src/os/solaris/vm/os_solaris.cpp, src/os/linux/vm/hpi_linux.hpp and src/os/linux/vm/hpi_linux.hpp all call gettimeofday which will return a 32-bit seconds since the epoch value on 32-bit systems. See /usr/include/bits/typesizes.h: #define __TIME_T_TYPE __SLONGWORD_TYPE from /usr/include/bits/types.h: #define __SLONGWORD_TYPE long int A C long is 32-bit on 32-bit systems, and 64-bit on 64-bit systems. Do we know if the glibc hackers have any ideas about this yet? That seems a better place for a fix. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Jun 24 12:19:47 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 24 Jun 2010 19:19:47 +0000 Subject: [Bug 394] Y2038 time overflow/pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #11 from gnu_andrew at member.fsf.org 2010-06-24 19:19 ------- glibc bug: https://bugzilla.redhat.com/show_bug.cgi?id=117821 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Thu Jun 24 13:30:15 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 24 Jun 2010 20:30:15 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset f40f87b95dc0 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f40f87b95dc0 author: Andrew John Hughes date: Thu Jun 24 18:44:12 2010 +0100 Fix broken CACAO build and remove redundant patches. 2010-06-24 Andrew John Hughes * patches/cacao/6714758.patch: Removed, 6714758 is not in OpenJDK6. * patches/cacao/package-version.diff: Removed; we shouldn't be altering the CACAO version and it builds without this fix. * patches/cacao/version.patch: Dropped; only needed for 7. * patches/icedtea-cacao-ignore-jdi-tests.patch: Moved to... * Makefile.am: Drop unneeded patches. Remove non-existent nio2 reference. Fix path to ignore-jdi-tests.patch. (CACAO_BASE_URL): Shorten to just the base. (CACAO_SRC_ZIP): Use version from IcedTea7. (download-cacao): Added from IcedTea7. (clean-download-cacao): Likewise. (download): Depend on download-cacao. Remove CACAO downloading. (clean-download): Depend on clean-download- cacao. Remove CACAO cleaning. * patches/cacao/ignore-jdi-tests.patch: ...here. changeset 1c22941d9896 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1c22941d9896 author: Andrew John Hughes date: Thu Jun 24 21:30:07 2010 +0100 Bump changeset to a CACAO build using -O2 and include a fix for a version parsing bug. 2010-06-24 Andrew John Hughes * Makefile.am: Add new patch and update: (CACAO_VERSION): Bump to changeset which increases optimisation to -O2 not -O0. (CACAO_SHA256SUM): Updated for above. * patches/cacao/version-parsing.patch: Fix parsing of the minor version due to the update from 1.1.0pre to 1.1.0pre1 in the new changeset. diffstat: 8 files changed, 1583 insertions(+), 1616 deletions(-) ChangeLog | 36 Makefile.am | 88 - patches/cacao/6714758.patch | 40 patches/cacao/ignore-jdi-tests.patch | 1496 ++++++++++++++++++++++++++ patches/cacao/package-version.diff | 11 patches/cacao/version-parsing.patch | 11 patches/cacao/version.patch | 21 patches/icedtea-cacao-ignore-jdi-tests.patch | 1496 -------------------------- diffs (truncated from 3292 to 500 lines): diff -r 5ecaa9185c34 -r 1c22941d9896 ChangeLog --- a/ChangeLog Thu Jun 24 16:02:09 2010 +0200 +++ b/ChangeLog Thu Jun 24 21:30:07 2010 +0100 @@ -1,3 +1,39 @@ 2010-06-24 Matthias Klose + + * Makefile.am: + Add new patch and update: + (CACAO_VERSION): Bump to changeset which + increases optimisation to -O2 not -O0. + (CACAO_SHA256SUM): Updated for above. + * patches/cacao/version-parsing.patch: + Fix parsing of the minor version due to + the update from 1.1.0pre to 1.1.0pre1 in + the new changeset. + +2010-06-24 Andrew John Hughes + + * patches/cacao/6714758.patch: + Removed, 6714758 is not in OpenJDK6. + * patches/cacao/package-version.diff: + Removed; we shouldn't be altering the CACAO + version and it builds without this fix. + * patches/cacao/version.patch: + Dropped; only needed for 7. + * patches/icedtea-cacao-ignore-jdi-tests.patch: + Moved to... + * Makefile.am: + Drop unneeded patches. Remove non-existent nio2 + reference. Fix path to ignore-jdi-tests.patch. + (CACAO_BASE_URL): Shorten to just the base. + (CACAO_SRC_ZIP): Use version from IcedTea7. + (download-cacao): Added from IcedTea7. + (clean-download-cacao): Likewise. + (download): Depend on download-cacao. + Remove CACAO downloading. + (clean-download): Depend on clean-download-cacao. + Remove CACAO cleaning. + * patches/cacao/ignore-jdi-tests.patch: ...here. + 2010-06-24 Matthias Klose * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp): diff -r 5ecaa9185c34 -r 1c22941d9896 Makefile.am --- a/Makefile.am Thu Jun 24 16:02:09 2010 +0200 +++ b/Makefile.am Thu Jun 24 21:30:07 2010 +0100 @@ -5,10 +5,11 @@ OPENJDK_VERSION = b20 OPENJDK_VERSION = b20 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = 8948a434c10d -CACAO_SHA256SUM = e472e11621c3e1f00a5f49c990e68d18db09c6c12aea100950567b1577931412 -CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive/tip.tar.bz2 +CACAO_VERSION = dd4532afd08a +CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4 +CACAO_BASE_URL = http://mips.complang.tuwien.ac.at CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 +CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 NETBEANS_PROFILER_MD5SUM = 40dd3183b345737ca22162d164c2d5a2 NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/149581/ @@ -124,16 +125,6 @@ if USE_ALT_HOTSPOT_SRC_ZIP HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP) else HOTSPOT_SRC_ZIP = hotspot.tar.gz -endif - -if USE_ALT_CACAO_SRC_ZIP - CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) -else -if USE_ALT_CACAO_SRC_DIR - CACAO_SRC_ZIP = "not needed" -else - CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -endif endif # FIXME (HotSpot): HotSpot changeset logic goes here @@ -328,21 +319,16 @@ if BUILD_CACAO if BUILD_CACAO ICEDTEA_PATCHES += \ patches/cacao/launcher.patch \ - patches/cacao/version.patch \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ - patches/cacao/6714758.patch \ patches/cacao/memory.patch \ - patches/cacao/package-version.diff -if ENABLE_NIO2 -ICEDTEA_PATCHES += patches/cacao/nio2.patch -endif + patches/cacao/version-parsing.patch endif if WITH_CACAO ICEDTEA_PATCHES += \ - patches/icedtea-cacao-ignore-jdi-tests.patch \ - patches/icedtea-cacao-ignore-tests.patch + patches/cacao/ignore-jdi-tests.patch \ + patches/cacao/ignore-tests.patch endif if ENABLE_PULSE_JAVA @@ -706,6 +692,36 @@ stamps/download-drops.stamp: stamps/down mkdir -p stamps touch $@ +stamps/download-cacao.stamp: +if BUILD_CACAO +if !USE_SYSTEM_CACAO +if !USE_ALT_CACAO_SRC_DIR +if USE_ALT_CACAO_SRC_ZIP + ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP) +endif + if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \ + | $(SHA256SUM) --check ; \ + then \ + if [ $(CACAO_SRC_ZIP) ] ; \ + then \ + mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \ + if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \ + | $(SHA256SUM) --check ; \ + then echo "ERROR: Bad download of CACAO zip"; false; \ + fi; \ + fi +endif +endif +endif + mkdir -p stamps + touch $@ + +clean-download-cacao: + rm -f $(CACAO_SRC_ZIP) + rm -f stamps/download-cacao.stamp + clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \ clean-download-jaxws-drop if [ -e drops ] ; then \ @@ -713,7 +729,8 @@ clean-drops: clean-download-jaxp-drop cl fi rm -f stamps/download-drops.stamp -stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp +stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp \ + stamps/download-cacao.stamp if USE_HG if WITH_HGREV $(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk; @@ -752,25 +769,6 @@ else version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"; \ $(WGET) $${hotspot_url} -O $(HOTSPOT_SRC_ZIP) ; \ fi -endif -endif -endif -if BUILD_CACAO -if !USE_SYSTEM_CACAO -if USE_ALT_CACAO_SRC_ZIP -else -if USE_ALT_CACAO_SRC_DIR -else - if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(CACAO_SRC_ZIP) ] ; \ - then \ - mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \ - fi -endif endif endif endif @@ -801,15 +799,9 @@ endif touch stamps/download.stamp #FIXME (meta): split into multiple targets -clean-download: clean-drops +clean-download: clean-drops clean-download-cacao rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) -if BUILD_CACAO -if USE_ALT_CACAO_SRC_DIR -else - rm -f $(CACAO_SRC_ZIP) -endif -endif if WITH_VISUALVM rm -f $(VISUALVM_SRC_ZIP) rm -f $(NETBEANS_PROFILER_SRC_ZIP) diff -r 5ecaa9185c34 -r 1c22941d9896 patches/cacao/6714758.patch --- a/patches/cacao/6714758.patch Thu Jun 24 16:02:09 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -diff -Nru cacao.orig/cacao/contrib/mapfile-vers-product cacao/cacao/contrib/mapfile-vers-product ---- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 -@@ -86,6 +86,7 @@ - JVM_EnableCompiler; - JVM_Exit; - JVM_FillInStackTrace; -+ JVM_FindClassFromBootLoader; - JVM_FindClassFromClass; - JVM_FindClassFromClassLoader; - JVM_FindLibraryEntry; -diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp cacao/cacao/src/native/vm/openjdk/jvm.cpp ---- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 -@@ -668,6 +668,9 @@ - - assert(throwError == false); - -+ if (name == NULL) -+ return NULL; -+ - u = utf_new_char(name); - cl = loader_hashtable_classloader_add((java_handle_t *) loader); - -@@ -685,6 +688,15 @@ - } - - -+/* JVM_FindClassFromBootLoader */ -+ -+jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char* name) -+{ -+ TRACEJVMCALLS(("JVM_FindClassFromBootLoader(name=%s)", name)); -+ return JVM_FindClassFromClassLoader(env, name, JNI_FALSE, -+ (jobject)NULL, false); -+} -+ - /* JVM_FindClassFromClass */ - - jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from) diff -r 5ecaa9185c34 -r 1c22941d9896 patches/cacao/ignore-jdi-tests.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/ignore-jdi-tests.patch Thu Jun 24 21:30:07 2010 +0100 @@ -0,0 +1,1496 @@ +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AcceptTimeout.java openjdk/jdk/test/com/sun/jdi/AcceptTimeout.java +--- openjdk.orig/jdk/test/com/sun/jdi/AcceptTimeout.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/AcceptTimeout.java 2010-02-19 14:59:03.000000000 +0000 +@@ -22,6 +22,7 @@ + */ + + /* @test ++ * @ignore cacao nyi + * @bug 6198277 + * @summary Test that each ListeningConnector that supports a "timeout" argument will + * timeout with TransportTimeoutException +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AccessSpecifierTest.java openjdk/jdk/test/com/sun/jdi/AccessSpecifierTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/AccessSpecifierTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/AccessSpecifierTest.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4359628 + * @summary Test fix for JDI: methods Accessible.is...() lie about array types + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AfterThreadDeathTest.java openjdk/jdk/test/com/sun/jdi/AfterThreadDeathTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/AfterThreadDeathTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/AfterThreadDeathTest.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4364671 + * @summary Creating a StepRequest on a nonexistant thread fails + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AllLineLocations.java openjdk/jdk/test/com/sun/jdi/AllLineLocations.java +--- openjdk.orig/jdk/test/com/sun/jdi/AllLineLocations.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/AllLineLocations.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4248728 + * @summary Test ReferenceType.allLineLocations + * @author Gordon Hirsch +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ArgumentValuesTest.java openjdk/jdk/test/com/sun/jdi/ArgumentValuesTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/ArgumentValuesTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ArgumentValuesTest.java 2010-02-19 14:59:03.000000000 +0000 +@@ -1,5 +1,6 @@ + /** hard coded linenumbers in other tests - DO NOT CHANGE + * @test/nodynamiccopyright/ ++ * @ignore cacao nyi + * @bug 4490824 + * @summary JDI: provide arguments when no debug attributes present + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh openjdk/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh +--- openjdk.orig/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh 2010-02-19 14:59:03.000000000 +0000 +@@ -25,6 +25,7 @@ + + # + # @test ++# @ignore cacao nyi + # @bug 4422141 4695338 + # @summary TTY: .length field for arrays in print statements in jdb not recognized + # TTY: dump command not implemented. +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ArrayRangeTest.java openjdk/jdk/test/com/sun/jdi/ArrayRangeTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/ArrayRangeTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ArrayRangeTest.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4439631 + * @bug 4448721 + * @bug 4448603 +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/BacktraceFieldTest.java openjdk/jdk/test/com/sun/jdi/BacktraceFieldTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/BacktraceFieldTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/BacktraceFieldTest.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4446677 + * @summary debuggee crashes when debugging under jbuilder + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/BadHandshakeTest.java openjdk/jdk/test/com/sun/jdi/BadHandshakeTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/BadHandshakeTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/BadHandshakeTest.java 2010-02-19 15:01:46.000000000 +0000 +@@ -22,6 +22,7 @@ + */ + + /* @test ++ * @ignore cacao nyi + * @bug 6306165 6432567 + * @summary Check that a bad handshake doesn't cause a debuggee to abort + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/BreakpointTest.java openjdk/jdk/test/com/sun/jdi/BreakpointTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/BreakpointTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/BreakpointTest.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 6496524 + * @summary Setting breakpoint in jdb crashes Hotspot JVM + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CatchAllTest.sh openjdk/jdk/test/com/sun/jdi/CatchAllTest.sh +--- openjdk.orig/jdk/test/com/sun/jdi/CatchAllTest.sh 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/CatchAllTest.sh 2010-02-19 14:59:03.000000000 +0000 +@@ -25,6 +25,7 @@ + + # + # @test ++# @ignore cacao nyi + # @bug 4749692 + # @summary REGRESSION: jdb rejects the syntax catch java.lang.IndexOutOfBoundsException + # @author Tim Bell +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CatchCaughtTest.sh openjdk/jdk/test/com/sun/jdi/CatchCaughtTest.sh +--- openjdk.orig/jdk/test/com/sun/jdi/CatchCaughtTest.sh 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/CatchCaughtTest.sh 2010-02-19 14:59:03.000000000 +0000 +@@ -25,6 +25,7 @@ + + # + # @test ++# @ignore cacao nyi + # @bug 4788864 + # @summary TTY: 'catch caught' with no class pattern throws NullPointerException + # @author Tim Bell +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CatchPatternTest.sh openjdk/jdk/test/com/sun/jdi/CatchPatternTest.sh +--- openjdk.orig/jdk/test/com/sun/jdi/CatchPatternTest.sh 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/CatchPatternTest.sh 2010-02-19 14:59:03.000000000 +0000 +@@ -24,6 +24,7 @@ + # + + # @test ++# @ignore cacao nyi + # @bug 4671838 + # @summary TTY: surprising ExceptionSpec.resolveEventRequest() wildcard results + # @author Tim Bell +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ClassesByName2Test.java openjdk/jdk/test/com/sun/jdi/ClassesByName2Test.java +--- openjdk.orig/jdk/test/com/sun/jdi/ClassesByName2Test.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ClassesByName2Test.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4406439 4925740 + * @summary ClassesByName2 verifies that all the classes in the loaded class list can be found with classesByName.. + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ClassesByName.java openjdk/jdk/test/com/sun/jdi/ClassesByName.java +--- openjdk.orig/jdk/test/com/sun/jdi/ClassesByName.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ClassesByName.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4287992 + * @author Robert Field + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java openjdk/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java +--- openjdk.orig/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4450091 + * @summary Test ClassLoaderReference.visibleClasses() which is + * a direct pass-through of the JVMDI function GetClassLoaderClasses +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh openjdk/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh +--- openjdk.orig/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh 2010-02-19 14:59:03.000000000 +0000 +@@ -25,6 +25,7 @@ + + # + # @test ++# @ignore cacao nyi + # @bug 4507088 + # @summary TTY: Add a comment delimiter to the jdb command set + # @author Tim Bell +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CompatibleConnectors.java openjdk/jdk/test/com/sun/jdi/CompatibleConnectors.java +--- openjdk.orig/jdk/test/com/sun/jdi/CompatibleConnectors.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/CompatibleConnectors.java 2010-02-19 14:59:03.000000000 +0000 +@@ -22,6 +22,7 @@ + */ + + /* @test ++ * @ignore cacao nyi + * @bug 4287596 + * @summary Unit test for "Pluggable Connectors and Transports" feature. + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java openjdk/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java +--- openjdk.orig/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java 2010-02-17 03:14:51.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java 2010-02-19 14:59:03.000000000 +0000 +@@ -22,6 +22,7 @@ + */ + + /* @test ++ * @ignore cacao nyi + * @bug 4287596 + * @summary Unit test for "Pluggable Connectors and Transports" feature. + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java openjdk/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java +--- openjdk.orig/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java 2010-02-17 03:14:51.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java 2010-02-19 14:59:03.000000000 +0000 +@@ -22,6 +22,7 @@ + */ + + /* @test ++ * @ignore cacao nyi + * @bug 4287596 + * @summary Unit test for "Pluggable Connectors and Transports" feature. + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh openjdk/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh +--- openjdk.orig/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-02-17 03:14:51.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-02-19 14:59:03.000000000 +0000 +@@ -22,6 +22,7 @@ + # + + # @test ++# @ignore cacao nyi + # @bug 5055681 + # @summary Test loading JDI classes via custom class loader + +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ConnectedVMs.java openjdk/jdk/test/com/sun/jdi/ConnectedVMs.java +--- openjdk.orig/jdk/test/com/sun/jdi/ConnectedVMs.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ConnectedVMs.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 4329140 + * @author Robert Field + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ConstantPoolInfo.java openjdk/jdk/test/com/sun/jdi/ConstantPoolInfo.java +--- openjdk.orig/jdk/test/com/sun/jdi/ConstantPoolInfo.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/ConstantPoolInfo.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test ++ * @ignore cacao nyi + * @bug 5024104 + * @summary Test ReferenceType.majorVersion(), minorVersion, constantPoolCount and ConstantPool apis. + * +diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CountEvent.java openjdk/jdk/test/com/sun/jdi/CountEvent.java +--- openjdk.orig/jdk/test/com/sun/jdi/CountEvent.java 2010-02-17 03:14:50.000000000 +0000 ++++ openjdk/jdk/test/com/sun/jdi/CountEvent.java 2010-02-19 14:59:03.000000000 +0000 +@@ -23,6 +23,7 @@ + + /** + * @test From ahughes at redhat.com Thu Jun 24 13:40:56 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 24 Jun 2010 21:40:56 +0100 Subject: The big Zero deletion In-Reply-To: <4C23859A.1040101@ubuntu.com> References: <20100617173919.GE4284@redhat.com> <4C231C87.7050405@zafena.se> <4C23346E.8000906@ubuntu.com> <4C23859A.1040101@ubuntu.com> Message-ID: On 24 June 2010 17:19, Matthias Klose wrote: > On 24.06.2010 17:27, Andrew John Hughes wrote: >> >> On 24 June 2010 11:33, Matthias Klose ?wrote: >>> >>> On 24.06.2010 10:51, Xerxes R?nby wrote: >>>> >>>> >>>> >>>> /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp >>>> >>>> >>>> >>>> /home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp:34: >>>> error: 'pd_InlineSmallCode' was not declared in this scope >>>> make[7]: *** [globals.o] Error 1 >>> >>> just a me too, didn't find out the reason yet. >>> >> >> At a guess, you need to revert >> http://icedtea.classpath.org/hg/icedtea6/rev/ae50851aec72 > > yes, getting a bit further (with llvm-2.7): until > > In file included from ../generated/incls/_sharkBlock.cpp.incl:11, > ? ? ? ? ? ? ? ? from > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hot > spot/src/share/vm/shark/sharkBlock.cpp:27: > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar > k/sharkBuilder.hpp: In member function 'llvm::Value* > SharkBuilder::CreateInlineOop(ciObject*, co > nst char*)': > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar > k/sharkBuilder.hpp:195: error: 'class ciObject' has no member named > 'encoding' > In file included from ../generated/incls/_sharkCacheDecache.cpp.incl:10, > ? ? ? ? ? ? ? ? from > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hot > spot/src/share/vm/shark/sharkCacheDecache.cpp:27: > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar > k/sharkBuilder.hpp: In member function 'llvm::Value* > SharkBuilder::CreateInlineOop(ciObject*, co > nst char*)': > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shar > k/sharkBuilder.hpp:195: error: 'class ciObject' has no member named > 'encoding'In file included f > rom ../generated/incls/_sharkBuilder.cpp.incl:10, > ? ? ? ? ? ? ? ? from > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hot > spot/src/share/vm/shark/sharkBuilder.cpp:27: > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp: > In member function 'llvm::Value* SharkBuilder::CreateInlineOop(ciObject*, > const char*)': > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp:195: > error: 'class ciObject' has no member named 'encoding' > > In file included from ../generated/incls/_sharkCompiler.cpp.incl:11, > ? ? ? ? ? ? ? ? from > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:27: > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp: > In member function 'llvm::Value* SharkBuilder::CreateInlineOop(ciObject*, > const char*)': > /scratch/packages/openjdk/b20/openjdk-6-6b20~pre1/build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp:195: > error: 'class ciObject' has no member named 'encoding' > This may be what you need: http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188 -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Thu Jun 24 13:52:29 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Thu, 24 Jun 2010 21:52:29 +0100 Subject: /hg/icedtea: Fix build --with-addition-vms=cacao, update patches... In-Reply-To: References: Message-ID: On 24 June 2010 15:21, wrote: > changeset 64285e351dc5 in /hg/icedtea > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=64285e351dc5 > author: doko at ubuntu.com > date: Thu Jun 24 16:20:37 2010 +0200 > > ? ? ? ?Fix build --with-addition-vms=cacao, update patches for cacao > ? ? ? ?prerelease builds > > ? ? ? ?2010-06-24 Matthias Klose > > ? ? ? ? * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao- > ? ? ? ?debug.stamp): Update libjsig.so installation location. > ? ? ? ? ? ? ? ?* patches/cacao/package-version.diff: Drop 'preX' from the cacao > ? ? ? ?package version. > ? ? ? ? ? ? ? ?* patches/cacao/arm-arch-defines.patch: Remove cacao version fromi > ? ? ? ?patched files. > ? ? ? ? ? ? ? ?* patches/cacao/package-version.patch: Likewise. > > > diffstat: > > 5 files changed, 37 insertions(+), 15 deletions(-) > ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 10 ++++++++++ > Makefile.am ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?7 ++++--- > patches/cacao/6714758.patch ? ? ? ? ?| ? 12 ++++++------ > patches/cacao/arm-arch-defines.patch | ? 12 ++++++------ > patches/cacao/package-version.patch ?| ? 11 +++++++++++ > > diffs (115 lines): > > diff -r 03c860266712 -r 64285e351dc5 ChangeLog > --- a/ChangeLog Wed Jun 23 00:15:52 2010 +0100 > +++ b/ChangeLog Thu Jun 24 16:20:37 2010 +0200 > @@ -1,3 +1,13 @@ 2010-06-22 Andrew John Hughes ? +2010-06-24 ?Matthias Klose ? > + > + ? ? ? * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp): > + ? ? ? Update libjsig.so installation location. > + ? ? ? * patches/cacao/package-version.diff: Drop 'preX' from the cacao > + ? ? ? package version. > + ? ? ? * patches/cacao/arm-arch-defines.patch: Remove cacao version fromi > + ? ? ? patched files. > + ? ? ? * patches/cacao/package-version.patch: Likewise. > + > ?2010-06-22 Andrew John Hughes ? > > ? ? ? ?Remove VisualVM support, now maintained at > diff -r 03c860266712 -r 64285e351dc5 Makefile.am > --- a/Makefile.am ? ? ? Wed Jun 23 00:15:52 2010 +0100 > +++ b/Makefile.am ? ? ? Thu Jun 24 16:20:37 2010 +0200 > @@ -335,7 +335,8 @@ ICEDTEA_PATCHES += \ > ? ? ? ?patches/cacao/arm-arch-defines.patch \ > ? ? ? ?patches/cacao/jsig.patch \ > ? ? ? ?patches/cacao/6714758.patch \ > - ? ? ? patches/cacao/memory.patch > + ? ? ? patches/cacao/memory.patch \ > + ? ? ? patches/cacao/package-version.patch > ?endif > > ?if WITH_CACAO > @@ -2202,7 +2203,7 @@ if ADD_CACAO_BUILD > ? ? ? ?mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao > ? ? ? ?install -m 644 cacao/install/lib/libjvm.so \ > ? ? ? ? ? ? ? ?$(BUILD_JRE_ARCH_DIR)/cacao/ > - ? ? ? install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ > + ? ? ? install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \ > ? ? ? ? ? ? ? ?$(BUILD_JRE_ARCH_DIR)/cacao/ > ? ? ? ?install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ > ? ? ? ? ? ? ? ?$(BUILD_JRE_ARCH_DIR)/cacao/ > @@ -2222,7 +2223,7 @@ if ADD_CACAO_BUILD > ? ? ? ?mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao > ? ? ? ?install -m 644 cacao/install/lib/libjvm.so \ > ? ? ? ? ? ? ? ?$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ > - ? ? ? install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \ > + ? ? ? install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \ > ? ? ? ? ? ? ? ?$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ > ? ? ? ?install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \ > ? ? ? ? ? ? ? ?$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/ > diff -r 03c860266712 -r 64285e351dc5 patches/cacao/6714758.patch > --- a/patches/cacao/6714758.patch ? ? ? Wed Jun 23 00:15:52 2010 +0100 > +++ b/patches/cacao/6714758.patch ? ? ? Thu Jun 24 16:20:37 2010 +0200 > @@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ > -diff -Nru cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product > ---- cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 > -+++ cacao/cacao-8948a434c10d/contrib/mapfile-vers-product ? ? ?2010-06-21 20:08:28.000000000 +0100 > +diff -Nru cacao.orig/cacaog/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product > +--- cacao.orig/cacaog/contrib/mapfile-vers-product ? ? 2010-05-19 12:14:46.000000000 +0100 > ++++ cacao/cacaog/contrib/mapfile-vers-product ?2010-06-21 20:08:28.000000000 +0100 > ?@@ -86,6 +86,7 @@ > ? ? ? ? ? ? ? ? ?JVM_EnableCompiler; > ? ? ? ? ? ? ? ? ?JVM_Exit; > @@ -9,9 +9,9 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ > ? ? ? ? ? ? ? ? ?JVM_FindClassFromClass; > ? ? ? ? ? ? ? ? ?JVM_FindClassFromClassLoader; > ? ? ? ? ? ? ? ? ?JVM_FindLibraryEntry; > -diff -Nru cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp > ---- cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp ? ? ? ?2010-05-19 12:14:46.000000000 +0100 > -+++ cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp ? ? 2010-06-21 20:08:28.000000000 +0100 > +diff -Nru cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp > +--- cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp ? ?2010-05-19 12:14:46.000000000 +0100 > ++++ cacao/cacaog/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 > ?@@ -668,6 +668,9 @@ > > ? ? ? ?assert(throwError == false); > diff -r 03c860266712 -r 64285e351dc5 patches/cacao/arm-arch-defines.patch > --- a/patches/cacao/arm-arch-defines.patch ? ? ?Wed Jun 23 00:15:52 2010 +0100 > +++ b/patches/cacao/arm-arch-defines.patch ? ? ?Thu Jun 24 16:20:37 2010 +0200 > @@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ > -diff -Nru cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h > ---- cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h ? 2010-05-19 12:14:46.000000000 +0100 > -+++ cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h ? ? ? ?2010-06-21 18:35:53.000000000 +0100 > +diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h > +--- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h ? ? ? ?2010-05-19 12:14:46.000000000 +0100 > ++++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h ? ? 2010-06-21 18:35:53.000000000 +0100 > ?@@ -33,7 +33,13 @@ > > ?/* NEC LE-IT: gcc has no way to easily check the arm architecture > @@ -16,9 +16,9 @@ diff -Nru cacao.orig/cacao-8948a434c10d/ > ?AO_INLINE void > ?AO_nop_full() > ?{ > -diff -Nru cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp > ---- cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100 > -+++ cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp ? ? ?2010-06-21 18:35:53.000000000 +0100 > +diff -Nru cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp cacao/cacao/src/vm/jit/arm/md-atomic.hpp > +--- cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp ? ? ?2010-05-19 12:14:46.000000000 +0100 > ++++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp ? 2010-06-21 18:35:53.000000000 +0100 > ?@@ -45,26 +45,7 @@ > ? */ > ?inline uint32_t compare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval) > diff -r 03c860266712 -r 64285e351dc5 patches/cacao/package-version.patch > --- /dev/null ? Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/cacao/package-version.patch ? ? ? Thu Jun 24 16:20:37 2010 +0200 > @@ -0,0 +1,11 @@ > +--- cacao/cacao/m4/version.m4~ 2010-06-23 17:18:58.000000000 +0200 > ++++ cacao/cacao/m4/version.m4 ?2010-06-23 21:00:36.739828757 +0200 > +@@ -24,7 +24,7 @@ > + dnl define detailed version numbers > + > + AC_DEFUN([AC_VERSION_DETAIL],[ > +-version="$PACKAGE_VERSION" > ++version=$(echo "$PACKAGE_VERSION" | sed 's/pre.*//') > + if test x`echo "$version" | $SED -e 's/[[0-9a-z+]]*//g'` = "x.."; > + then > + ? ? major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` > Can you please not push changes to 7 without asking on the list first, especially in this case where the package-version fix is wrong? I'm trying to prepare a release as I said previously. -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Thu Jun 24 16:37:10 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Fri, 25 Jun 2010 00:37:10 +0100 Subject: [RFC] Netx: clean up path sanitization code In-Reply-To: <4C2381F7.9030205@redhat.com> References: <4C2381F7.9030205@redhat.com> Message-ID: On 24 June 2010 17:04, Omair Majid wrote: > Hi, > > The attached patch does a little bit of refactoring, moving path > manipulation functions to a common location. > > Any comments? > > Cheers, > Omair > Looks good. It's more than just cleanup though, as the behaviour of sanitizeFileName has changed. It now only replaces ILLEGAL_CHARS and not all characters that aren't in the legal set. I'd also make the two arrays private and final. Cheers, -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Thu Jun 24 18:15:27 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Jun 2010 01:15:27 +0000 Subject: /hg/icedtea: Fix CACAO build and downloading. Bump to newer cha... Message-ID: changeset 6870b368f4e5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6870b368f4e5 author: Andrew John Hughes date: Fri Jun 25 02:15:15 2010 +0100 Fix CACAO build and downloading. Bump to newer changeset with optimisation and version parsing fix. 2010-06-24 Andrew John Hughes * patches/cacao/package-version.patch: Removed; breaks CACAO versioning. * Makefile.am: Update to new changeset with optimisation and version parsing fix. Fix downloading. (CACAO_BASE_URL): Remove tip.tar.bz2 suffix. (CACAO_URL): Remove duplication of /hg/cacao/archive. (CACAO_VERSION): Bump to changeset which increases optimisation to -O2 not -O0. (CACAO_SHA256SUM): Updated for above. (download-cacao): Don't append CACAO_SRC_ZIP to URL. * patches/cacao/version-parsing.patch: Fix parsing of the minor version due to the update from 1.1.0pre to 1.1.0pre1 in the new changeset. * patches/cacao/6714758.patch: Fix bad paths introduced by previous changeset. diffstat: 4 files changed, 32 insertions(+), 23 deletions(-) ChangeLog | 23 ++++++++++++++++++++++- Makefile.am | 13 ++++++------- patches/cacao/6714758.patch | 8 ++++---- patches/cacao/package-version.patch | 11 ----------- diffs (107 lines): diff -r 64285e351dc5 -r 6870b368f4e5 ChangeLog --- a/ChangeLog Thu Jun 24 16:20:37 2010 +0200 +++ b/ChangeLog Fri Jun 25 02:15:15 2010 +0100 @@ -1,6 +1,27 @@ 2010-06-24 Matthias Klose + + * patches/cacao/package-version.patch: + Removed; breaks CACAO versioning. + * Makefile.am: + Update to new changeset with optimisation + and version parsing fix. Fix downloading. + (CACAO_BASE_URL): Remove tip.tar.bz2 suffix. + (CACAO_URL): Remove duplication of /hg/cacao/archive. + (CACAO_VERSION): Bump to changeset which + increases optimisation to -O2 not -O0. + (CACAO_SHA256SUM): Updated for above. + (download-cacao): Don't append CACAO_SRC_ZIP to URL. + * patches/cacao/version-parsing.patch: + Fix parsing of the minor version due to + the update from 1.1.0pre to 1.1.0pre1 in + the new changeset. + * patches/cacao/6714758.patch: + Fix bad paths introduced by previous changeset. + 2010-06-24 Matthias Klose - * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp): + * Makefile.am + (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp): Update libjsig.so installation location. * patches/cacao/package-version.diff: Drop 'preX' from the cacao package version. diff -r 64285e351dc5 -r 6870b368f4e5 Makefile.am --- a/Makefile.am Thu Jun 24 16:20:37 2010 +0200 +++ b/Makefile.am Fri Jun 25 02:15:15 2010 +0100 @@ -18,10 +18,10 @@ LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d948a07204904f6ce60e363bd0516e22f1cae830aba84f8 OPENJDK_SHA256SUM = 93c536e6bc4e962050a00321e88e694fc4e0000e2ad887b8de22830bfda2649f -CACAO_VERSION = 8948a434c10d -CACAO_SHA256SUM = e472e11621c3e1f00a5f49c990e68d18db09c6c12aea100950567b1577931412 -CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive/tip.tar.bz2 -CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 +CACAO_VERSION = 66e762d869dd +CACAO_SHA256SUM = 9a558ffb69479f2d31995bdeb90cd2abc616050e76a6be7263c72e2e302ca4e6 +CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive +CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download @@ -335,8 +335,7 @@ ICEDTEA_PATCHES += \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ patches/cacao/6714758.patch \ - patches/cacao/memory.patch \ - patches/cacao/package-version.patch + patches/cacao/memory.patch endif if WITH_CACAO @@ -1101,7 +1100,7 @@ endif then \ mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \ fi ; \ - $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \ + $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then echo "ERROR: Bad download of CACAO zip"; false; \ diff -r 64285e351dc5 -r 6870b368f4e5 patches/cacao/6714758.patch --- a/patches/cacao/6714758.patch Thu Jun 24 16:20:37 2010 +0200 +++ b/patches/cacao/6714758.patch Fri Jun 25 02:15:15 2010 +0100 @@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacaog/contrib/mapf diff -Nru cacao.orig/cacaog/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product ---- cacao.orig/cacaog/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacaog/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 +--- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 @@ -86,6 +86,7 @@ JVM_EnableCompiler; JVM_Exit; @@ -10,8 +10,8 @@ diff -Nru cacao.orig/cacaog/contrib/mapf JVM_FindClassFromClassLoader; JVM_FindLibraryEntry; diff -Nru cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp ---- cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacaog/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 +--- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 ++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 @@ -668,6 +668,9 @@ assert(throwError == false); diff -r 64285e351dc5 -r 6870b368f4e5 patches/cacao/package-version.patch --- a/patches/cacao/package-version.patch Thu Jun 24 16:20:37 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- cacao/cacao/m4/version.m4~ 2010-06-23 17:18:58.000000000 +0200 -+++ cacao/cacao/m4/version.m4 2010-06-23 21:00:36.739828757 +0200 -@@ -24,7 +24,7 @@ - dnl define detailed version numbers - - AC_DEFUN([AC_VERSION_DETAIL],[ --version="$PACKAGE_VERSION" -+version=$(echo "$PACKAGE_VERSION" | sed 's/pre.*//') - if test x`echo "$version" | $SED -e 's/[[0-9a-z+]]*//g'` = "x.."; - then - major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` From bugzilla-daemon at icedtea.classpath.org Fri Jun 25 00:49:26 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Jun 2010 07:49:26 +0000 Subject: [Bug 344] cacao build broken in IcedTea7 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=344 stefan at complang.tuwien.ac.at changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution| |FIXED ------- Comment #7 from stefan at complang.tuwien.ac.at 2010-06-25 07:49 ------- Not an issue anymore. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 25 00:50:05 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Jun 2010 07:50:05 +0000 Subject: [Bug 429] cacao+Icedtea6 on ARM build failure on armv7l systems Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=429 ------- Comment #6 from stefan at complang.tuwien.ac.at 2010-06-25 07:50 ------- I will look into this. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Fri Jun 25 02:29:28 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Jun 2010 09:29:28 +0000 Subject: /hg/icedtea: PR icedtea/512: Extract jaxws getdtdtype patch to b... Message-ID: changeset 1d83df258409 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d83df258409 author: Andrew John Hughes date: Fri Jun 25 10:29:19 2010 +0100 PR icedtea/512: Extract jaxws getdtdtype patch to boot tree instead of main tree. 2010-06-25 Andrew John Hughes PR icedtea/512: (extract-jaxws): Depend on $(OPENJDK_BOOT_TREE) and patch that tree instead. diffstat: 2 files changed, 11 insertions(+), 6 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 11 +++++------ diffs (50 lines): diff -r 6870b368f4e5 -r 1d83df258409 ChangeLog --- a/ChangeLog Fri Jun 25 02:15:15 2010 +0100 +++ b/ChangeLog Fri Jun 25 10:29:19 2010 +0100 @@ -1,3 +1,9 @@ 2010-06-24 Andrew John Hughes + + PR icedtea/512: + (extract-jaxws): Depend on $(OPENJDK_BOOT_TREE) + and patch that tree instead. + 2010-06-24 Andrew John Hughes * patches/cacao/package-version.patch: diff -r 6870b368f4e5 -r 1d83df258409 Makefile.am --- a/Makefile.am Fri Jun 25 02:15:15 2010 +0100 +++ b/Makefile.am Fri Jun 25 10:29:19 2010 +0100 @@ -1259,19 +1259,19 @@ clean-extract-cacao: clean-cacao clean-extract-cacao: clean-cacao rm -f stamps/extract-cacao.stamp -stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp \ +stamps/extract-jaxws.stamp: $(OPENJDK_BOOT_TREE) \ stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp set -e ; \ if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \ - (cd openjdk/jaxws ; \ + (cd openjdk-boot/jaxws ; \ $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \ - -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws \ + -Doutput.dir=$(BOOT_BUILD_OUTPUT_DIR)/jaxws \ source ; \ cd $(abs_top_builddir)) ; \ fi if DTDTYPE_QNAME set -e ; \ - (cd $(BUILD_OUTPUT_DIR)/jaxws; \ + (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws; \ all_patches_ok=yes; \ for p in $(JAXWS_PATCHES) ; \ do \ @@ -1296,8 +1296,7 @@ if DTDTYPE_QNAME echo ERROR patch $${all_patches_ok} FAILED! ; \ echo WARNING make clean-extract-jaxws before retrying a fix ; \ exit 2; \ - fi ; \ - cd $(abs_top_builddir)) ; + fi ) endif mkdir -p stamps touch $@ From bugzilla-daemon at icedtea.classpath.org Fri Jun 25 02:58:45 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Jun 2010 09:58:45 +0000 Subject: [Bug 398] hotspot hs16 / 6b17 build failure on sparc Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=398 ------- Comment #1 from doko at ubuntu.com 2010-06-25 09:58 ------- still seen with 6b20 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From doko at icedtea.classpath.org Fri Jun 25 03:25:20 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Fri, 25 Jun 2010 10:25:20 +0000 Subject: /hg/icedtea6: 2010-06-25 Matthias Klose Message-ID: changeset 2abd775a9d46 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2abd775a9d46 author: doko at ubuntu.com date: Fri Jun 25 12:24:35 2010 +0200 2010-06-25 Matthias Klose Fix shark build failures, update for latest HotSpot taken from http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188 * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Update. * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Update. * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Update. diffstat: 4 files changed, 11 insertions(+), 2 deletions(-) ChangeLog | 8 ++++++++ ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 1 + ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 2 +- ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 2 +- diffs (50 lines): diff -r 1c22941d9896 -r 2abd775a9d46 ChangeLog --- a/ChangeLog Thu Jun 24 21:30:07 2010 +0100 +++ b/ChangeLog Fri Jun 25 12:24:35 2010 +0200 @@ -1,3 +1,11 @@ 2010-06-24 Andrew John Hughes + + Fix shark build failures, update for latest HotSpot taken from + http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188 + * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Update. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Update. + * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Update. + 2010-06-24 Andrew John Hughes * Makefile.am: diff -r 1c22941d9896 -r 2abd775a9d46 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Thu Jun 24 21:30:07 2010 +0100 +++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Fri Jun 25 12:24:35 2010 +0200 @@ -47,6 +47,7 @@ define_pd_global(intx, Tier4BackEdge define_pd_global(intx, OnStackReplacePercentage, 933 ); define_pd_global(intx, FreqInlineSize, 325 ); +define_pd_global(intx, InlineSmallCode, 1000 ); define_pd_global(intx, NewRatio, 12 ); define_pd_global(intx, NewSizeThreadIncrease, 4*K ); define_pd_global(intx, InitialCodeCacheSize, 160*K); diff -r 1c22941d9896 -r 2abd775a9d46 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu Jun 24 21:30:07 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Fri Jun 25 12:24:35 2010 +0200 @@ -192,7 +192,7 @@ class SharkBuilder : public llvm::IRBuil llvm::Value* code_buffer_address(int offset); llvm::Value* CreateInlineOop(jobject object, const char* name = ""); llvm::Value* CreateInlineOop(ciObject* object, const char* name = "") { - return CreateInlineOop(object->encoding(), name); + return CreateInlineOop(object->constant_encoding(), name); } llvm::Value* CreateInlineData(void* data, size_t size, diff -r 1c22941d9896 -r 2abd775a9d46 ports/hotspot/src/share/vm/shark/sharkConstant.cpp --- a/ports/hotspot/src/share/vm/shark/sharkConstant.cpp Thu Jun 24 21:30:07 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkConstant.cpp Fri Jun 25 12:24:35 2010 +0200 @@ -114,7 +114,7 @@ SharkConstant::SharkConstant(ciConstant } object = klass->java_mirror(); } - if (object->is_null_object() || !object->has_encoding()) { + if (object->is_null_object() || !object->can_be_constant()) { _is_loaded = false; return; } From doko at ubuntu.com Fri Jun 25 03:33:18 2010 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 25 Jun 2010 12:33:18 +0200 Subject: The big Zero deletion In-Reply-To: References: <20100617173919.GE4284@redhat.com> <4C231C87.7050405@zafena.se> <4C23346E.8000906@ubuntu.com> <4C23859A.1040101@ubuntu.com> Message-ID: <4C2485EE.8030703@ubuntu.com> On 24.06.2010 22:40, Andrew John Hughes wrote: > This may be what you need: > http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188 yes, pushed after sucessful builds on x86, x86_64 and powerpc. However the testsuite now crashes: trying to run the langtools testsuite: # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:236), pid=22658, tid=1780489072 # Error: caught unhandled signal 11 trying to run the jdk testsuite: # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (debugInfo.cpp:85), pid=22793, tid=1750104944 # Error: ShouldNotReachHere() the hotspot testsuite doesn't crash: FAILED: compiler/6603011/Test.java FAILED: compiler/6663621/IVTest.java FAILED: compiler/6663854/Test6663854.java FAILED: compiler/6711117/Test.java FAILED: compiler/6712835/Test6712835.java FAILED: compiler/6714694/Tester.java FAILED: compiler/6716441/Tester.java FAILED: compiler/6741738/Tester.java FAILED: compiler/6756768/Test6756768_2.java FAILED: compiler/6756768/Test6756768.java FAILED: compiler/6757316/Test6757316.java FAILED: compiler/6792161/Test6792161.java FAILED: compiler/6875866/Test.java FAILED: compiler/6877254/Test.java FAILED: compiler/6895383/Test.java FAILED: compiler/6896727/Test.java FAILED: compiler/6935535/Test.java Test results: passed: 69; failed: 17 From bugzilla-daemon at icedtea.classpath.org Fri Jun 25 03:52:59 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Jun 2010 10:52:59 +0000 Subject: [Bug 513] New: cacao+Icedtea6 on ARM build failure on armv7l with --enable-softfloat Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=513 Summary: cacao+Icedtea6 on ARM build failure on armv7l with -- enable-softfloat Product: IcedTea Version: 6-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: CACAO AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com in the past, --enable-softfloat was necessary to build CACAO on arm, this now leads to a build failure (this is a build with -mfloat-abi=softfp). It looks like __VFP_FP__ is never defined, but tested inside ENABLE_SOFTFLOAT ifdefs. libtool: compile: arm-linux-gnueabi-g++ -DHAVE_CONFIG_H -I. -I../../.. -I../../../src -I../../../src/vm/jit/arm -I../../../src/vm/jit/arm/linux -I../../../src -I../../../contrib/vmlog "-I/home/doko/openjdk/openjdk-6-6b20~pre1/build/openjdk/jdk/src/solaris/javavm/export" "-I/home/doko/openjdk/openjdk-6-6b20~pre1/build/openjdk/jdk/src/share/javavm/export" "-I/home/doko/openjdk/openjdk-6-6b20~pre1/build/openjdk/jdk/src/solaris/javavm/export" "-I/home/doko/openjdk/openjdk-6-6b20~pre1/build/openjdk/jdk/src/solaris/hpi/export" "-I/home/doko/openjdk/openjdk-6-6b20~pre1/build/openjdk/jdk/src/share/hpi/export" -std=c++98 -pedantic -Wall -Wno-long-long -D__ARM__ -D__LINUX__ -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_REENTRANT -g -O2 -fno-strict-aliasing -MT builtin.lo -MD -MP -MF .deps/builtin.Tpo -c builtin.cpp -fPIC -DPIC -o .libs/builtin.o In file included from ../../../src/native/jni.hpp:156, from ../../../src/vm/vm.hpp:35, from ../../../src/threads/posix/condition-posix.hpp:58, from ../../../src/threads/condition.hpp:34, from ../../../src/threads/posix/thread-posix.hpp:43, from ../../../src/threads/thread.hpp:35, from ../../../src/mm/dumpmemory.hpp:225, from ../../../src/mm/memory.hpp:50, from builtin.cpp:51: /home/doko/openjdk/openjdk-6-6b20~pre1/build/openjdk/jdk/src/share/javavm/export/jni.h:782: note: the mangling of 'va_list' has changed in GCC 4.4 In file included from builtin.cpp:78: ../../../src/vm/jit/emit-common.hpp: In function 'void emit_fmove(codegendata*, int, int)': ../../../src/vm/jit/emit-common.hpp:286: error: 'M_FMOV' was not declared in this scope ../../../src/vm/jit/emit-common.hpp: In function 'void emit_dmove(codegendata*, int, int)': ../../../src/vm/jit/emit-common.hpp:297: error: 'M_DMOV' was not declared in this scope make[6]: *** [builtin.lo] Error 1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Jun 25 04:31:32 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Jun 2010 11:31:32 +0000 Subject: [Bug 514] New: shark build failure on ARM Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=514 Summary: shark build failure on ARM Product: IcedTea Version: 6-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Shark AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com icedtea6 20100624: Linking launcher... make[9]: Leaving directory `/build/buildd/openjdk-6-6b20~pre1/build/zerovm/openjdk.build/hotspot/outputdir/linux_arm_shark/product' All done. make[8]: Leaving directory `/build/buildd/openjdk-6-6b20~pre1/build/zerovm/openjdk.build/hotspot/outputdir/linux_arm_shark/product' cd linux_arm_shark/product && ./test_gamma java full version "1.6.0_20-b20" UNREACHABLE executed! Stack dump: 0. Running pass 'ARM Machine Code Emitter' on function '@"sun.nio.cs.US_ASCII$Encoder::encodeArrayLoop"' Aborted make[7]: *** [productshark] Error 134 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sat Jun 26 14:50:47 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 26 Jun 2010 21:50:47 +0000 Subject: [Bug 394] pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock/triggered after Y2038 time overflow on 32bit systems Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 xerxes at zafena.se changed: What |Removed |Added ---------------------------------------------------------------------------- Platform|32-bit |all Summary|Y2038 time overflow/pre |pre Epoch bug : |Epoch bug : |java.lang.ExceptionInInitial |java.lang.ExceptionInInitial|izerError on systems with |izerError on systems with |uninitialized |uninitialized clock |clock/triggered after Y2038 | |time overflow on 32bit | |systems ------- Comment #12 from xerxes at zafena.se 2010-06-26 21:50 ------- (In reply to comment #10) > The Y2038 bug is an issue with 32-bit systems only as time_t = pointer size. > So it affects x86 and arm, but not x86_64 where time_t will be 64-bit. This bug can still hit on both 64bit and 32bit systems since time_t are *signed*. when time_t < 0 then it refers to pre Epoch time on both 32bit and 64bit systems John wrote: >Any checks that are failing simply because currentTimeMillis() is negative are >bugs in themselves IMO (unless they really mean to check that the system clock >is later than 1970), and should be fixed separately if found. I cant agree more, and this bug are one of these cases when Java fails to launch because currentTimeMillis() returns a negative number. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Sun Jun 27 14:57:25 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 27 Jun 2010 21:57:25 +0000 Subject: /hg/icedtea: Fix circularity in extracting and patching the JAXW... Message-ID: changeset 74cfd211da47 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=74cfd211da47 author: Andrew John Hughes date: Sun Jun 27 22:57:18 2010 +0100 Fix circularity in extracting and patching the JAXWS sources. 2010-06-25 Andrew John Hughes * Makefile.am: (OPENJDK_BOOT_TREE): Set to patch- jaxws.stamp. (extract-jaxws): Don't depend circularly on OPENJDK_BOOT_TREE, just on the needed drops and OpenJDK tree. Only extract source, move patching to another target due to dependencies. (patch-jaxws): Patching segment of extract-jaxws. Depends on patch-boot and thus on the openjdk-boot tree. (clean-patch-jaxws): Cleanup for above. diffstat: 2 files changed, 79 insertions(+), 36 deletions(-) ChangeLog | 13 +++++++ Makefile.am | 102 ++++++++++++++++++++++++++++++++++++++--------------------- diffs (157 lines): diff -r 1d83df258409 -r 74cfd211da47 ChangeLog --- a/ChangeLog Fri Jun 25 10:29:19 2010 +0100 +++ b/ChangeLog Sun Jun 27 22:57:18 2010 +0100 @@ -1,3 +1,16 @@ 2010-06-25 Andrew John Hughes + + * Makefile.am: + (OPENJDK_BOOT_TREE): Set to patch-jaxws.stamp. + (extract-jaxws): Don't depend circularly on + OPENJDK_BOOT_TREE, just on the needed drops + and OpenJDK tree. Only extract source, move + patching to another target due to dependencies. + (patch-jaxws): Patching segment of extract-jaxws. + Depends on patch-boot and thus on the openjdk-boot + tree. + (clean-patch-jaxws): Cleanup for above. + 2010-06-25 Andrew John Hughes PR icedtea/512: diff -r 1d83df258409 -r 74cfd211da47 Makefile.am --- a/Makefile.am Fri Jun 25 10:29:19 2010 +0100 +++ b/Makefile.am Sun Jun 27 22:57:18 2010 +0100 @@ -251,7 +251,7 @@ OPENJDK_TREE = stamps/overlay.stamp # Target to ensure a patched OpenJDK bootstrap tree containing # Zero & Shark, any other overlays and the bootstrapping patches # is available in $(abs_top_builddir)/openjdk-boot -OPENJDK_BOOT_TREE = stamps/patch-boot.stamp +OPENJDK_BOOT_TREE = stamps/patch-jaxws.stamp # Sources list @@ -1259,45 +1259,15 @@ clean-extract-cacao: clean-cacao clean-extract-cacao: clean-cacao rm -f stamps/extract-cacao.stamp -stamps/extract-jaxws.stamp: $(OPENJDK_BOOT_TREE) \ - stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp +stamps/extract-jaxws.stamp: stamps/download-jaxws-drop.stamp \ + stamps/download-jaf-drop.stamp stamps/extract-openjdk.stamp set -e ; \ if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \ - (cd openjdk-boot/jaxws ; \ + (cd openjdk/jaxws ; \ $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \ - -Doutput.dir=$(BOOT_BUILD_OUTPUT_DIR)/jaxws \ - source ; \ - cd $(abs_top_builddir)) ; \ + -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws \ + source ; ) \ fi -if DTDTYPE_QNAME - set -e ; \ - (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws; \ - all_patches_ok=yes; \ - for p in $(JAXWS_PATCHES) ; \ - do \ - if test x$${all_patches_ok} = "xyes" \ - && echo Checking $$p \ - && $(PATCH) -l -p0 --dry-run -s -t -f \ - -F 0 < $(abs_top_srcdir)/$$p ; \ - then \ - echo Applying $$p ; \ - $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ - if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \ - >> $(abs_top_builddir)/stamps/extract-jaxws.stamp.tmp ; \ - then \ - echo "* $$(basename $$p): UNDOCUMENTED" \ - >> $(abs_top_builddir)/stamps/extract-jaxws.stamp.tmp ; \ - fi ; \ - else \ - test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \ - fi ; \ - done ; \ - if ! test x$${all_patches_ok} = "xyes"; then \ - echo ERROR patch $${all_patches_ok} FAILED! ; \ - echo WARNING make clean-extract-jaxws before retrying a fix ; \ - exit 2; \ - fi ) -endif mkdir -p stamps touch $@ @@ -1600,6 +1570,64 @@ clean-patch-boot: fi ; \ rm -f stamps/patch-boot.stamp ; \ fi + +stamps/patch-jaxws.stamp: stamps/patch-boot.stamp + mkdir -p stamps + rm -f stamps/patch-jaxws.stamp.tmp + touch stamps/patch-jaxws.stamp.tmp +if DTDTYPE_QNAME + set -e ; \ + (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws;o \ + all_patches_ok=yes; \ + for p in $(JAXWS_PATCHES) ; \ + do \ + if test x$${all_patches_ok} = "xyes" \ + && echo Checking $$p \ + && $(PATCH) -l -p0 --dry-run -s -t -f \ + -F 0 < $(abs_top_srcdir)/$$p ; \ + then \ + echo Applying $$p ; \ + $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \ + if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \ + >> $(abs_top_builddir)/stamps/patch-jaxws.stamp.tmp ; \ + then \ + echo "* $$(basename $$p): UNDOCUMENTED" \ + >> $(abs_top_builddir)/stamps/patch-jaxws.stamp.tmp ; \ + fi ; \ + else \ + test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \ + fi ; \ + done ; \ + if ! test x$${all_patches_ok} = "xyes"; then \ + echo ERROR patch $${all_patches_ok} FAILED! ; \ + echo WARNING make clean-patch-jaxws before retrying a fix ; \ + exit 2; \ + fi ) +endif + mv stamps/patch-jaxws.stamp.tmp stamps/patch-jaxws.stamp + +clean-patch-jaxws: +if DTDTYPE_QNAME + if [ -e stamps/patch-jaxws.stamp ] ; then \ + all_patches_ok=yes; \ + cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws; \ + for p in $(JAXWS_PATCHES) ; \ + do \ + echo Checking $$p ; \ + if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \ + then \ + echo Reverting $$p ; \ + $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \ + else \ + all_patches_ok=no ; \ + fi ; \ + done ; \ + if ! test x$${all_patches_ok} = "xyes" ; then \ + echo "WARNING Not all patches reverted cleanly" ; \ + fi ; \ + fi +endif + rm -f stamps/patch-jaxws.stamp # Bootstrap Directory Targets # =========================== @@ -2576,6 +2604,8 @@ patch-boot: stamps/patch-boot.stamp patch-fsg: stamps/patch-fsg.stamp +patch-jaxws: stamps/patch-jaxws.stamp + plugin: stamps/plugin.stamp plugin-tests: stamps/plugin-tests.stamp From evgueni.gordienko at motorola.com Sun Jun 27 16:22:27 2010 From: evgueni.gordienko at motorola.com (egordien) Date: Sun, 27 Jun 2010 16:22:27 -0700 (PDT) Subject: Building Headless JRE in OpenJDK Message-ID: <29008095.post@talk.nabble.com> Hi, Any pointers how to build headless jre in OpenJDK (for PowerPC)? Thanks, Evgueni -- View this message in context: http://old.nabble.com/Building-Headless-JRE-in-OpenJDK-tp29008095p29008095.html Sent from the OpenJDK Distribution-specific Packaging mailing list archive at Nabble.com. From adamcrume at hotmail.com Sun Jun 27 21:45:35 2010 From: adamcrume at hotmail.com (Adam Crume) Date: Mon, 28 Jun 2010 04:45:35 +0000 (UTC) Subject: Regression test Test4200310.sh and class duplication in rt.jar =?utf-8?b?YW5kCWNoYXJzZXRzLmphcg==?= References: <4BE2E8A0.7090902@redhat.com> Message-ID: Pavel Tisnovsky writes: > I noticed that the regression test Test42000310.sh regularly fails > because it found duplicate classes stored in archives rt.jar and > charsets.jar. I am not sure if this is a bug in OpenJDK6 or IcedTea, I > suppose it's IcedTea issue. There are the list of duplicate classes > (they are all from the same package, but this package contains more > classes, over 400, only part of this package is "duplicated"): I'm having the same issue, and I'm testing OpenJDK 7 without IcedTea. From bugzilla-daemon at icedtea.classpath.org Mon Jun 28 01:55:56 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Jun 2010 08:55:56 +0000 Subject: [Bug 394] pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock/triggered after Y2038 time overflow on 32bit systems Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #13 from aph at redhat.com 2010-06-28 08:55 ------- > (In reply to comment #10) >> The Y2038 bug is an issue with 32-bit systems only as time_t = pointer size. >> So it affects x86 and arm, but not x86_64 where time_t will be 64-bit. > > This bug can still hit on both 64bit and 32bit systems since time_t are > *signed*. > > when time_t < 0 then it refers to pre Epoch time on both 32bit and 64bit > systems This doesn't make any sense. currentTimeMillis() returns the current time in milliseconds. The current time is not before 1970, and never will be. > John wrote: >> Any checks that are failing simply because currentTimeMillis() is >> negative are bugs in themselves IMO (unless they really mean to >> check that the system clock is later than 1970), and should be >> fixed separately if found. > > I cant agree more, and this bug are one of these cases when Java fails to > launch because currentTimeMillis() returns a negative number. If currentTimeMillis() returns a negative number (on a 64-bit system), the system is not Java compatible. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Jun 28 03:00:33 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Jun 2010 10:00:33 +0000 Subject: [Bug 394] pre Epoch bug : java.lang.ExceptionInInitializerError on systems with uninitialized clock/triggered after Y2038 time overflow on 32bit systems Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #14 from xerxes at zafena.se 2010-06-28 10:00 ------- (In reply to comment #13) > > (In reply to comment #10) > >> The Y2038 bug is an issue with 32-bit systems only as time_t = pointer size. > >> So it affects x86 and arm, but not x86_64 where time_t will be 64-bit. > > > > This bug can still hit on both 64bit and 32bit systems since time_t are > > *signed*. > > > > when time_t < 0 then it refers to pre Epoch time on both 32bit and 64bit > > systems > > This doesn't make any sense. currentTimeMillis() returns the current > time in milliseconds. The current time is not before 1970, and never > will be. > the sign bit can get in several ways. 1. On newly manufactured hardware it are a random chance that the sign bit are set and the hardware will fail to launch java if it are. I have hit this bug several times during 2009-2010 by simply trying to boot up any java application on newly manufactured embedded hardware where the systemclock never have been set to a sane value. see comment #0 2. system bootup/resume from suspend after a clock battery failure. this can happen on any system with a clock battery that will eventually fail over time. 3. systems without a clock battery. 4. being trapped in the past by a java-timemachine bootup failure after jumping back to pre 1970 time. please dont try java-timemachine jumps at home without fixing this bug first. 5. fluke, emp wave, etc etc, that flips the bit. All of these errors above can of course get corrected in software... but not in software written in Java due to this JVM bug! > > John wrote: > > >> Any checks that are failing simply because currentTimeMillis() is > >> negative are bugs in themselves IMO (unless they really mean to > >> check that the system clock is later than 1970), and should be > >> fixed separately if found. > > > > I cant agree more, and this bug are one of these cases when Java fails to > > launch because currentTimeMillis() returns a negative number. > > If currentTimeMillis() returns a negative number (on a 64-bit system), the > system is not Java compatible. > Why are it not Java compatible if it returns a negative number? Java doc only states: "Returns: the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC." http://java.sun.com/javase/6/docs/api/java/lang/System.html#currentTimeMillis%28%29 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From andrew at icedtea.classpath.org Mon Jun 28 06:18:26 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 28 Jun 2010 13:18:26 +0000 Subject: /hg/icedtea6: Drop VisualVM, now maintained independently of Ice... Message-ID: changeset fa1c6854f1e6 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fa1c6854f1e6 author: Andrew John Hughes date: Mon Jun 28 14:18:16 2010 +0100 Drop VisualVM, now maintained independently of IcedTea. 2010-06-25 Andrew John Hughes Remove VisualVM support, now maintained at http://icedtea.classpath.org/hg/visualvm * Makefile.am: Remove VisualVM targets, references and aliases. (NETBEANS_PROFILER_URL): Removed. (NETBEANS_PROFILER_SRC_ZIP): Likewise. (NETBEANS_PROFILER_MD5SUM): Likewise. (VISUALVM_URL): Likewise. (VISUALVM_SRC_ZIP): Likewise. (VISUALVM_MD5SUM): Likewise. (EXTRA_DIST): Remove visualvm.desktop. (distclean-local): Remove visualvm and netbeans deletion. (.PHONY): Remove clean-visualvm and clean-nbplatform targets. (download): Don't download VisualVM. (clean-download): Don't remove the VisualVM and NetBeans zips. (extract): Don't extract VisualVM and NetBeans. (icedtea): Don't depend on visualvm.stamp and remove post-install measures. (icedtea-debug): Likewise. (nbplatform): Removed. (visualvm): Removed. * acinclude.m4: Remove VisualVM-related macros. (FIND_NETBEANS): Removed. * configure.ac: Remove --with-netbeans-home and --enable-visualvm options. Don't invoke VisualVM macros. * visualvm.desktop: Removed. diffstat: 5 files changed, 38 insertions(+), 229 deletions(-) ChangeLog | 32 ++++++++++ Makefile.am | 163 +----------------------------------------------------- acinclude.m4 | 32 ---------- configure.ac | 31 ---------- visualvm.desktop | 9 -- diffs (410 lines): diff -r 2abd775a9d46 -r fa1c6854f1e6 ChangeLog --- a/ChangeLog Fri Jun 25 12:24:35 2010 +0200 +++ b/ChangeLog Mon Jun 28 14:18:16 2010 +0100 @@ -1,3 +1,35 @@ 2010-06-25 Matthias Klose + + Remove VisualVM support, now maintained at + http://icedtea.classpath.org/hg/visualvm + * Makefile.am: + Remove VisualVM targets, references and aliases. + (NETBEANS_PROFILER_URL): Removed. + (NETBEANS_PROFILER_SRC_ZIP): Likewise. + (NETBEANS_PROFILER_MD5SUM): Likewise. + (VISUALVM_URL): Likewise. + (VISUALVM_SRC_ZIP): Likewise. + (VISUALVM_MD5SUM): Likewise. + (EXTRA_DIST): Remove visualvm.desktop. + (distclean-local): Remove visualvm and netbeans deletion. + (.PHONY): Remove clean-visualvm and clean-nbplatform targets. + (download): Don't download VisualVM. + (clean-download): Don't remove the VisualVM and NetBeans zips. + (extract): Don't extract VisualVM and NetBeans. + (icedtea): Don't depend on visualvm.stamp and remove post-install + measures. + (icedtea-debug): Likewise. + (nbplatform): Removed. + (visualvm): Removed. + * acinclude.m4: + Remove VisualVM-related macros. + (FIND_NETBEANS): Removed. + * configure.ac: + Remove --with-netbeans-home and + --enable-visualvm options. Don't invoke + VisualVM macros. + * visualvm.desktop: Removed. + 2010-06-25 Matthias Klose Fix shark build failures, update for latest HotSpot taken from diff -r 2abd775a9d46 -r fa1c6854f1e6 Makefile.am --- a/Makefile.am Fri Jun 25 12:24:35 2010 +0200 +++ b/Makefile.am Mon Jun 28 14:18:16 2010 +0100 @@ -10,14 +10,6 @@ CACAO_BASE_URL = http://mips.complang.tu CACAO_BASE_URL = http://mips.complang.tuwien.ac.at CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 - -NETBEANS_PROFILER_MD5SUM = 40dd3183b345737ca22162d164c2d5a2 -NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/149581/ -NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68.tar.gz - -VISUALVM_MD5SUM = f1e2525ddcd5fdf97bcf891d715c08ff -VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/ -VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724 JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip @@ -137,12 +129,6 @@ LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/IcedTeaPlugin.so \ stamps/liveconnect-dist.stamp -endif - -if WITH_VISUALVM -NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1) -else -NB_PLATFORM= endif if ENABLE_PULSE_JAVA @@ -510,7 +496,7 @@ EXTRA_DIST = generated $(NETX_SRCDIR) \ $(abs_top_srcdir)/patches/* \ contrib ports \ extra overlays \ - javaws.png javaws.desktop visualvm.desktop \ + javaws.png javaws.desktop \ jconsole.desktop policytool.desktop \ test/jtreg \ HACKING pulseaudio fsg.sh \ @@ -545,8 +531,6 @@ distclean-local: clean-copy clean-jtreg rm -rf $(ECJ_BUILD_OUTPUT_DIR) rm -rf openjdk rm -rf $(BUILD_OUTPUT_DIR) - rm -rf visualvm - rm -rf netbeans if BUILD_CACAO rm -rf cacao @@ -566,8 +550,7 @@ install: clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \ clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \ clean-icedtea icedtea-against-icedtea clean-icedtea-ecj \ - clean-tools-jar clean-visualvm clean-nbplatform \ - clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) hotspot \ + clean-tools-jar clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) hotspot \ hotspot-helper clean-extra clean-jtreg clean-jtreg-reports env: @@ -772,29 +755,6 @@ endif endif endif endif -if WITH_VISUALVM - if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \ - then \ - mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \ - -O $(NETBEANS_PROFILER_SRC_ZIP) ; \ - fi - - if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(VISUALVM_SRC_ZIP) ] ; \ - then \ - mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) \ - -O $(VISUALVM_SRC_ZIP) ; \ - fi -endif mkdir -p stamps touch stamps/download.stamp @@ -802,10 +762,6 @@ clean-download: clean-drops clean-downlo clean-download: clean-drops clean-download-cacao rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) -if WITH_VISUALVM - rm -f $(VISUALVM_SRC_ZIP) - rm -f $(NETBEANS_PROFILER_SRC_ZIP) -endif #FIXME (meta): Split into multiple targets stamps/extract.stamp: stamps/extract-openjdk.stamp @@ -848,20 +804,6 @@ else fi endif endif -endif -if WITH_VISUALVM - set -e ; \ - if ! test -d netbeans ; \ - then \ - mkdir netbeans ; \ - $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \ - fi - - set -e ; \ - if ! test -d visualvm ; \ - then \ - $(TAR) xf $(VISUALVM_SRC_ZIP) ; \ - fi endif set -e ; \ if [ ! -e $(abs_top_builddir)/generated ]; then \ @@ -1223,8 +1165,8 @@ clean-bootstrap-directory-symlink: # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp \ - stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp + extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ + stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1250,26 +1192,6 @@ if ENABLE_PULSE_JAVA $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) -endif -if WITH_VISUALVM - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \ - visualvm/launcher/visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - cp visualvm/launcher/visualvm.conf \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - echo visualvm >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - echo profiler3 >> \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - cp -r visualvm/build/cluster/* \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ @@ -1315,8 +1237,8 @@ endif stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp \ - stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp + extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ + stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1342,26 +1264,6 @@ if ENABLE_PULSE_JAVA $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) -endif -if WITH_VISUALVM - mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \ - visualvm/launcher/visualvm >> \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \ - cp visualvm/launcher/visualvm.conf \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \ - echo visualvm >> \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - echo profiler3 >> \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \ - cp -r visualvm/build/cluster/* \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \ - cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm endif cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ @@ -1717,57 +1619,6 @@ endif mkdir -p stamps touch stamps/rewrite-rhino.stamp -# VisualVM - -stamps/nbplatform.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) stamps/extract.stamp -if WITH_VISUALVM - cd netbeans ; \ - rm nbbuild/external/binaries-list ; \ - mkdir -p ./nbbuild/netbeans_visualvm/ ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ ./nbbuild/netbeans_visualvm/$(NB_PLATFORM) ; \ - ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \ - if ! (uname -a | grep x86_64) ; then \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \ - buildscript=./buildnative-linux.sh ; \ - else \ - mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ - mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ - buildscript=./buildnative-linux64.sh ; \ - fi ; \ - cd lib.profiler/native/build ; \ - JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \ - $$buildscript ; \ - cd ../../.. ; \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \ - -f nbbuild/build.xml bootstrap ; \ - for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler profiler.oql ; do \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1 \ - -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \ - -f $$dir/build.xml ; \ - done -endif - mkdir -p stamps - touch $@ - -clean-nbplatform: - rm -rf netbeans - rm -f stamps/nbplatform.stamp - -stamps/visualvm.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/download.stamp \ - stamps/replace-hotspot.stamp stamps/nbplatform.stamp -if WITH_VISUALVM - cd visualvm ; \ - ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans_visualvm netbeans ; \ - JAVA_HOME=$(ICEDTEA_HOME) $(ANT) build -endif - mkdir -p stamps - touch $@ - -clean-visualvm: - rm -rf visualvm - rm -f stamps/visualvm.stamp - # CACAO stamps/cacao.stamp: $(OPENJDK_TREE) stamps/rt.stamp @@ -2159,5 +2010,3 @@ rt-class-files: stamps/rt-class-files.st rt-class-files: stamps/rt-class-files.stamp tools-jar: stamps/tools.stamp - -visualvm: stamps/visualvm.stamp diff -r 2abd775a9d46 -r fa1c6854f1e6 acinclude.m4 --- a/acinclude.m4 Fri Jun 25 12:24:35 2010 +0200 +++ b/acinclude.m4 Mon Jun 28 14:18:16 2010 +0100 @@ -661,38 +661,6 @@ AC_DEFUN([FIND_XERCES2_JAR], fi AC_MSG_RESULT(${XERCES2_JAR}) AC_SUBST(XERCES2_JAR) -]) - -AC_DEFUN([FIND_NETBEANS], -[ - AC_MSG_CHECKING([if the location of NetBeans is specified]) - AC_ARG_WITH([netbeans], - [AS_HELP_STRING(--with-netbeans,specify location of netbeans)], - [ - if test "x${withval}" = "xyes"; then - NETBEANS=no - else - NETBEANS="${withval}" - fi - ], - [ - NETBEANS=no - ]) - AC_MSG_RESULT(${NETBEANS}) - if ! test -f "${NETBEANS}"; then - if test "x${NETBEANS}" = "xno"; then - NETBEANS= - else - AC_PATH_PROG(NETBEANS, "${NETBEANS}") - fi - fi - if test -z "${NETBEANS}"; then - AC_PATH_PROG(NETBEANS, "netbeans") - fi - if test -z "${NETBEANS}"; then - AC_MSG_ERROR("NetBeans was not found.") - fi - AC_SUBST(NETBEANS) ]) AC_DEFUN([FIND_RHINO_JAR], diff -r 2abd775a9d46 -r fa1c6854f1e6 configure.ac --- a/configure.ac Fri Jun 25 12:24:35 2010 +0200 +++ b/configure.ac Mon Jun 28 14:18:16 2010 +0100 @@ -53,24 +53,6 @@ IT_CP_SUPPORTS_REFLINK IT_CP_SUPPORTS_REFLINK IT_CAN_HARDLINK_TO_SOURCE_TREE -AC_MSG_CHECKING([for a NetBeans installation]) -AC_ARG_WITH([netbeans-home], - [AS_HELP_STRING([--with-netbeans-home], - [NetBeans home directory (default is /usr/share/netbeans)])], - [ - if test "x${withval}" = x - then - SYSTEM_NETBEANS_DIR=/usr/share/netbeans - else - SYSTEM_NETBEANS_DIR=${withval} - fi - ], - [ - SYSTEM_NETBEANS_DIR=/usr/share/netbeans - ]) -AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}]) -AC_SUBST(SYSTEM_NETBEANS_DIR) - AC_MSG_CHECKING([for an Ant home directory]) AC_ARG_WITH([ant-home], [AS_HELP_STRING([--with-ant-home], @@ -88,14 +70,6 @@ AC_ARG_WITH([ant-home], ]) AC_SUBST(SYSTEM_ANT_DIR) AC_MSG_RESULT(${SYSTEM_ANT_DIR}) - -AC_MSG_CHECKING([whether to build VisualVM]) -AC_ARG_ENABLE([visualvm], - [AS_HELP_STRING([--enable-visualvm], - [Enable compilation of visualvm.])], - [enable_visualvm="${enableval}"], [enable_visualvm="no"]) -AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes") -AC_MSG_RESULT(${enable_visualvm}) AC_MSG_CHECKING([whether to include PulseAudio support]) AC_ARG_ENABLE([pulse-java], @@ -216,11 +190,6 @@ IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [s IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit]) IT_GETDTDTYPE_CHECK IT_CHECK_XULRUNNER_VERSION - -if test "x${enable_visualvm}" = "xyes" -then - FIND_NETBEANS -fi dnl pkgconfig cannot be used to find these headers and libraries. AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] diff -r 2abd775a9d46 -r fa1c6854f1e6 visualvm.desktop --- a/visualvm.desktop Fri Jun 25 12:24:35 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=OpenJDK VisualVM -Comment=Integrates commandline JDK tools and profiling capabilites. -Exec=/usr/bin/jvisualvm -Icon=java -Terminal=false -Type=Application -Categories=Development;Java; -Version=1.0 From andrew at icedtea.classpath.org Mon Jun 28 06:20:54 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 28 Jun 2010 13:20:54 +0000 Subject: /hg/icedtea: Clone build directory if it exists so that JAXWS so... Message-ID: changeset 60b7879c73d7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=60b7879c73d7 author: Andrew John Hughes date: Mon Jun 28 14:20:49 2010 +0100 Clone build directory if it exists so that JAXWS sources are available to the bootstrap build. 2010-06-28 Andrew John Hughes * Makefile.am: (clone-boot): Clone build directory too if it exists. (patch-jaxws): Fix typo. diffstat: 2 files changed, 12 insertions(+), 2 deletions(-) ChangeLog | 9 ++++++++- Makefile.am | 5 ++++- diffs (38 lines): diff -r 74cfd211da47 -r 60b7879c73d7 ChangeLog --- a/ChangeLog Sun Jun 27 22:57:18 2010 +0100 +++ b/ChangeLog Mon Jun 28 14:20:49 2010 +0100 @@ -1,4 +1,11 @@ 2010-06-25 Andrew John Hughes +2010-06-28 Andrew John Hughes + + * Makefile.am: + (clone-boot): Clone build directory too if + it exists. + (patch-jaxws): Fix typo. + +2010-06-27 Andrew John Hughes * Makefile.am: (OPENJDK_BOOT_TREE): Set to patch-jaxws.stamp. diff -r 74cfd211da47 -r 60b7879c73d7 Makefile.am --- a/Makefile.am Sun Jun 27 22:57:18 2010 +0100 +++ b/Makefile.am Mon Jun 28 14:20:49 2010 +0100 @@ -1512,6 +1512,9 @@ stamps/clone-boot.stamp: $(OPENJDK_TREE) stamps/clone-boot.stamp: $(OPENJDK_TREE) if ! test -d openjdk-boot ; then \ cp -pPRl openjdk openjdk-boot ; \ + if [ -e $(BUILD_OUTPUT_DIR) ] ; then \ + cp -pPRl $(BUILD_OUTPUT_DIR) $(BOOT_BUILD_OUTPUT_DIR) ; \ + fi ; \ fi mkdir -p stamps touch $@ @@ -1577,7 +1580,7 @@ stamps/patch-jaxws.stamp: stamps/patch-b touch stamps/patch-jaxws.stamp.tmp if DTDTYPE_QNAME set -e ; \ - (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws;o \ + (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws; \ all_patches_ok=yes; \ for p in $(JAXWS_PATCHES) ; \ do \ From bugzilla-daemon at icedtea.classpath.org Mon Jun 28 07:30:28 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Jun 2010 14:30:28 +0000 Subject: [Bug 394] pre Epoch bug : java.lang.ExceptionInInitializerError on systems with time set before January 1, 1970 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 jon.vanalten at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|pre Epoch bug : |pre Epoch bug : |java.lang.ExceptionInInitial|java.lang.ExceptionInInitial |izerError on systems with |izerError on systems with |uninitialized |time set before January 1, |clock/triggered after Y2038 |1970 |time overflow on 32bit | |systems | ------- Comment #15 from jon.vanalten at redhat.com 2010-06-28 14:30 ------- I'm gonna have to agree with Xerces here. More below. > > > > This doesn't make any sense. currentTimeMillis() returns the current > > time in milliseconds. The current time is not before 1970, and never > > will be. > > Current *real world* time will not be before 1970. But, should Java users need to guarantee that their system clock is accurately set to real world time? If there is some documented compatibility requirement please advise. > > the sign bit can get in several ways. > Another potentially obscure way: if someone wishes to run some sort of simulation that begins before 1970. > > All of these errors above can of course get corrected in software... > but not in software written in Java due to this JVM bug! Exactly. > > > John wrote: > > > > >> Any checks that are failing simply because currentTimeMillis() is > > >> negative are bugs in themselves IMO (unless they really mean to > > >> check that the system clock is later than 1970), and should be > > >> fixed separately if found. > > > > > > I cant agree more, and this bug are one of these cases when Java fails to > > > launch because currentTimeMillis() returns a negative number. > > > > If currentTimeMillis() returns a negative number (on a 64-bit system), the > > system is not Java compatible. > > > > Why are it not Java compatible if it returns a negative number? > Java doc only states: > "Returns: > the difference, measured in milliseconds, between the current time and > midnight, January 1, 1970 UTC." > http://java.sun.com/javase/6/docs/api/java/lang/System.html#currentTimeMillis%28%29 > Yes. The use of a signed long return value necessarily imposes a range of values, but the API language does not further restrict that range. Anyhow, I've posted upstream about this, hopefully some upstream devs will weigh in on this. http://mail.openjdk.java.net/pipermail/core-libs-dev/2010-June/004526.html Also I'm changing the Summary to reflect the actual issue in this bug. This is not about 2038 overflow at all. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Jun 28 08:36:34 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Jun 2010 15:36:34 +0000 Subject: [Bug 394] pre Epoch bug : java.lang.ExceptionInInitializerError on systems with time set before January 1, 1970 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #16 from aph at redhat.com 2010-06-28 15:36 ------- > Why are it not Java compatible if it returns a negative number? Because the current time is after 1970, therefore any currentTimeMillis() that returns a negative number is incorrect. > But, should Java users need > to guarantee that their system clock is accurately set to real world time? I can't see any other way to meet the spec. This is a bug in the underlying OS, that should have the clock set during bootup. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From omajid at redhat.com Mon Jun 28 16:47:41 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 28 Jun 2010 19:47:41 -0400 Subject: [RFC] Netx: clean up path sanitization code In-Reply-To: References: <4C2381F7.9030205@redhat.com> Message-ID: <4C29349D.1050605@redhat.com> On 06/24/2010 07:37 PM, Andrew John Hughes wrote: > On 24 June 2010 17:04, Omair Majid wrote: >> Hi, >> >> The attached patch does a little bit of refactoring, moving path >> manipulation functions to a common location. >> >> Any comments? >> >> Cheers, >> Omair >> > > Looks good. It's more than just cleanup though, as the behaviour of > sanitizeFileName has changed. It now only replaces ILLEGAL_CHARS and > not all characters that aren't in the legal set. > Yes, it is more than cleanup. There were two conflicting file sanitization schemes. One (which sanitized path names) used a blacklisting approach and only disallowed certain characters. The other (which sanitized file names) used a whitelisting approach and disallowed everything except alphanumeric characters. I wrote this code. For the sake of consistency, we want both sanitization schemes to return the same file name. There is a problem with the whitelisting approach: it can not deal with international file names. Hence I am making both the functions use the black listing approach. Please let me know if there are any issues I may have missed. > I'd also make the two arrays private and final. > Done Cheers, Omair -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-jnlp-filename-sanitization.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100628/6fb27152/icedtea6-jnlp-filename-sanitization.patch From bugzilla-daemon at icedtea.classpath.org Tue Jun 29 01:53:41 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Jun 2010 08:53:41 +0000 Subject: [Bug 514] shark build failure on ARM Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=514 ------- Comment #1 from gbenson at redhat.com 2010-06-29 08:53 ------- What LLVM is this? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 29 01:54:55 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Jun 2010 08:54:55 +0000 Subject: [Bug 514] shark build failure on ARM Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=514 ------- Comment #2 from doko at ubuntu.com 2010-06-29 08:54 ------- 2.7 release -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 29 02:12:57 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Jun 2010 09:12:57 +0000 Subject: [Bug 514] shark build failure on ARM Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=514 ------- Comment #3 from xerxes at zafena.se 2010-06-29 09:12 ------- are you using the ARM or THUMB llvm backend? If you are using the THUMB backend then you are probably hitting LLVM PR 6223 http://llvm.org/bugs/show_bug.cgi?id=6223 If you are using the ARM backend and have enabled -mattr=+neon then you are probably hitting LLVM PR 6561 http://llvm.org/bugs/show_bug.cgi?id=6561 in both cases you hit the unreachanble because the llvm jit cant jit thumb/neon instructions. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Jun 29 08:42:48 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Jun 2010 15:42:48 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #11 from asu at redhat.com 2010-06-29 15:42 ------- It's only crashing for me when i use the following methods to draw it. DrawString DrawChar (this one only after I switch around to other "working" draw methods) TextLayout.draw TextLayout.getOutline + draw DrawByte does not display anything both the vector ones seem to work fine. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Tue Jun 29 09:58:09 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 29 Jun 2010 17:58:09 +0100 Subject: [RFC] Netx: clean up path sanitization code In-Reply-To: <4C29349D.1050605@redhat.com> References: <4C2381F7.9030205@redhat.com> <4C29349D.1050605@redhat.com> Message-ID: On 29 June 2010 00:47, Omair Majid wrote: > On 06/24/2010 07:37 PM, Andrew John Hughes wrote: >> >> On 24 June 2010 17:04, Omair Majid ?wrote: >>> >>> Hi, >>> >>> The attached patch does a little bit of refactoring, moving path >>> manipulation functions to a common location. >>> >>> Any comments? >>> >>> Cheers, >>> Omair >>> >> >> Looks good. ?It's more than just cleanup though, as the behaviour of >> sanitizeFileName has changed. ?It now only replaces ILLEGAL_CHARS and >> not all characters that aren't in the legal set. >> > > Yes, it is more than cleanup. There were two conflicting file sanitization > schemes. One (which sanitized path names) used a blacklisting approach and > only disallowed certain characters. The other (which sanitized file names) > used a whitelisting approach and disallowed everything except alphanumeric > characters. I wrote this code. For the sake of consistency, we want both > sanitization schemes to return the same file name. There is a problem with > the whitelisting approach: it can not deal with international file names. > Hence I am making both the functions use the black listing approach. Please > let me know if there are any issues I may have missed. > Yes, I understood the need for and agree with the change. But you do need to make sure it's mentioned clearly in the ChangeLog... :-) >> I'd also make the two arrays private and final. >> > > Done > > Cheers, > Omair > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dbhole at redhat.com Tue Jun 29 11:05:26 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 29 Jun 2010 14:05:26 -0400 Subject: [RFC] Netx: clean up path sanitization code In-Reply-To: References: <4C2381F7.9030205@redhat.com> <4C29349D.1050605@redhat.com> Message-ID: <20100629180526.GC25837@redhat.com> * Andrew John Hughes [2010-06-29 12:58]: > On 29 June 2010 00:47, Omair Majid wrote: > > On 06/24/2010 07:37 PM, Andrew John Hughes wrote: > >> > >> On 24 June 2010 17:04, Omair Majid ?wrote: > >>> > >>> Hi, > >>> > >>> The attached patch does a little bit of refactoring, moving path > >>> manipulation functions to a common location. > >>> > >>> Any comments? > >>> > >>> Cheers, > >>> Omair > >>> > >> > >> Looks good. ?It's more than just cleanup though, as the behaviour of > >> sanitizeFileName has changed. ?It now only replaces ILLEGAL_CHARS and > >> not all characters that aren't in the legal set. > >> > > > > Yes, it is more than cleanup. There were two conflicting file sanitization > > schemes. One (which sanitized path names) used a blacklisting approach and > > only disallowed certain characters. The other (which sanitized file names) > > used a whitelisting approach and disallowed everything except alphanumeric > > characters. I wrote this code. For the sake of consistency, we want both > > sanitization schemes to return the same file name. There is a problem with > > the whitelisting approach: it can not deal with international file names. > > Hence I am making both the functions use the black listing approach. Please > > let me know if there are any issues I may have missed. > > > > Yes, I understood the need for and agree with the change. But you do > need to make sure it's mentioned clearly in the ChangeLog... :-) > Agreed here as well. Assuming it is tested, please commit. Cheers, Deepak > >> I'd also make the two arrays private and final. > >> > > > > Done > > > > Cheers, > > Omair > > > > > > -- > Andrew :-) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dbhole at redhat.com Tue Jun 29 11:06:26 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 29 Jun 2010 14:06:26 -0400 Subject: [RFC] Netx: some native libraries are not found In-Reply-To: <4C1F7805.5070300@redhat.com> References: <4C1F7805.5070300@redhat.com> Message-ID: <20100629180625.GD25837@redhat.com> * Omair Majid [2010-06-21 10:33]: > Hi, > > There is a bug in the current version of Netx that fails to find > some native libraries [1][2]. > > In the current implementation of Netx, one classloader is created > per JNLP file; for JNLP files loaded as extensions, the classloaders > share information about where to find resources. Unfortunately, they > do not share any information about where to find native libraries. > This makes Web Start applications with extensions that use native > libraries fail. The proposed patch [3] fixes this. > > Any comments concerns? Should I go ahead and commit this fix? > Patch looks good to me. Assuming you have tested it, please go ahead and commit. Cheers, Deepak > Cheers, > Omair > > > [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=507 > [2] https://bugzilla.redhat.com/show_bug.cgi?id=526247 > [3] http://icedtea.classpath.org/bugzilla/attachment.cgi?id=368 From dbhole at redhat.com Tue Jun 29 11:07:48 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 29 Jun 2010 14:07:48 -0400 Subject: [RFC] Netx: make the single instance server thread a daemon In-Reply-To: <4C20FF37.8010708@redhat.com> References: <4C20FF37.8010708@redhat.com> Message-ID: <20100629180748.GE25837@redhat.com> * Omair Majid [2010-06-22 14:22]: > Hi, > > The attached thread makes the single instance server thread in Netx > a daemon thread. This allows the JVM to shutdown even if the server > is the only thread running. The unexpected shutdown of the server > should not cause any problems - the only cleanup the server does is > shutting down the port. > > Ok to commit? > Yep, looks good to me. please go ahead and commit. Cheers, Deepak > Cheers, > Omair > diff -r 507d3308f9c9 netx/net/sourceforge/jnlp/services/XSingleInstanceService.java > --- a/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Tue Jun 22 18:15:40 2010 +0100 > +++ b/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Tue Jun 22 14:14:21 2010 -0400 > @@ -145,14 +145,21 @@ > } > > /** > - * Start the listening server to accept arguments from new isntances of > + * Start the listening server to accept arguments from new instances of > * applications > * > * @param lockFile > + * the {@link SingleInstanceLock} that the server should use > */ > private void startListeningServer(SingleInstanceLock lockFile) { > SingleInstanceServer server = new SingleInstanceServer(lockFile); > - new Thread(server).start(); > + Thread serverThread = new Thread(server); > + /* > + * mark as daemon so the JVM can shutdown if the server is the only > + * thread running > + */ > + serverThread.setDaemon(true); > + serverThread.start(); > } > > /** From omajid at redhat.com Tue Jun 29 13:34:57 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 29 Jun 2010 16:34:57 -0400 Subject: [RFC] Netx: some native libraries are not found In-Reply-To: <20100629180625.GD25837@redhat.com> References: <4C1F7805.5070300@redhat.com> <20100629180625.GD25837@redhat.com> Message-ID: <4C2A58F1.7010305@redhat.com> On 06/29/2010 02:06 PM, Deepak Bhole wrote: > * Omair Majid [2010-06-21 10:33]: >> Hi, >> >> There is a bug in the current version of Netx that fails to find >> some native libraries [1][2]. >> >> In the current implementation of Netx, one classloader is created >> per JNLP file; for JNLP files loaded as extensions, the classloaders >> share information about where to find resources. Unfortunately, they >> do not share any information about where to find native libraries. >> This makes Web Start applications with extensions that use native >> libraries fail. The proposed patch [3] fixes this. >> >> Any comments concerns? Should I go ahead and commit this fix? >> > > Patch looks good to me. Assuming you have tested it, please go ahead and > commit. > On furthur testing, I found an issue with the patch I had posted. I had to change the check for extLoader and baseLoader from if (baseLoader != null) to if (baseLoader != null && baseLoader != loader) which makes sense to me: adding urls and native directories repeatedly to the same loader has no point. Ok to commit? Cheers, Omair -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: commit-fc215b8.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100629/a7cdb476/commit-fc215b8.patch From andrew at icedtea.classpath.org Tue Jun 29 16:48:05 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 29 Jun 2010 23:48:05 +0000 Subject: /hg/icedtea6: Fix debug build by ensuring specified output direc... Message-ID: changeset b434625f3fd8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b434625f3fd8 author: Andrew John Hughes date: Wed Jun 30 00:47:55 2010 +0100 Fix debug build by ensuring specified output directory is used as intended. 2010-06-28 Andrew John Hughes * Makefile.am: (ICEDTEA_DEBUG_BUILD_TARGET): Don't add debug suffix, OpenJDK makefile already does this. * patches/debug-dir.patch: Fix OpenJDK Makefile to just add the debug suffix and not move it to ../$(OS)-$(ARCH)-debug. diffstat: 3 files changed, 44 insertions(+), 4 deletions(-) ChangeLog | 9 +++++++++ Makefile.am | 8 ++++---- patches/debug-dir.patch | 31 +++++++++++++++++++++++++++++++ diffs (79 lines): diff -r fa1c6854f1e6 -r b434625f3fd8 ChangeLog --- a/ChangeLog Mon Jun 28 14:18:16 2010 +0100 +++ b/ChangeLog Wed Jun 30 00:47:55 2010 +0100 @@ -1,3 +1,12 @@ 2010-06-25 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_DEBUG_BUILD_TARGET): Don't add + debug suffix, OpenJDK makefile already does this. + * patches/debug-dir.patch: Fix OpenJDK + Makefile to just add the debug suffix and + not move it to ../$(OS)-$(ARCH)-debug. + 2010-06-25 Andrew John Hughes Remove VisualVM support, now maintained at diff -r fa1c6854f1e6 -r b434625f3fd8 Makefile.am --- a/Makefile.am Mon Jun 28 14:18:16 2010 +0100 +++ b/Makefile.am Wed Jun 30 00:47:55 2010 +0100 @@ -155,12 +155,11 @@ else MEMORY_LIMIT = endif -ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(DEBUG_BUILD_OUTPUT_DIR)" if WITH_CACAO ICEDTEA_BUILD_TARGET=jdk_only - ICEDTEA_DEBUG_BUILD_TARGET += jdk_fastdebug_only + ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only else - ICEDTEA_DEBUG_BUILD_TARGET += debug_build + ICEDTEA_DEBUG_BUILD_TARGET = debug_build endif # FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap @@ -289,7 +288,8 @@ ICEDTEA_PATCHES = \ patches/icedtea-jtreg-httpTest.patch \ patches/arm.patch \ patches/shark-debug-option.patch \ - patches/openjdk/6961732.patch + patches/openjdk/6961732.patch \ + patches/debug-dir.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r fa1c6854f1e6 -r b434625f3fd8 patches/debug-dir.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/debug-dir.patch Wed Jun 30 00:47:55 2010 +0100 @@ -0,0 +1,31 @@ +--- openjdk/Makefile.orig 2010-06-28 20:11:00.000000000 +0100 ++++ openjdk/Makefile 2010-06-28 20:11:54.000000000 +0100 +@@ -138,7 +138,7 @@ + # Location of fresh bootdir output + ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk + FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image +-FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME)/j2sdk-image ++FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image + + create_fresh_product_bootdir: FRC + @$(START_ECHO) +@@ -210,7 +210,7 @@ + generic_debug_build: + @$(START_ECHO) + $(MAKE) \ +- ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME) \ ++ ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ + DEBUG_NAME=$(DEBUG_NAME) \ + GENERATE_DOCS=false \ + $(BOOT_CYCLE_DEBUG_SETTINGS) \ +@@ -230,8 +230,8 @@ + + clobber:: + $(RM) -r $(OUTPUTDIR)/* +- $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/* +- $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/* ++ $(RM) -r $(OUTPUTDIR)-debug/* ++ $(RM) -r $(OUTPUTDIR)-fastdebug/* + -($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE)) + + clean: clobber From andrew at icedtea.classpath.org Wed Jun 30 06:44:25 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 30 Jun 2010 13:44:25 +0000 Subject: /hg/icedtea6: Avoid passing --sync to df in the OpenJDK sanity c... Message-ID: changeset 4fbf7302ddbe in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4fbf7302ddbe author: Andrew John Hughes date: Wed Jun 30 00:53:06 2010 +0100 Avoid passing --sync to df in the OpenJDK sanity check. 2010-06-29 Andrew John Hughes * Makefile.am: Add new patch. * patches/no-sync.patch: Don't pass --sync to df; the file space check does not need to be so accurate that we have to flush all buffers to disc. diffstat: 3 files changed, 24 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ Makefile.am | 3 ++- patches/no-sync.patch | 14 ++++++++++++++ diffs (46 lines): diff -r b434625f3fd8 -r 4fbf7302ddbe ChangeLog --- a/ChangeLog Wed Jun 30 00:47:55 2010 +0100 +++ b/ChangeLog Wed Jun 30 00:53:06 2010 +0100 @@ -1,3 +1,11 @@ 2010-06-28 Andrew John Hughes + + * Makefile.am: Add new patch. + * patches/no-sync.patch: Don't pass --sync + to df; the file space check does not need + to be so accurate that we have to flush all + buffers to disc. + 2010-06-28 Andrew John Hughes * Makefile.am: diff -r b434625f3fd8 -r 4fbf7302ddbe Makefile.am --- a/Makefile.am Wed Jun 30 00:47:55 2010 +0100 +++ b/Makefile.am Wed Jun 30 00:53:06 2010 +0100 @@ -289,7 +289,8 @@ ICEDTEA_PATCHES = \ patches/arm.patch \ patches/shark-debug-option.patch \ patches/openjdk/6961732.patch \ - patches/debug-dir.patch + patches/debug-dir.patch \ + patches/no-sync.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r b434625f3fd8 -r 4fbf7302ddbe patches/no-sync.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/no-sync.patch Wed Jun 30 00:53:06 2010 +0100 @@ -0,0 +1,14 @@ +diff -r 388276965253 make/common/shared/Sanity.gmk +--- openjdk.orig/jdk/make/common/shared/Sanity.gmk Wed Jun 16 20:46:10 2010 +0200 ++++ openjdk/jdk/make/common/shared/Sanity.gmk Wed Jun 30 00:50:32 2010 +0100 +@@ -57,8 +57,8 @@ + endif + + ifeq ($(PLATFORM), linux) +- FREE_SPACE := $(shell $(DF) --sync -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}') +- TEMP_FREE_SPACE := $(shell $(DF) --sync -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}') ++ FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}') ++ TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}') + ifeq ($(ARCH), amd64) + LINUX_VERSION := $(shell \ + if [ -r "$(LINUX_VERSION_INFO)" ] ; then \ From ahughes at redhat.com Wed Jun 30 08:35:20 2010 From: ahughes at redhat.com (Andrew John Hughes) Date: Wed, 30 Jun 2010 16:35:20 +0100 Subject: Fwd: openjdk/zero: use double code for atomic64 on powerpc In-Reply-To: <20100630153051.GA29468@Chamillionaire.breakpoint.cc> References: <20100630153051.GA29468@Chamillionaire.breakpoint.cc> Message-ID: Forwarding to zero-dev and distro-pkg-dev, where Zero is usually discussed: ---------- Forwarded message ---------- From: Sebastian Andrzej Siewior Date: 30 June 2010 16:30 Subject: openjdk/zero: use double code for atomic64 on powerpc To: jdk6-dev at openjdk.java.net Cc: hotspot-compiler-dev at openjdk.java.net this cute C code does the same thing on powerpc as the assembly code that was here before. If the compiler was built with the SPE extensions instead of traditional FPU and double operations are performed in HW then we are one step further: The compiler turns this into evldd & evstdd. Voila :) This C code could also be activated on s390. The compiler turns this into a single mvc instruction which does the copy operation. I don't know if mvc's copy ability is atomic _or_ not and therefore I leave it as it. Signed-off-by: Sebastian Andrzej Siewior Index: openjdk-6-6b18-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp =================================================================== --- openjdk-6-6b18-1.8.orig/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp ? ?2010-06-30 16:55:28.000000000 +0200 +++ openjdk-6-6b18-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2010-06-30 17:08:49.000000000 +0200 @@ -22,6 +22,15 @@ ?* have any questions. ?* ?*/ +#if defined(PPC) && !defined(_LP64) +#ifndef __NO_FPRS__ +#define ATOMIC64_COPY_THROUGH_DOUBLE 1 + +#elif defined(__SPE__) && !defined(_SOFT_DOUBLE) +#define ATOMIC64_COPY_THROUGH_DOUBLE 1 + +#endif +#endif ? static void setup_fpu() {} @@ -33,12 +42,23 @@ ? // Atomically copy 64 bits of data ? static void atomic_copy64(volatile void *src, volatile void *dst) { -#if defined(PPC) && !defined(_LP64) - ? ?double tmp; - ? ?asm volatile ("lfd ?%0, 0(%1)\n" - ? ? ? ? ? ? ? ? ?"stfd %0, 0(%2)\n" - ? ? ? ? ? ? ? ? ?: "=f"(tmp) - ? ? ? ? ? ? ? ? ?: "b"(src), "b"(dst)); +#if ATOMIC64_COPY_THROUGH_DOUBLE + ? ? ? ? /* + ? ? ? ? ?* In order to copy 8 bytes atomicly we rely on the trick that some + ? ? ? ? ?* architectures can load and store a double as a single operation. + ? ? ? ? ?* gcc picks the correct opcode here and with optimization turned on + ? ? ? ? ?* all temporary assignments are gone. ? ? ? ? ? ? ? ? ? ? ? - bigeasy + ? ? ? ? ?*/ + ? ? ? ? union { + ? ? ? ? ? ? ? ? double *d; + ? ? ? ? ? ? ? ? volatile void *v; + ? ? ? ? } s, d; + + ? ? ? ? s.v = src; + ? ? ? ? d.v = dst; + + ? ? ? ? *d.d = *s.d; + ?#elif defined(S390) && !defined(_LP64) ? ? double tmp; ? ? asm volatile ("ld ?%0, 0(%1)\n" -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 12:11:00 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 19:11:00 +0000 Subject: [Bug 502] OpenOffice Writer 3.1.1.4 Build 9319 crashes when using Save As Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=502 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|gnu_andrew at member.fsf.org |unassigned at icedtea.classpath | |.org Severity|major |normal Component|IcedTea7 |IcedTea6 Platform|all |x86 Version|unspecified |6-1.7.3 ------- Comment #3 from gnu_andrew at member.fsf.org 2010-06-30 19:11 ------- IcedTea6 bug. Changing data accordingly. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 12:15:20 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 19:15:20 +0000 Subject: [Bug 93] missing clean target in Makefile Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=93 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org |.org | Status|REOPENED |NEW -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 12:16:19 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 19:16:19 +0000 Subject: [Bug 94] empty install target in Makefile.am Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=94 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |REOPENED Resolution|INVALID | ------- Comment #2 from gnu_andrew at member.fsf.org 2010-06-30 19:16 ------- There doesn't seem to be any reason j2sdk-image couldn't be installed. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 12:16:35 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 19:16:35 +0000 Subject: [Bug 94] empty install target in Makefile.am Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=94 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org |.org | Status|REOPENED |NEW -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 13:23:14 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 20:23:14 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #12 from asu at redhat.com 2010-06-30 20:23 ------- Created an attachment (id=381) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=381&action=view) backtrace (In reply to comment #4) > I have not been able to reproduce this bug using Ubuntu 10.04 x86_64 > > but this bug are still fully reproducable using the same icedtea version > icedtea6-1.8 on 32bit systems. > -snip- > > Andrew Su please check if you can reproduce this bug on a 32bit Fedora version > since I am only able to reproduce the bug on 32bit systems. > I get a couple different things happening now. I sometimes get the one you posted in comment 4. Sometimes I get one that says about something about corrupted double-linked-lists, then it hangs. *** glibc detected *** /root/build/openjdk.build/j2sdk-image/bin/java: corrupted double-linked list: 0x7d30c348 *** Sometimes it generates the fonts then crashes after I click on one of them. Lastly I get one saying # Problematic frame: # j sun.font.TrueTypeFont.open()Ljava/nio/channels/FileChannel;+64 I'll attach the gdb backtrace, however some debug info is missing! I will also attach the error logs created by the jvm. -Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 13:24:57 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 20:24:57 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #13 from asu at redhat.com 2010-06-30 20:24 ------- Created an attachment (id=382) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=382&action=view) the jvm error log for the above backtrace the jvm crash log for the above backtrace -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 13:29:11 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 20:29:11 +0000 Subject: [Bug 349] Font2DTest crash when using Range: Sinhala Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=349 ------- Comment #14 from asu at redhat.com 2010-06-30 20:29 ------- Created an attachment (id=383) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=383&action=view) jvm crash log. crash log -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 13:53:48 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 20:53:48 +0000 Subject: [Bug 510] System.load on applet hang the second time Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=510 omajid at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea6 |Zero ------- Comment #4 from omajid at redhat.com 2010-06-30 20:53 ------- (In reply to comment #3) > Created an attachment (id=379) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=379&action=view) [details] > Minimal applet test > > You need to compile and pack it to a jar. Replace this /home/user1/lib.so to > your own path, where a jni lib should be. Sign your applet and prepare a > minimal .html for loading it into your web browser. > > The first time everything will be alright but if you refresh it will freeze (2 > would no appear). > I repeated all the steps, but I can not reproduce this problem. Occasionally, I get a grey box in place of the applet, but never any problems with loading native libraries. The '2' always appears. I noticed that you are using an older version of IcedTea6. Can you reproduce the bug with the latest version? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 13:59:05 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 20:59:05 +0000 Subject: [Bug 510] System.load on applet hang the second time Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=510 omajid at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Component|Zero |Plugin ------- Comment #5 from omajid at redhat.com 2010-06-30 20:59 ------- accidentally changed component to zero, setting it back to plugin. sorry for the noise -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From dbhole at redhat.com Wed Jun 30 14:01:01 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 30 Jun 2010 17:01:01 -0400 Subject: [RFC] Netx: some native libraries are not found In-Reply-To: <4C2A58F1.7010305@redhat.com> References: <4C1F7805.5070300@redhat.com> <20100629180625.GD25837@redhat.com> <4C2A58F1.7010305@redhat.com> Message-ID: <20100630210101.GC6610@redhat.com> * Omair Majid [2010-06-29 16:35]: > On 06/29/2010 02:06 PM, Deepak Bhole wrote: > >* Omair Majid [2010-06-21 10:33]: > >>Hi, > >> > >>There is a bug in the current version of Netx that fails to find > >>some native libraries [1][2]. > >> > >>In the current implementation of Netx, one classloader is created > >>per JNLP file; for JNLP files loaded as extensions, the classloaders > >>share information about where to find resources. Unfortunately, they > >>do not share any information about where to find native libraries. > >>This makes Web Start applications with extensions that use native > >>libraries fail. The proposed patch [3] fixes this. > >> > >>Any comments concerns? Should I go ahead and commit this fix? > >> > > > >Patch looks good to me. Assuming you have tested it, please go ahead and > >commit. > > > > On furthur testing, I found an issue with the patch I had posted. I > had to change the check for extLoader and baseLoader from > if (baseLoader != null) > to > if (baseLoader != null && baseLoader != loader) > which makes sense to me: adding urls and native directories > repeatedly to the same loader has no point. > Why would the directories and urls get added again? That would only happen if the extension loaders had duplicate paths, which is really a bug in the jnlp... Or do you know of cases where it does it multiple times even if the jnlp specifies it only once? Cheers, Deepak > Ok to commit? > > Cheers, > Omair > tree bba041892d23 > parent e7c3958eee03 > author Omair Majid 1277840890 14400 > committer Omair Majid 1277840890 14400 > revision 2141 > branch default > > Netx: allow jnlp classloaders to share native libraries > 2010-06-29 Omair Majid > > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > nativeDirectories: New variable. Contains a list of directories that > contain native libraries. > (getInstance): Tell other classloaders about the native directory. > (getNativeDir): Add the new native directory to nativeDirectories. > (addNativeDirectory): New function. > (getNativeDirectories): New function. > (findLibrary): Look in all the native directories for the native library. > diff --git a/ChangeLog b/ChangeLog > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,14 @@ > +2010-06-29 Omair Majid > + > + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > + nativeDirectories: New variable. Contains a list of directories that > + contain native libraries. > + (getInstance): Tell other classloaders about the native directory. > + (getNativeDir): Add the new native directory to nativeDirectories. > + (addNativeDirectory): New function. > + (getNativeDirectories): New function. > + (findLibrary): Look in all the native directories for the native library. > + > 2010-06-29 Omair Majid > > * netx/net/sourceforge/jnlp/services/XSingleInstanceService.java > diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > @@ -32,6 +32,7 @@ > import java.security.Permissions; > import java.security.PrivilegedAction; > import java.util.ArrayList; > +import java.util.Collections; > import java.util.Enumeration; > import java.util.HashMap; > import java.util.LinkedList; > @@ -83,6 +84,9 @@ > /** the directory for native code */ > private File nativeDir = null; // if set, some native code exists > > + /** a list of directories that contain native libraries */ > + private List nativeDirectories = Collections.synchronizedList(new LinkedList()); > + > /** security context */ > private AccessControlContext acc = AccessController.getContext(); > > @@ -237,18 +241,22 @@ > // loader for this unique key. Check. > JNLPClassLoader extLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey); > > - if (extLoader != null) { > + if (extLoader != null && extLoader != loader) { > for (URL u : loader.getURLs()) > extLoader.addURL(u); > + for (File nativeDirectory: loader.getNativeDirectories()) > + extLoader.addNativeDirectory(nativeDirectory); > > loader = extLoader; > } > > // loader is now current + ext. But we also need to think of > // the baseLoader > - if (baseLoader != null) { > + if (baseLoader != null && baseLoader != loader) { > for (URL u : loader.getURLs()) > baseLoader.addURL(u); > + for (File nativeDirectory: loader.getNativeDirectories()) > + baseLoader.addNativeDirectory(nativeDirectory); > > loader = baseLoader; > } > @@ -716,29 +724,47 @@ > > if (!nativeDir.mkdirs()) > return null; > - else > + else { > + // add this new native directory to the search path > + addNativeDirectory(nativeDir); > return nativeDir; > + } > + } > + > + /** > + * Adds the {@link File} to the search path of this {@link JNLPClassLoader} > + * when trying to find a native library > + */ > + protected void addNativeDirectory(File nativeDirectory) { > + nativeDirectories.add(nativeDirectory); > + } > + > + /** > + * Returns a list of all directories in the search path of the current classloader > + * when it tires to find a native library. > + * @return a list of directories in the search path for native libraries > + */ > + protected List getNativeDirectories() { > + return nativeDirectories; > } > > /** > * Return the absolute path to the native library. > */ > protected String findLibrary(String lib) { > - if (nativeDir == null) > - return null; > - > String syslib = System.mapLibraryName(lib); > > - File target = new File(nativeDir, syslib); > - if (target.exists()) > - return target.toString(); > - else { > - String result = super.findLibrary(lib); > - if (result != null) > - return result; > + for (File dir: getNativeDirectories()) { > + File target = new File(dir, syslib); > + if (target.exists()) > + return target.toString(); > + } > > - return findLibraryExt(lib); > - } > + String result = super.findLibrary(lib); > + if (result != null) > + return result; > + > + return findLibraryExt(lib); > } > > /** From andrew at icedtea.classpath.org Wed Jun 30 14:03:29 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 30 Jun 2010 21:03:29 +0000 Subject: /hg/icedtea6: PR icedtea/93: Provide a proper clean target not a... Message-ID: changeset 616766de2cfe in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=616766de2cfe author: Andrew John Hughes date: Wed Jun 30 22:03:22 2010 +0100 PR icedtea/93: Provide a proper clean target not aliased to distclean that calls all dependent clean targets. 2010-06-30 Andrew John Hughes PR icedtea/93 * Makefile.am: Fix cleanup process. (clean-local): Renamed from distclean-local. Add additional dependent clean targets. Don't remove build directories and stamps; should be done by dependents. (.PHONY): Updated. (clean-ports): Inverse of ports.stamp. (clean-overlay): Inverse of overlay.stamp. (clean-native-ecj): Inverse of native-ecj.stamp. (clean-icedtea): Just delete the build directory and stamp. (clean-icedtea-debug): Inverse of icedtea-debug.stamp. (clean-icedtea-against-icedtea): Inverse of icedtea-against-icedtea.stamp (clean-icedtea- debug-against-icedtea): Inverse of icedtea-debug-against- icedtea.stamp (clean-icedtea-ecj): Just delete the build directory and stamp. (clean-icedtea-against-ecj): Inverse of icedtea-against-ecj.stamp. (clean-IcedTeaPlugin): Delete empty build directories if srcdir != builddir. (clean-pulse- java): Likewise. (clean-add-cacao): Inverse of add- cacao.stamp. (clean-add-cacao-debug): Inverse of add-cacao- debug.stamp. (clean-add-zero): Inverse of add-zero.stamp. (clean-add-zero-debug): Inverse of add-zero-debug.stamp. (clean): Removed; already provided by autoconf to point to clean- local. diffstat: 2 files changed, 98 insertions(+), 41 deletions(-) ChangeLog | 26 +++++++++++++ Makefile.am | 113 +++++++++++++++++++++++++++++++++++++---------------------- diffs (292 lines): diff -r 4fbf7302ddbe -r 616766de2cfe ChangeLog --- a/ChangeLog Wed Jun 30 00:53:06 2010 +0100 +++ b/ChangeLog Wed Jun 30 22:03:22 2010 +0100 @@ -1,3 +1,29 @@ 2010-06-29 Andrew John Hughes + + PR icedtea/93 + * Makefile.am: Fix cleanup process. + (clean-local): Renamed from distclean-local. + Add additional dependent clean targets. + Don't remove build directories and stamps; + should be done by dependents. + (.PHONY): Updated. + (clean-ports): Inverse of ports.stamp. + (clean-overlay): Inverse of overlay.stamp. + (clean-native-ecj): Inverse of native-ecj.stamp. + (clean-icedtea): Just delete the build directory and stamp. + (clean-icedtea-debug): Inverse of icedtea-debug.stamp. + (clean-icedtea-against-icedtea): Inverse of icedtea-against-icedtea.stamp + (clean-icedtea-debug-against-icedtea): Inverse of icedtea-debug-against-icedtea.stamp + (clean-icedtea-ecj): Just delete the build directory and stamp. + (clean-icedtea-against-ecj): Inverse of icedtea-against-ecj.stamp. + (clean-IcedTeaPlugin): Delete empty build directories if srcdir != builddir. + (clean-pulse-java): Likewise. + (clean-add-cacao): Inverse of add-cacao.stamp. + (clean-add-cacao-debug): Inverse of add-cacao-debug.stamp. + (clean-add-zero): Inverse of add-zero.stamp. + (clean-add-zero-debug): Inverse of add-zero-debug.stamp. + (clean): Removed; already provided by autoconf to point to clean-local. + 2010-06-29 Andrew John Hughes * Makefile.am: Add new patch. diff -r 4fbf7302ddbe -r 616766de2cfe Makefile.am --- a/Makefile.am Wed Jun 30 00:53:06 2010 +0100 +++ b/Makefile.am Wed Jun 30 22:03:22 2010 +0100 @@ -91,8 +91,6 @@ ICEDTEA_BOOTSTRAP_CLASSES = \ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \ $(SHARE)/javax/management/StandardMBean.java \ $(NETX_BOOTSTRAP_CLASSES) - -# FIXME (javac): Settings for javac go here # Flags IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) @@ -519,27 +517,18 @@ all-local: icedtea-against-icedtea check-local: jtregcheck -#FIXME (clean): Should become clean-local. -distclean-local: clean-copy clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \ - clean-netx clean-plugin clean-liveconnect - rm -rf stamps - rm -f rt-source-files.txt \ - extra-source-files.txt +clean-local: clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \ + clean-netx clean-plugin clean-liveconnect clean-icedtea clean-icedtea-debug \ + clean-icedtea-ecj clean-cacao clean-ports clean-overlay clean-native-ecj \ + clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \ + clean-icedtea-against-ecj + rm -f rt-source-files.txt extra-source-files.txt rm -rf bootstrap rm -rf lib rm -rf extra-lib rm -rf openjdk-ecj - rm -rf $(ECJ_BUILD_OUTPUT_DIR) rm -rf openjdk - rm -rf $(BUILD_OUTPUT_DIR) - -if BUILD_CACAO - rm -rf cacao -endif rm -f jni-common.o -if ADD_ZERO_BUILD - rm -rf zerovm -endif #FIXME (clean): Missing distclean-local for downloads only @@ -552,7 +541,10 @@ install: clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \ clean-icedtea icedtea-against-icedtea clean-icedtea-ecj \ clean-tools-jar clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) hotspot \ - hotspot-helper clean-extra clean-jtreg clean-jtreg-reports + hotspot-helper clean-extra clean-jtreg clean-jtreg-reports \ + clean-add-zero clean-add-zero-debug clean-icedtea clean-icedtea-debug + clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ + clean-ports clean-overlay env: @echo 'unset JAVA_HOME' @@ -854,7 +846,17 @@ stamps/ports.stamp: stamps/replace-hotsp mkdir -p stamps touch stamps/ports.stamp -#FIXME (clean): Missing clean-ports +clean-ports: + for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \ + $(abs_top_srcdir)/ports/hotspot/tools \ + $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \ + $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \ + link=$$(echo $$target | sed 's/^.*ports/openjdk/'); \ + rm -rf $$link; \ + done + rm -f openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg + rm -f openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c + rm -f stamps/ports.stamp #FIXME (missing): Missing generated.stamp @@ -989,7 +991,8 @@ endif endif touch stamps/overlay.stamp -#FIXME (clean): Missing clean-overlay +clean-overlay: + rm -f stamps/overlay.stamp # OpenJDK ecj Source Preparation Targets # ====================================== @@ -1070,7 +1073,9 @@ stamps/native-ecj.stamp: fi ; \ touch stamps/native-ecj.stamp -# FIXME(clean): Missing clean-native-ecj +clean-native-ecj: + rm -f native-ecj + rm -rf stamps/native-ecj.stamp # bootstrap/ecj. stamps/bootstrap-directory-ecj.stamp: stamps/native-ecj.stamp @@ -1236,6 +1241,10 @@ endif mkdir -p stamps touch stamps/icedtea.stamp +clean-icedtea: + rm -rf $(BUILD_OUTPUT_DIR) + rm -f stamps/icedtea.stamp + stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ @@ -1309,25 +1318,25 @@ endif mkdir -p stamps touch stamps/icedtea-debug.stamp -clean-icedtea: stamps/extract.stamp - $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV) \ - -C openjdk clobber - rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp +clean-icedtea-debug: + rm -rf $(DEBUG_BUILD_OUTPUT_DIR) + rm -f stamps/icedtea-debug.stamp stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp mkdir -p stamps touch stamps/icedtea-against-icedtea.stamp -#FIXME (clean): Missing clean-icedtea-against-icedtea +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao + rm -f stamps/icedtea-against-icedtea.stamp stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp mkdir -p stamps touch stamps/icedtea-debug-against-icedtea.stamp -#FIXME (clean): Missing clean-icedtea-debug-against-icedtea +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug + rm -f stamps/icedtea-debug-against-icedtea.stamp # OpenJDK ecj Targets # =================== @@ -1343,6 +1352,10 @@ stamps/icedtea-ecj.stamp: stamps/bootstr $(ECJ_BUILD_OUTPUT_DIR) mkdir -p stamps touch stamps/icedtea-ecj.stamp + +clean-icedtea-ecj: stamps/extract-ecj.stamp + rm -rf $(ECJ_BUILD_OUTPUT_DIR) + rm -f stamps/icedtea-ecj.stamp hotspot: if WITH_OPENJDK @@ -1365,19 +1378,14 @@ else @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image endif -clean-icedtea-ecj: stamps/extract-ecj.stamp - rm -f stamps/icedtea-ecj.stamp - $(ARCH_PREFIX) $(MAKE) \ - $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj/ clobber - stamps/icedtea-against-ecj.stamp: \ stamps/bootstrap-directory-symlink-ecj.stamp \ stamps/icedtea-ecj.stamp mkdir -p stamps touch stamps/icedtea-against-ecj.stamp -#FIXME (clean): Missing clean-icedtea-against-ecj +clean-icedtea-against-ecj: + rm -f stamps/icedtea-against-ecj.stamp # Plugin @@ -1419,6 +1427,10 @@ clean-IcedTeaPlugin: clean-IcedTeaPlugin: rm -f $(PLUGIN_DIR)/*.o rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so + if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \ + rmdir $(abs_top_builddir)/plugin/icedteanp ; \ + rmdir $(abs_top_builddir)/plugin ; \ + fi endif stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) @@ -1581,6 +1593,9 @@ clean-pulse-java: [ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR) rm -f stamps/pulse-java*.stamp rm -f pulse-java.jar + if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \ + rmdir $(abs_top_builddir)/pulseaudio ; \ + fi endif # end of pulse-java @@ -1664,7 +1679,10 @@ endif endif touch $@ -#FIXME (clean): Missing clean-add-cacao +clean-add-cacao: + rm -rf $(BUILD_JRE_ARCH_DIR)/cacao + sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg + rm -f stamps/add-cacao.stamp stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp if ADD_CACAO_BUILD @@ -1681,7 +1699,10 @@ endif endif touch $@ -#FIXME (clean): Missing clean-add-cacao-debug +clean-add-cacao-debug: + rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao + sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg + rm -f stamps/add-cacao-debug.stamp # configure script arguments, quoted in single quotes CONFIGURE_ARGS = @CONFIGURE_ARGS@ @@ -1743,7 +1764,13 @@ endif endif touch $@ -#FIXME (clean): Missing clean-add-zero +clean-add-zero: + rm -rf $(BUILD_JRE_ARCH_DIR)/zero + rm -rf $(BUILD_JRE_ARCH_DIR)/shark + rm -rf zerovm + sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg + sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg + rm -f stamps/add-zero.stamp stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp if ADD_ZERO_BUILD @@ -1773,7 +1800,13 @@ endif endif touch $@ -#FIXME (clean): Missing clean-add-zero-debug +clean-add-zero-debug: + rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/zero + rm -rf $(BUILD_JRE_ARCH_DIR)/shark + rm -rf zerovm + sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg + sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg + rm -f stamps/add-zero-debug.stamp # end additional VMs @@ -1942,8 +1975,6 @@ bootstrap-directory-symlink: stamps/boot cacao: stamps/cacao.stamp -clean: distclean-local - nbplatform: stamps/nbplatform.stamp download: stamps/download.stamp From omajid at redhat.com Wed Jun 30 15:01:59 2010 From: omajid at redhat.com (Omair Majid) Date: Wed, 30 Jun 2010 18:01:59 -0400 Subject: [RFC] Netx: some native libraries are not found In-Reply-To: <20100630210101.GC6610@redhat.com> References: <4C1F7805.5070300@redhat.com> <20100629180625.GD25837@redhat.com> <4C2A58F1.7010305@redhat.com> <20100630210101.GC6610@redhat.com> Message-ID: <4C2BBED7.3020502@redhat.com> On 06/30/2010 05:01 PM, Deepak Bhole wrote: > * Omair Majid [2010-06-29 16:35]: >> On 06/29/2010 02:06 PM, Deepak Bhole wrote: >>> * Omair Majid [2010-06-21 10:33]: >>>> Hi, >>>> >>>> There is a bug in the current version of Netx that fails to find >>>> some native libraries [1][2]. >>>> >>>> In the current implementation of Netx, one classloader is created >>>> per JNLP file; for JNLP files loaded as extensions, the classloaders >>>> share information about where to find resources. Unfortunately, they >>>> do not share any information about where to find native libraries. >>>> This makes Web Start applications with extensions that use native >>>> libraries fail. The proposed patch [3] fixes this. >>>> >>>> Any comments concerns? Should I go ahead and commit this fix? >>>> >>> >>> Patch looks good to me. Assuming you have tested it, please go ahead and >>> commit. >>> >> >> On furthur testing, I found an issue with the patch I had posted. I >> had to change the check for extLoader and baseLoader from >> if (baseLoader != null) >> to >> if (baseLoader != null&& baseLoader != loader) >> which makes sense to me: adding urls and native directories >> repeatedly to the same loader has no point. >> > > Why would the directories and urls get added again? That would only > happen if the extension loaders had duplicate paths, which is really a > bug in the jnlp... > > Or do you know of cases where it does it multiple times even if the jnlp > specifies it only once? > An example of an application that demonstrates the behaviour is Jake [1]. Without that check we get a ConcurrentModificationException: java.util.ConcurrentModificationException at java.util.LinkedList$ListItr.checkForComodification(LinkedList.java:778) at java.util.LinkedList$ListItr.next(LinkedList.java:713) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:258) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:293) at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeExtensions(JNLPClassLoader.java:312) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:159) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:238) at net.sourceforge.jnlp.Launcher.createApplication(Launcher.java:634) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:418) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:725) Jake loads jogl[2] and joal[3], both jnlp extensions and independent from Jake. Both of these extensions then load glugen-rt [4]. This diamond loading pattern is likely what causes this duplicate paths. Cheers, Omair [1] http://www.bytonic.de/downloads/jake2_jogl11.jnlp [2]http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/jogl.jnlp [3]http://download.java.net/media/joal/webstart/joal.jnlp [4] http://download.java.net/media/gluegen/webstart/gluegen-rt.jnlp From dbhole at redhat.com Wed Jun 30 15:04:41 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 30 Jun 2010 18:04:41 -0400 Subject: [RFC] Netx: some native libraries are not found In-Reply-To: <4C2BBED7.3020502@redhat.com> References: <4C1F7805.5070300@redhat.com> <20100629180625.GD25837@redhat.com> <4C2A58F1.7010305@redhat.com> <20100630210101.GC6610@redhat.com> <4C2BBED7.3020502@redhat.com> Message-ID: <20100630220440.GD6610@redhat.com> * Omair Majid [2010-06-30 18:02]: > On 06/30/2010 05:01 PM, Deepak Bhole wrote: > >* Omair Majid [2010-06-29 16:35]: > >>On 06/29/2010 02:06 PM, Deepak Bhole wrote: > >>>* Omair Majid [2010-06-21 10:33]: > >>>>Hi, > >>>> > >>>>There is a bug in the current version of Netx that fails to find > >>>>some native libraries [1][2]. > >>>> > >>>>In the current implementation of Netx, one classloader is created > >>>>per JNLP file; for JNLP files loaded as extensions, the classloaders > >>>>share information about where to find resources. Unfortunately, they > >>>>do not share any information about where to find native libraries. > >>>>This makes Web Start applications with extensions that use native > >>>>libraries fail. The proposed patch [3] fixes this. > >>>> > >>>>Any comments concerns? Should I go ahead and commit this fix? > >>>> > >>> > >>>Patch looks good to me. Assuming you have tested it, please go ahead and > >>>commit. > >>> > >> > >>On furthur testing, I found an issue with the patch I had posted. I > >>had to change the check for extLoader and baseLoader from > >> if (baseLoader != null) > >>to > >> if (baseLoader != null&& baseLoader != loader) > >>which makes sense to me: adding urls and native directories > >>repeatedly to the same loader has no point. > >> > > > >Why would the directories and urls get added again? That would only > >happen if the extension loaders had duplicate paths, which is really a > >bug in the jnlp... > > > >Or do you know of cases where it does it multiple times even if the jnlp > >specifies it only once? > > > > An example of an application that demonstrates the behaviour is Jake > [1]. Without that check we get a ConcurrentModificationException: > > java.util.ConcurrentModificationException > at java.util.LinkedList$ListItr.checkForComodification(LinkedList.java:778) > at java.util.LinkedList$ListItr.next(LinkedList.java:713) > at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:258) > at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:293) > at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeExtensions(JNLPClassLoader.java:312) > at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:159) > at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:238) > at net.sourceforge.jnlp.Launcher.createApplication(Launcher.java:634) > at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:418) > at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:725) > > Jake loads jogl[2] and joal[3], both jnlp extensions and independent > from Jake. Both of these extensions then load glugen-rt [4]. This > diamond loading pattern is likely what causes this duplicate paths. > > Cheers, > Omair > > [1] http://www.bytonic.de/downloads/jake2_jogl11.jnlp > [2]http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/jogl.jnlp > [3]http://download.java.net/media/joal/webstart/joal.jnlp > [4] http://download.java.net/media/gluegen/webstart/gluegen-rt.jnlp Fair enough! That is a valid case that we need to account for. Please commit with the proposed modification. Cheers, Deepak From bugzilla-daemon at icedtea.classpath.org Wed Jun 30 16:08:41 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Jun 2010 23:08:41 +0000 Subject: [Bug 394] pre Epoch bug : java.lang.ExceptionInInitializerError on systems with time set before January 1, 1970 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=394 ------- Comment #17 from martinrb at google.com 2010-06-30 23:08 ------- It's not at all clear that one cannot solve the y2038 problem on systems with a 32-bit time_t. That's what Michael Schwern is trying to do here: http://code.google.com/p/y2038/ His code is available. The JDK should find some other anti-inlining technique. The code should be agnostic about the current time, as suggested. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.