From gbenson at redhat.com Tue Apr 1 06:46:07 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 01 Apr 2008 13:46:07 +0000 Subject: changeset in /hg/icedtea6: 2008-04-01 Gary Benson changeset fe9999ff0b5d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fe9999ff0b5d description: 2008-04-01 Gary Benson * patches/icedtea-arm-uname.patch: New file. * Makefile.am: Added the above. * Makefile.in: Regenerated. diffstat: 4 files changed, 35 insertions(+), 1 deletion(-) ChangeLog | 6 ++++++ Makefile.am | 1 + Makefile.in | 3 ++- patches/icedtea-arm-uname.patch | 26 ++++++++++++++++++++++++++ diffs (67 lines): diff -r 0fd2fbf0dfd0 -r fe9999ff0b5d ChangeLog --- a/ChangeLog Mon Mar 31 23:19:32 2008 -0400 +++ b/ChangeLog Tue Apr 01 09:46:02 2008 -0400 @@ -1,3 +1,9 @@ 2008-03-31 Lillian Angel + + * patches/icedtea-arm-uname.patch: New file. + * Makefile.am: Added the above. + * Makefile.in: Regenerated. + 2008-03-31 Lillian Angel * patches/icedtea-jpegclasses.patch: Added new class. diff -r 0fd2fbf0dfd0 -r fe9999ff0b5d Makefile.am --- a/Makefile.am Mon Mar 31 23:19:32 2008 -0400 +++ b/Makefile.am Tue Apr 01 09:46:02 2008 -0400 @@ -278,6 +278,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ + patches/icedtea-arm-uname.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r 0fd2fbf0dfd0 -r fe9999ff0b5d Makefile.in --- a/Makefile.in Mon Mar 31 23:19:32 2008 -0400 +++ b/Makefile.in Tue Apr 01 09:46:02 2008 -0400 @@ -384,7 +384,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-generated.patch patches/icedtea-lib64.patch \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ - patches/icedtea-jpegclasses.patch $(GCC_PATCH) \ + patches/icedtea-jpegclasses.patch \ + patches/icedtea-arm-uname.patch $(GCC_PATCH) \ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3) # Patch OpenJDK for plug replacements and ecj. diff -r 0fd2fbf0dfd0 -r fe9999ff0b5d patches/icedtea-arm-uname.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-arm-uname.patch Tue Apr 01 09:46:02 2008 -0400 @@ -0,0 +1,26 @@ +diff -r 29e7597d75c4 openjdk/jdk/make/common/shared/Platform.gmk +--- openjdk/jdk/make/common/shared/Platform.gmk Fri Mar 28 14:19:36 2008 +0000 ++++ openjdk/jdk/make/common/shared/Platform.gmk Tue Apr 01 09:02:17 2008 +0100 +@@ -205,6 +205,9 @@ ifeq ($(SYSTEM_UNAME), Linux) + sparc*) \ + echo sparc \ + ;; \ ++ arm*) \ ++ echo arm \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \ +diff -r 29e7597d75c4 openjdk/corba/make/common/shared/Platform.gmk +--- openjdk/corba/make/common/shared/Platform.gmk Fri Mar 28 14:19:36 2008 +0000 ++++ openjdk/corba/make/common/shared/Platform.gmk Tue Apr 01 09:02:17 2008 +0100 +@@ -194,6 +194,9 @@ ifeq ($(SYSTEM_UNAME), Linux) + sparc*) \ + echo sparc \ + ;; \ ++ arm*) \ ++ echo arm \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \ From bugzilla-daemon at icedtea.classpath.org Tue Apr 1 09:55:04 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Apr 2008 16:55:04 +0000 Subject: [Bug 131] New: IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 Summary: IcedTea crashes on a simple applet Product: IcedTea Version: unspecified Platform: Other OS/Version: Linux Status: NEW Severity: normal Priority: P1 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: Luc.Bouge at bretagne.ens-cachan.fr My Linux box is running Fedora Core 8: "Linux cidre.irisa.fr 2.6.23.9-85.fc8 #1 SMP Fri Dec 7 15:49:59 EST 2007 i686 i686 i386 GNU/Linux" I am running InceTea Java [bouge at cidre Cours6_Applets]$ appletviewer -debug a Initializing jdb ... > version This is jdb version 1.6 (Java SE version 1.7.0) I am prepared a simple applet for teaching a Java programming course. It is appended below. If I start appletviewer, and then click on "reload", then the applet disappears. I have tried to run this scenario under the debugger: here is the output. An exception is raised "IllegalMonitorStateException". [bouge at cidre Cours6_Applets]$ appletviewer -debug Hello1.html Initializing jdb ... > run run sun.applet.Main Hello1.html Set uncaught java.lang.Throwable Set deferred uncaught java.lang.Throwable VM Started: > Exception occurred: java.lang.IllegalMonitorStateException (uncaught)"thread=TimerQueue", java.util.concurrent.locks.ReentrantLock$Sync.tryRelease(), line=155 bci=24 TimerQueue[1] where [1] java.util.concurrent.locks.ReentrantLock$Sync.tryRelease (ReentrantLock.java:155) [2] java.util.concurrent.locks.AbstractQueuedSynchronizer.release (AbstractQueuedSynchronizer.java:1,193) [3] java.util.concurrent.locks.ReentrantLock.unlock (ReentrantLock.java:459) [4] java.util.concurrent.DelayQueue.take (DelayQueue.java:205) [5] javax.swing.TimerQueue.run (TimerQueue.java:171) [6] java.lang.Thread.run (Thread.java:675) TimerQueue[1] [bouge at cidre Cours6_Applets]$ _______________________________________________________________________________ File "Hello1.java" import java.awt.Graphics; import java.awt.Color; import javax.swing.*; public class Hello1 extends javax.swing.JApplet { public void init() { setBackground(Color.GREEN); } public void paint(Graphics g) { g.setColor(Color.RED); g.drawString("Hello World!", 5, 15); } } _______________________________________________________________________ File "Hello1.html" Hello world #1!

Ceci est le titre de ma premi?re applet Java

Un peu de texte avant l'applet et un peu de texte apr?s! -- 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 Apr 1 09:56:30 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Apr 2008 16:56:30 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 ------- Comment #2 from Luc.Bouge at bretagne.ens-cachan.fr 2008-04-01 16:56 ------- Created an attachment (id=66) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=66&action=view) The source HTML file -- 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 Apr 1 09:58:14 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Apr 2008 16:58:14 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 Luc.Bouge at bretagne.ens-cachan.fr changed: What |Removed |Added ---------------------------------------------------------------------------- Platform|Other |PC -- 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 Apr 1 10:05:12 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Apr 2008 17:05:12 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 langel at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME ------- Comment #3 from langel at redhat.com 2008-04-01 17:05 ------- I cannot reproduce this with icedtea6, it works fine here. I would suggest switching to icedtea6 instead: http://icedtea.classpath.org/hg/icedtea6 -- 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 Apr 1 09:56:01 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Apr 2008 16:56:01 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 ------- Comment #1 from Luc.Bouge at bretagne.ens-cachan.fr 2008-04-01 16:56 ------- Created an attachment (id=65) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=65&action=view) The source code of the Java applet -- 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 Apr 1 10:17:43 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Apr 2008 17:17:43 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 ------- Comment #4 from Luc.Bouge at bretagne.ens-cachan.fr 2008-04-01 17:17 ------- Dear langel at redhat.com, I forgot to mention I use icedtea 1.7.0, as automatically installed by YUM. Is icedtea6 newer? Regards, Luc. [bouge at cidre ~]$ sudo rpm -qa '*icedtea*' java-1.7.0-icedtea-javadoc-1.7.0.0-0.19.b21.snapshot.fc8 java-1.7.0-icedtea-plugin-1.7.0.0-0.19.b21.snapshot.fc8 java-1.7.0-icedtea-src-1.7.0.0-0.19.b21.snapshot.fc8 java-1.7.0-icedtea-1.7.0.0-0.19.b21.snapshot.fc8 java-1.7.0-icedtea-demo-1.7.0.0-0.19.b21.snapshot.fc8 java-1.7.0-icedtea-devel-1.7.0.0-0.19.b21.snapshot.fc8 -- 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 Apr 1 10:28:04 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Apr 2008 17:28:04 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 ------- Comment #5 from langel at redhat.com 2008-04-01 17:28 ------- (In reply to comment #4) > > Dear langel at redhat.com, > > I forgot to mention I use icedtea 1.7.0, as automatically installed by YUM. Is > icedtea6 newer? Yes. java-1.6.0-openjdk replaces java-1.7.0-icedtea in rawhide. try: yum --enablerepo=development install java-1.7.0-openjdk -- 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 Apr 2 01:36:09 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Apr 2008 08:36:09 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 ------- Comment #6 from Luc.Bouge at bretagne.ens-cachan.fr 2008-04-02 08:36 ------- I have tried the applet along your suggestion: I get a similar result for the appletviewer on clicking on the "reload" label. Also, loading the applet in FireFox 2.0.0.13 does not work any longer... I can see the surrounding text of the HTML file, but not the applet itself: there is a blank space of its size, instead. Regards, Luc. ___________________________________________________________________________ Package java-1.6.0-openjdk-demo - 1:1.6.0.0-0.6.b08.fc9.i386 is already installed. Package java-1.6.0-openjdk - 1:1.6.0.0-0.6.b08.fc9.i386 is already installed. Package java-1.6.0-openjdk-src - 1:1.6.0.0-0.6.b08.fc9.i386 is already installed. Package java-1.6.0-openjdk-plugin - 1:1.6.0.0-0.6.b08.fc9.i386 is already installed. Package java-1.6.0-openjdk-javadoc - 1:1.6.0.0-0.6.b08.fc9.i386 is already installed. Package java-1.6.0-openjdk-devel - 1:1.6.0.0-0.6.b08.fc9.i386 is already installed. [bouge at cidre Cours6_Applets]$ firefox Hello1.html GCJ PLUGIN: thread 0x80705b0: NP_Initialize gcjwebplugin.cc:1450: thread 0x80705b0: Error: Invalid browser function table. GCJ PLUGIN: thread 0x80705b0: NP_Shutdown GCJ PLUGIN: thread 0x80705b0: NP_Shutdown return GCJ PLUGIN: thread 0x80705b0: NP_Initialize gcjwebplugin.cc:1450: thread 0x80705b0: Error: Invalid browser function table. GCJ PLUGIN: thread 0x80705b0: NP_Shutdown GCJ PLUGIN: thread 0x80705b0: NP_Shutdown return ______________________________________________________________________ [bouge at cidre Cours6_Applets]$ javac -version javac 1.6.0-internal [bouge at cidre Cours6_Applets]$ javac Hello1.java [bouge at cidre Cours6_Applets]$ java -version java version "1.6.0" IcedTea Runtime Environment (build 1.6.0-b08) OpenJDK Server VM (build 1.6.0-b08, mixed mode) [bouge at cidre Cours6_Applets]$ appletviewer -debug Hello1.html Initializing jdb ... > run run sun.applet.Main Hello1.html Set uncaught java.lang.Throwable Set deferred uncaught java.lang.Throwable // Here, I can see the applet on the screen VM Started: > // I press the "reload" item on the appletviewer menu Exception occurred: java.lang.IllegalMonitorStateException (uncaught)"thread=TimerQueue", java.util.concurrent.locks.ReentrantLock$Sync.tryRelease(), line=155 bci=24 TimerQueue[1] where [1] java.util.concurrent.locks.ReentrantLock$Sync.tryRelease (ReentrantLock.java:155) [2] java.util.concurrent.locks.AbstractQueuedSynchronizer.release (AbstractQueuedSynchronizer.java:1,197) [3] java.util.concurrent.locks.ReentrantLock.unlock (ReentrantLock.java:459) [4] java.util.concurrent.DelayQueue.take (DelayQueue.java:205) [5] javax.swing.TimerQueue.run (TimerQueue.java:170) [6] java.lang.Thread.run (Thread.java:636) TimerQueue[1] quit Exception in thread "TimerQueue" java.lang.IllegalMonitorStateException at java.util.concurrent.locks.ReentrantLock$Sync.tryRelease(ReentrantLock.java:155) at java.util.concurrent.locks.AbstractQueuedSynchronizer.release(AbstractQueuedSynchronizer.java:1197) at java.util.concurrent.locks.ReentrantLock.unlock(ReentrantLock.java:459) at java.util.concurrent.DelayQueue.take(DelayQueue.java:205) at javax.swing.TimerQueue.run(TimerQueue.java:170) at java.lang.Thread.run(Thread.java:636) Fatal error: Failed reading output of child java interpreter. [bouge at cidre Cours6_Applets]$ -- 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 Apr 2 01:37:08 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Apr 2008 08:37:08 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 ------- Comment #7 from Luc.Bouge at bretagne.ens-cachan.fr 2008-04-02 08:37 ------- Created an attachment (id=67) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=67&action=view) The class file itself, for the sake of reproductibility -- 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 Apr 2 01:48:09 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Apr 2008 08:48:09 +0000 Subject: [Bug 131] IcedTea crashes on a simple applet Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=131 ------- Comment #8 from twisti at complang.tuwien.ac.at 2008-04-02 08:48 ------- Funny thing is, I get sometimes the same exception but with CACAO as VM. So probably it's not a CACAO bug, as I thought... -- 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 Wed Apr 2 02:03:43 2008 From: gbenson at redhat.com (Gary Benson) Date: Wed, 02 Apr 2008 09:03:43 +0000 Subject: changeset in /hg/icedtea6: 2008-04-02 Gary Benson changeset bf41c62c449a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bf41c62c449a description: 2008-04-02 Gary Benson * patches/icedtea-zero.patch: Workaround for arm. diffstat: 2 files changed, 30 insertions(+) ChangeLog | 4 ++++ patches/icedtea-zero.patch | 26 ++++++++++++++++++++++++++ diffs (44 lines): diff -r fe9999ff0b5d -r bf41c62c449a ChangeLog --- a/ChangeLog Tue Apr 01 09:46:02 2008 -0400 +++ b/ChangeLog Wed Apr 02 05:03:14 2008 -0400 @@ -1,3 +1,7 @@ 2008-04-01 Gary Benson + + * patches/icedtea-zero.patch: Workaround for arm. + 2008-04-01 Gary Benson * patches/icedtea-arm-uname.patch: New file. diff -r fe9999ff0b5d -r bf41c62c449a patches/icedtea-zero.patch --- a/patches/icedtea-zero.patch Tue Apr 01 09:46:02 2008 -0400 +++ b/patches/icedtea-zero.patch Wed Apr 02 05:03:14 2008 -0400 @@ -133,3 +133,29 @@ diff -ru openjdk/hotspot/src/share/vm/ut } STEP(140, "(printing VM operation)" ) +diff -r 789c601c8ba9 openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 01 14:49:28 2008 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Apr 02 09:51:37 2008 +0100 +@@ -1690,7 +1690,8 @@ void * os::dll_load(const char *filename + {EM_SPARC32PLUS, EM_SPARC, ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"}, + {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"}, + {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, +- {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"} ++ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, ++ {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"} + }; + + #if (defined IA32) +@@ -1707,9 +1708,11 @@ void * os::dll_load(const char *filename + static Elf32_Half running_arch_code=EM_PPC64; + #elif (defined __powerpc__) + static Elf32_Half running_arch_code=EM_PPC; ++ #elif (defined ARM) ++ static Elf32_Half running_arch_code=EM_ARM; + #else + #error Method os::dll_load requires that one of following is defined:\ +- IA32, AMD64, IA64, __sparc, __powerpc__ ++ IA32, AMD64, IA64, __sparc, __powerpc__, ARM + #endif + + // Identify compatability class for VM's architecture and library's architecture From bugzilla-daemon at icedtea.classpath.org Wed Apr 2 02:56:59 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Apr 2008 09:56:59 +0000 Subject: [Bug 132] New: javaws throws NullPointerException Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=132 Summary: javaws throws NullPointerException Product: IcedTea Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: twisti at complang.tuwien.ac.at $ javaws Exception in thread "main" java.lang.NullPointerException at net.sourceforge.jnlp.runtime.InstallDialog.(InstallDialog.java:57) at net.sourceforge.jnlp.runtime.InstallDialog.getInstallDir(InstallDialog.java:153) at net.sourceforge.jnlp.runtime.JNLPRuntime.getDefaultBaseDir(JNLPRuntime.java:265) at net.sourceforge.jnlp.runtime.Boot.getBaseDir(Boot.java:407) at net.sourceforge.jnlp.runtime.Boot.run(Boot.java:168) at java.security.AccessController.doPrivileged(Native Method) at net.sourceforge.jnlp.runtime.Boot.main(Boot.java:159) This happens because net.sourceforge.jnlp.runtime.JNLPRuntime is loaded by the bootstrap classloader and JNLPRuntime.class.getClassLoader(); is 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 bugzilla-daemon at icedtea.classpath.org Wed Apr 2 05:17:56 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Apr 2008 12:17:56 +0000 Subject: [Bug 132] javaws throws NullPointerException Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=132 langel at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|jsumali 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 jsumali at redhat.com Wed Apr 2 08:24:40 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Wed, 02 Apr 2008 15:24:40 +0000 Subject: changeset in /hg/icedtea6: 2008-04-02 Joshua Sumali changeset 19faa491fb91 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=19faa491fb91 description: 2008-04-02 Joshua Sumali * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed image loading. diffstat: 2 files changed, 9 insertions(+) ChangeLog | 5 +++++ rt/net/sourceforge/jnlp/runtime/InstallDialog.java | 4 ++++ diffs (37 lines): diff -r bf41c62c449a -r 19faa491fb91 ChangeLog --- a/ChangeLog Wed Apr 02 05:03:14 2008 -0400 +++ b/ChangeLog Wed Apr 02 11:23:56 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-02 Gary Benson + + * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed image + loading. + 2008-04-02 Gary Benson * patches/icedtea-zero.patch: Workaround for arm. diff -r bf41c62c449a -r 19faa491fb91 rt/net/sourceforge/jnlp/runtime/InstallDialog.java --- a/rt/net/sourceforge/jnlp/runtime/InstallDialog.java Wed Apr 02 05:03:14 2008 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/InstallDialog.java Wed Apr 02 11:23:56 2008 -0400 @@ -54,8 +54,10 @@ class InstallDialog extends Dialog imple InstallDialog() { super(createFrame(), R("CChooseCache"), true); + /* background = new ImageIcon(getClass().getClassLoader().getResource("net/sourceforge/jnlp/resources/install.png")); + */ setLayout(new BorderLayout()); setBackground(Color.white); @@ -118,8 +120,10 @@ class InstallDialog extends Dialog imple } public void paint(Graphics g) { + /* Insets sin = super.getInsets(); g.drawImage(background.getImage(), sin.left, sin.top, this); + */ } public void actionPerformed(ActionEvent evt) { From bugzilla-daemon at icedtea.classpath.org Wed Apr 2 08:42:10 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Apr 2008 15:42:10 +0000 Subject: [Bug 133] New: Tomcat+SSL: Invalid keystore format Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=133 Summary: Tomcat+SSL: Invalid keystore format Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: beuc at beuc.net Under Debian Etch, I compiled IcedTea6 (17 march), and installed tomcat5.5. I configured it to run with SSL: /usr/lib/jvm/java-6-openjdk/bin/keytool -genkey -alias tomcat -keyalg RSA -keystore /usr/share/tomcat5.5/.keystore # passwd: changeit sudo chown tomcat55: /usr/share/tomcat5.5/.keystore sudo chmod 600 /usr/share/tomcat5.5/.keystore # Simulate Fedora path for now: sudo mkdir -p /etc/pki/tls/certs/ sudo ln -s /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt # Modify /etc/tomcat5.5/server.xml and uncomment "Define a SSL HTTP/1.1 Connector on port 8443" Relevant config: On startup I get: ... INFO: Initialisation de Coyote HTTP/1.1 sur http-8180 2 avr. 2008 16:55:26 org.apache.coyote.http11.Http11BaseProtocol init GRAVE: Erreur ? l'initialisation du point de contact java.io.IOException: Invalid keystore format at sun.security.provider.JavaKeyStore.engineLoad(JavaKeyStore.java:650) at sun.security.provider.JavaKeyStore$JKS.engineLoad(JavaKeyStore.java:55) at java.security.KeyStore.load(KeyStore.java:1201) at org.apache.tomcat.util.net.jsse.JSSESocketFactory.getStore(JSSESocketFactory.java:282) at org.apache.tomcat.util.net.jsse.JSSESocketFactory.getTrustStore(JSSESocketFactory.java:256) at org.apache.tomcat.util.net.jsse.JSSE14SocketFactory.getTrustManagers(JSSE14SocketFactory.java:174) at org.apache.tomcat.util.net.jsse.JSSE14SocketFactory.init(JSSE14SocketFactory.java:111) at org.apache.tomcat.util.net.jsse.JSSESocketFactory.createSocket(JSSESocketFactory.java:88) at org.apache.tomcat.util.net.PoolTcpEndpoint.initEndpoint(PoolTcpEndpoint.java:292) at org.apache.coyote.http11.Http11BaseProtocol.init(Http11BaseProtocol.java:138) at org.apache.catalina.connector.Connector.initialize(Connector.java:1016) at org.apache.catalina.core.StandardService.initialize(StandardService.java:580) at org.apache.catalina.core.StandardServer.initialize(StandardServer.java:791) at org.apache.catalina.startup.Catalina.load(Catalina.java:503) at org.apache.catalina.startup.Catalina.load(Catalina.java:523) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:266) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:431) 2 avr. 2008 16:55:26 org.apache.catalina.startup.Catalina load GRAVE: Catalina.start LifecycleException: L'initialisation du gestionnaire de protocole a ?chou?: java.io.IOException: Invalid keystore format at org.apache.catalina.connector.Connector.initialize(Connector.java:1018) at org.apache.catalina.core.StandardService.initialize(StandardService.java:580) at org.apache.catalina.core.StandardServer.initialize(StandardServer.java:791) at org.apache.catalina.startup.Catalina.load(Catalina.java:503) at org.apache.catalina.startup.Catalina.load(Catalina.java:523) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:266) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:431) 2 avr. 2008 16:55:26 org.apache.catalina.startup.Catalina load INFO: Initialization processed in 1987 ms 2 avr. 2008 16:55:27 org.apache.catalina.core.StandardService start INFO: D?marrage du service Catalina ... When using Sun's JRE 1.5 instead, it works fine (without modifying the keystore). I see this also reported at: http://www.mail-archive.com/users at tomcat.apache.org/msg40851.html where the user installed JRE 1.6 instead of IcedTea to make things work. I don't see this bug reported in bugzilla (search "keystore" returned zarro bugs), so I'm reporting 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 xerxes at zafena.se Thu Apr 3 07:09:45 2008 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 03 Apr 2008 16:09:45 +0200 Subject: icedtea zero ARM atomic patch Message-ID: <47F4E529.50001@zafena.se> Greetings! Here is a patch for the ARM zero port to deal with missing atomic operations in the ARM hardware, here implemented using linux-kernelcalls. With this patch the zero hotspot and bootstrap-ecj part of icedtea6 do compile on ARM targets. Have a great day! Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: 1apr.icedtea.zero.arm.atomic.patch Type: text/x-patch Size: 5639 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080403/eff2e3ee/1apr.icedtea.zero.arm.atomic.patch From bugzilla-daemon at icedtea.classpath.org Thu Apr 3 07:31:52 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Apr 2008 14:31:52 +0000 Subject: [Bug 108] Assistive Technology not found: org.GNOME.Accessibility.JavaBridge Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=108 ------- Comment #1 from doko at ubuntu.com 2008-04-03 14:31 ------- is this a packaged build, or a build made by yourself? If it's the Ubuntu package, please recheck with the openjdk-6-jre package and see if the problem is still there. The jar should be in this location once openjdk-6-jre is 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 Thu Apr 3 07:34:28 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Apr 2008 14:34:28 +0000 Subject: [Bug 77] IcedTea b21 crashed on Ubuntu Gutsy / AMD64 and Eclipse Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=77 ------- Comment #5 from doko at ubuntu.com 2008-04-03 14:34 ------- please could you recheck with the openjdk-6-jre package in Ubuntu hardy? -- 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 Apr 3 07:40:21 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Apr 2008 14:40:21 +0000 Subject: [Bug 123] Fail to build with static libstdc++ Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=123 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WONTFIX ------- Comment #3 from doko at ubuntu.com 2008-04-03 14:40 ------- this should be fixed by: 2008-03-12 Matthias Klose * patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk): Find libgcj.so when the version of gcc != the version of gcj. gcj 4.1.x in etch is a bit old for the bootstrap. Closing as wontfix. -- 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 ubuntu.com Thu Apr 3 08:01:47 2008 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 03 Apr 2008 17:01:47 +0200 Subject: [patch icedtea/openjdk] reenables FSEM mode for the xorg server 1.3+ Message-ID: <47F4F15B.5060605@ubuntu.com> Patch attached in upstream list which re-enables FSEM mode for the xorg server 1.3+: http://mail.openjdk.java.net/pipermail/2d-dev/2008-January/000129.html Awaiting approval from java2d team for inclusion in OpenJDK6 and 7. Ok to checkin? Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: xinerama.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080403/194151ff/xinerama.diff From langel at redhat.com Thu Apr 3 08:39:52 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 03 Apr 2008 15:39:52 +0000 Subject: changeset in /hg/icedtea6: 2008-04-03 Lillian Angel changeset 84746d84e2db in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=84746d84e2db description: 2008-04-03 Lillian Angel * NEWS: Updated for icedtea6. diffstat: 2 files changed, 6 insertions(+), 57 deletions(-) ChangeLog | 4 ++++ NEWS | 59 ++--------------------------------------------------------- diffs (75 lines): diff -r 0fd2fbf0dfd0 -r 84746d84e2db ChangeLog --- a/ChangeLog Mon Mar 31 23:19:32 2008 -0400 +++ b/ChangeLog Thu Apr 03 11:35:03 2008 -0400 @@ -1,3 +1,7 @@ 2008-03-31 Lillian Angel + + * NEWS: Updated for icedtea6. + 2008-03-31 Lillian Angel * patches/icedtea-jpegclasses.patch: Added new class. diff -r 0fd2fbf0dfd0 -r 84746d84e2db NEWS --- a/NEWS Mon Mar 31 23:19:32 2008 -0400 +++ b/NEWS Thu Apr 03 11:35:03 2008 -0400 @@ -1,58 +1,3 @@ New in release 1.6 (2008-02-13) -New in release 1.6 (2008-02-13) +New in release 1.0 (2008-02-15) -- Zero-assembler implemented. -- Netx support added. Still a work-in-progress. -- Updated to build with gcc 4.3. -- Many bug fixes. - -New in release 1.5 (2008-01-03) - -- ppc/ppc64 support. -- ecj bootstrapping re-implemented. -- Updated to OpenJDK b24 build (now uses mercurial). -- System libraries (libpng, libjpeg, zlib, giflib) are used -instead of OpenJDK's implementations. -- Several bug fixes. - -New in release 1.4 (2007-10-12) - -* Updated to OpenJDK b21 build (README and INSTALL updated accordingly). -* Now using SSL/Crypto support included in b21, OpenSSL certs -still read directly. -* TZdata fix: uses System's timezone data. -* Memory issue fix: maximum PermGen space set to 128M and MaxHeap -to 512M. -* Xinerama fix: uses system installed library instead. -* DebugInfo fix: generates full debuginfo, regardless of -optimization. -* Fixed JConsole crash. -* Several other bug fixes. - -New in release 1.3 (2007-08-29) - -* Updated to OpenJDK b18 build. -* Web browser plugin support using gcjwebplugin. -* Now using Font supported included in b18. -* Graphics fixes. -* SSL/Crypto fixes. -* Refactored build process. - -New in release 1.2 (2007-08-01) - -* Updated to OpenJDK b16 build. -* Freetype font support fully replacing the encumbered libt2k. -* Path widening imported from GNU Classpath. -* Window decorations on x86_64 fixed. -* Bug fixes in various graphics classes. -* Anti-aliasing support explicitly disabled (instead of crashing). -* OpenSSL certs read directly -* Various crypto bug fixes. - -New in release 1.1 (2007-07-12) - -* Color management and raster fixes for compatibility with LittleCMS. -* Debuginfo is always generated. -* Initial work to satisfy libt2k requirement with Freetype. -* The GNU Crypto security providers have been imported from GNU - Classpath. -* IcedTls security provider. +- Initial release From langel at redhat.com Thu Apr 3 08:39:53 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 03 Apr 2008 15:39:53 +0000 Subject: changeset in /hg/icedtea6: Merged heads Message-ID: changeset a1df62f82c24 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a1df62f82c24 description: Merged heads diffstat: 6 files changed, 74 insertions(+), 1 deletion(-) ChangeLog | 15 +++++++++++ Makefile.am | 1 Makefile.in | 3 +- patches/icedtea-arm-uname.patch | 26 ++++++++++++++++++++ patches/icedtea-zero.patch | 26 ++++++++++++++++++++ rt/net/sourceforge/jnlp/runtime/InstallDialog.java | 4 +++ diffs (137 lines): diff -r 84746d84e2db -r a1df62f82c24 ChangeLog --- a/ChangeLog Thu Apr 03 11:35:03 2008 -0400 +++ b/ChangeLog Thu Apr 03 11:36:59 2008 -0400 @@ -1,6 +1,21 @@ 2008-04-03 Lillian Angel * NEWS: Updated for icedtea6. + +2008-04-02 Joshua Sumali + + * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Removed image + loading. + +2008-04-02 Gary Benson + + * patches/icedtea-zero.patch: Workaround for arm. + +2008-04-01 Gary Benson + + * patches/icedtea-arm-uname.patch: New file. + * Makefile.am: Added the above. + * Makefile.in: Regenerated. 2008-03-31 Lillian Angel diff -r 84746d84e2db -r a1df62f82c24 Makefile.am --- a/Makefile.am Thu Apr 03 11:35:03 2008 -0400 +++ b/Makefile.am Thu Apr 03 11:36:59 2008 -0400 @@ -278,6 +278,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ + patches/icedtea-arm-uname.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r 84746d84e2db -r a1df62f82c24 Makefile.in --- a/Makefile.in Thu Apr 03 11:35:03 2008 -0400 +++ b/Makefile.in Thu Apr 03 11:36:59 2008 -0400 @@ -384,7 +384,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-generated.patch patches/icedtea-lib64.patch \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ - patches/icedtea-jpegclasses.patch $(GCC_PATCH) \ + patches/icedtea-jpegclasses.patch \ + patches/icedtea-arm-uname.patch $(GCC_PATCH) \ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3) # Patch OpenJDK for plug replacements and ecj. diff -r 84746d84e2db -r a1df62f82c24 patches/icedtea-arm-uname.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-arm-uname.patch Thu Apr 03 11:36:59 2008 -0400 @@ -0,0 +1,26 @@ +diff -r 29e7597d75c4 openjdk/jdk/make/common/shared/Platform.gmk +--- openjdk/jdk/make/common/shared/Platform.gmk Fri Mar 28 14:19:36 2008 +0000 ++++ openjdk/jdk/make/common/shared/Platform.gmk Tue Apr 01 09:02:17 2008 +0100 +@@ -205,6 +205,9 @@ ifeq ($(SYSTEM_UNAME), Linux) + sparc*) \ + echo sparc \ + ;; \ ++ arm*) \ ++ echo arm \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \ +diff -r 29e7597d75c4 openjdk/corba/make/common/shared/Platform.gmk +--- openjdk/corba/make/common/shared/Platform.gmk Fri Mar 28 14:19:36 2008 +0000 ++++ openjdk/corba/make/common/shared/Platform.gmk Tue Apr 01 09:02:17 2008 +0100 +@@ -194,6 +194,9 @@ ifeq ($(SYSTEM_UNAME), Linux) + sparc*) \ + echo sparc \ + ;; \ ++ arm*) \ ++ echo arm \ ++ ;; \ + *) \ + echo $(mach) \ + ;; \ diff -r 84746d84e2db -r a1df62f82c24 patches/icedtea-zero.patch --- a/patches/icedtea-zero.patch Thu Apr 03 11:35:03 2008 -0400 +++ b/patches/icedtea-zero.patch Thu Apr 03 11:36:59 2008 -0400 @@ -133,3 +133,29 @@ diff -ru openjdk/hotspot/src/share/vm/ut } STEP(140, "(printing VM operation)" ) +diff -r 789c601c8ba9 openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 01 14:49:28 2008 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Apr 02 09:51:37 2008 +0100 +@@ -1690,7 +1690,8 @@ void * os::dll_load(const char *filename + {EM_SPARC32PLUS, EM_SPARC, ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"}, + {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"}, + {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, +- {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"} ++ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, ++ {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"} + }; + + #if (defined IA32) +@@ -1707,9 +1708,11 @@ void * os::dll_load(const char *filename + static Elf32_Half running_arch_code=EM_PPC64; + #elif (defined __powerpc__) + static Elf32_Half running_arch_code=EM_PPC; ++ #elif (defined ARM) ++ static Elf32_Half running_arch_code=EM_ARM; + #else + #error Method os::dll_load requires that one of following is defined:\ +- IA32, AMD64, IA64, __sparc, __powerpc__ ++ IA32, AMD64, IA64, __sparc, __powerpc__, ARM + #endif + + // Identify compatability class for VM's architecture and library's architecture diff -r 84746d84e2db -r a1df62f82c24 rt/net/sourceforge/jnlp/runtime/InstallDialog.java --- a/rt/net/sourceforge/jnlp/runtime/InstallDialog.java Thu Apr 03 11:35:03 2008 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/InstallDialog.java Thu Apr 03 11:36:59 2008 -0400 @@ -54,8 +54,10 @@ class InstallDialog extends Dialog imple InstallDialog() { super(createFrame(), R("CChooseCache"), true); + /* background = new ImageIcon(getClass().getClassLoader().getResource("net/sourceforge/jnlp/resources/install.png")); + */ setLayout(new BorderLayout()); setBackground(Color.white); @@ -118,8 +120,10 @@ class InstallDialog extends Dialog imple } public void paint(Graphics g) { + /* Insets sin = super.getInsets(); g.drawImage(background.getImage(), sin.left, sin.top, this); + */ } public void actionPerformed(ActionEvent evt) { From langel at redhat.com Thu Apr 3 08:51:33 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 03 Apr 2008 15:51:33 +0000 Subject: changeset in /hg/icedtea6: 2008-04-03 Lillian Angel changeset 572473cfa17c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=572473cfa17c description: 2008-04-03 Lillian Angel * README: Updated. * INSTALL: Updated. diffstat: 3 files changed, 8 insertions(+), 7 deletions(-) ChangeLog | 5 +++++ INSTALL | 6 ------ README | 4 +++- diffs (46 lines): diff -r a1df62f82c24 -r 572473cfa17c ChangeLog --- a/ChangeLog Thu Apr 03 11:36:59 2008 -0400 +++ b/ChangeLog Thu Apr 03 11:48:39 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-03 Lillian Angel + + * README: Updated. + * INSTALL: Updated. + 2008-04-03 Lillian Angel * NEWS: Updated for icedtea6. diff -r a1df62f82c24 -r 572473cfa17c INSTALL --- a/INSTALL Thu Apr 03 11:36:59 2008 -0400 +++ b/INSTALL Thu Apr 03 11:48:39 2008 -0400 @@ -65,9 +65,3 @@ the rt plugs certain files need to be de To view all targets that create stamp files, see Makefile.am (section 'All Stamped Targets'). - - -Important Targets ------------------ - -- 'make dist-openjdk' creates a zip of the openjdk sources for the current release. diff -r a1df62f82c24 -r 572473cfa17c README --- a/README Thu Apr 03 11:36:59 2008 -0400 +++ b/README Thu Apr 03 11:48:39 2008 -0400 @@ -39,7 +39,7 @@ FAQ: http://icedtea.classpath.org/wiki/FrequentlyAskedQuestions Anonymous Mercurial checkout: - hg clone http://icedtea.classpath.org/hg/icedtea + hg clone http://icedtea.classpath.org/hg/icedtea6 Java compatibility ------------------ @@ -54,6 +54,8 @@ between now and the time that the Java S between now and the time that the Java SE 7 Platform Specification is finalized. Please take these facts into account before depending upon IcedTea. + +Recently, OpenJDK6 was released. This build is now based on that release. How the Stub Replacements were Produced --------------------------------------- From langel at redhat.com Thu Apr 3 08:56:57 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 03 Apr 2008 15:56:57 +0000 Subject: changeset in /hg/icedtea6: Added more to README about OpenJDK6. Message-ID: changeset 9c62f659edf1 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9c62f659edf1 description: Added more to README about OpenJDK6. diffstat: 1 file changed, 6 insertions(+), 4 deletions(-) README | 10 ++++++---- diffs (24 lines): diff -r 572473cfa17c -r 9c62f659edf1 README --- a/README Thu Apr 03 11:48:39 2008 -0400 +++ b/README Thu Apr 03 11:54:03 2008 -0400 @@ -48,14 +48,16 @@ the Java SE platform. At this time the the Java SE platform. At this time the build from which IcedTea was constructed corresponds to an early build of JDK 7. When JDK 7 is complete it will implement the Java SE 7 Platform Specification. -Work on that specification is underway, but far from final. Any APIs -in the JDK 7 implementation, whether new or old, are therefore subject -to minor adjustments, major revisions, or even outright removal +Any APIs in the JDK 7 implementation, whether new or old, are therefore +subject to minor adjustments, major revisions, or even outright removal between now and the time that the Java SE 7 Platform Specification is finalized. Please take these facts into account before depending upon IcedTea. -Recently, OpenJDK6 was released. This build is now based on that release. +Recently, OpenJDK6 was released. This build (IcedTea6) is based on +that release. OpenJDK6 is approximately 99% complete in terms of encumberences. +IcedTea provides autotools support, a portable interpreter for ppc and +ppc64 support, plugin support and Web Start support. How the Stub Replacements were Produced --------------------------------------- From langel at redhat.com Thu Apr 3 09:08:21 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 03 Apr 2008 16:08:21 +0000 Subject: changeset in /hg/icedtea6: 2008-04-03 Lillian Angel changeset a4bfe46df6cc in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4bfe46df6cc description: 2008-04-03 Lillian Angel * configure.ac: Updated version. * configure: Regenerated. diffstat: 3 files changed, 16 insertions(+), 11 deletions(-) ChangeLog | 5 +++++ configure | 20 ++++++++++---------- configure.ac | 2 +- diffs (107 lines): diff -r 9c62f659edf1 -r a4bfe46df6cc ChangeLog --- a/ChangeLog Thu Apr 03 11:54:03 2008 -0400 +++ b/ChangeLog Thu Apr 03 12:05:27 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-03 Lillian Angel + + * configure.ac: Updated version. + * configure: Regenerated. + 2008-04-03 Lillian Angel * README: Updated. diff -r 9c62f659edf1 -r a4bfe46df6cc configure --- a/configure Thu Apr 03 11:54:03 2008 -0400 +++ b/configure Thu Apr 03 12:05:27 2008 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for icedtea6 1.0. +# Generated by GNU Autoconf 2.61 for icedtea6 1.1. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='icedtea6' PACKAGE_TARNAME='icedtea6' -PACKAGE_VERSION='1.0' -PACKAGE_STRING='icedtea6 1.0' +PACKAGE_VERSION='1.1' +PACKAGE_STRING='icedtea6 1.1' PACKAGE_BUGREPORT='fitzsim at redhat.com' ac_default_prefix=bootstrap @@ -1337,7 +1337,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea6 1.0 to adapt to many kinds of systems. +\`configure' configures icedtea6 1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1407,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea6 1.0:";; + short | recursive ) echo "Configuration of icedtea6 1.1:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ test -n "$ac_init_help" && exit $ac_stat test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea6 configure 1.0 +icedtea6 configure 1.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1577,7 +1577,7 @@ This file contains any messages produced This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea6 $as_me 1.0, which was +It was created by icedtea6 $as_me 1.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2267,7 +2267,7 @@ fi # Define the identity of the package. PACKAGE='icedtea6' - VERSION='1.0' + VERSION='1.1' cat >>confdefs.h <<_ACEOF @@ -12189,7 +12189,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea6 $as_me 1.0, which was +This file was extended by icedtea6 $as_me 1.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12236,7 +12236,7 @@ _ACEOF _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -icedtea6 config.status 1.0 +icedtea6 config.status 1.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -r 9c62f659edf1 -r a4bfe46df6cc configure.ac --- a/configure.ac Thu Apr 03 11:54:03 2008 -0400 +++ b/configure.ac Thu Apr 03 12:05:27 2008 -0400 @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) AC_PREREQ([2.61]) -AC_INIT([icedtea6], [1.0], [fitzsim at redhat.com]) +AC_INIT([icedtea6], [1.1], [fitzsim at redhat.com]) AM_INIT_AUTOMAKE([tar-pax]) AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST From langel at redhat.com Thu Apr 3 10:49:55 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 03 Apr 2008 17:49:55 +0000 Subject: changeset in /hg/icedtea6: 2008-04-03 Lillian Angel changeset cda416b93a69 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cda416b93a69 description: 2008-04-03 Lillian Angel * NEWS: Updated for next release. diffstat: 2 files changed, 17 insertions(+) ChangeLog | 4 ++++ NEWS | 13 +++++++++++++ diffs (31 lines): diff -r a4bfe46df6cc -r cda416b93a69 ChangeLog --- a/ChangeLog Thu Apr 03 12:05:27 2008 -0400 +++ b/ChangeLog Thu Apr 03 13:47:01 2008 -0400 @@ -1,3 +1,7 @@ 2008-04-03 Lillian Angel + + * NEWS: Updated for next release. + 2008-04-03 Lillian Angel * configure.ac: Updated version. diff -r a4bfe46df6cc -r cda416b93a69 NEWS --- a/NEWS Thu Apr 03 12:05:27 2008 -0400 +++ b/NEWS Thu Apr 03 13:47:01 2008 -0400 @@ -1,3 +1,16 @@ New in release 1.0 (2008-02-15) +New in release 1.1 (2008-04-04) + +- Zero builds on any architecture. +- New features added to NetX: + - Certificate fingerprints now show as part + of certificate details. + - gcjwebplugin can now run applets through NetX, + taking advantage of NetX's sandboxing and application security. + - User trusted certificates can be managed by passing the -viewer + option to NetX. +- Updated to b08. +- Several bug fixes. + New in release 1.0 (2008-02-15) - Initial release From langel at redhat.com Thu Apr 3 11:07:08 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 03 Apr 2008 18:07:08 +0000 Subject: changeset in /hg/icedtea6: 2008-04-03 Lillian Angel changeset f9549e833bc4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9549e833bc4 description: 2008-04-03 Lillian Angel * acinclude.m4: Fixed typo. * configure: Regenerated. diffstat: 3 files changed, 8 insertions(+), 3 deletions(-) ChangeLog | 5 +++++ acinclude.m4 | 2 +- configure | 4 ++-- diffs (38 lines): diff -r cda416b93a69 -r f9549e833bc4 ChangeLog --- a/ChangeLog Thu Apr 03 13:47:01 2008 -0400 +++ b/ChangeLog Thu Apr 03 14:04:06 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-03 Lillian Angel + + * acinclude.m4: Fixed typo. + * configure: Regenerated. + 2008-04-03 Lillian Angel * NEWS: Updated for next release. diff -r cda416b93a69 -r f9549e833bc4 acinclude.m4 --- a/acinclude.m4 Thu Apr 03 13:47:01 2008 -0400 +++ b/acinclude.m4 Thu Apr 03 14:04:06 2008 -0400 @@ -214,7 +214,7 @@ AC_DEFUN([FIND_LIBGCJ_JAR], LIBGCJ_JAR= ]) if test -z "${LIBGCJ_JAR}"; then - AC_MSG_CHECKING(for libgcj-4.3.0.jar or lib-4.1.2.jar) + AC_MSG_CHECKING(for libgcj-4.3.0.jar or libgcj-4.1.2.jar) if test -e "/usr/share/java/libgcj-4.3.0.jar"; then LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar AC_MSG_RESULT(${LIBGCJ_JAR}) diff -r cda416b93a69 -r f9549e833bc4 configure --- a/configure Thu Apr 03 13:47:01 2008 -0400 +++ b/configure Thu Apr 03 14:04:06 2008 -0400 @@ -7302,8 +7302,8 @@ fi fi if test -z "${LIBGCJ_JAR}"; then - { echo "$as_me:$LINENO: checking for libgcj-4.3.0.jar or lib-4.1.2.jar" >&5 -echo $ECHO_N "checking for libgcj-4.3.0.jar or lib-4.1.2.jar... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for libgcj-4.3.0.jar or libgcj-4.1.2.jar" >&5 +echo $ECHO_N "checking for libgcj-4.3.0.jar or libgcj-4.1.2.jar... $ECHO_C" >&6; } if test -e "/usr/share/java/libgcj-4.3.0.jar"; then LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar { echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5 From dennis at ausil.us Thu Apr 3 11:06:19 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Thu, 3 Apr 2008 13:06:19 -0500 Subject: OpenJDK zero on sparc linux Message-ID: <200804031306.32076.dennis@ausil.us> Trying to build openJDK on sparc linux using the zero implementation fails with gcc -g -c -o launcher.o launcher.c -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/os/linux/launcher -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/prims -DFULL_VERSION=\"1.6.0-b08\" -DARCH=\"sparc\"-DGAMMA -DLAUNCHER_TYPE=\"gamma\" -DLINK_INTO_LIBJVM -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DSPARC -DZERO_LIBARCH=\"sparc\" -DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/asm -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/c1 -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/ci -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/classfile -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/code -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/compiler -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/shared -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parNew -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parallelScavenge -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_interface -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/interpreter -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/memory -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/oops -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/prims -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/runtime -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/services -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/utilities -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/cpu/zero/vm -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/os/linux/vm -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/os_cpu/linux_zero/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"1.6.0-b08\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"mockbuild\"" -DJRE_RELEASE_VERSION="\"1.6.0-b08\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" { \ echo Linking launcher...; \ \ gcc -Xlinker -O1 -export-dynamic -L `pwd` -o gamma launcher.o -ljvm -lm -ldl -lpthread; \ \ } Linking launcher... /usr/bin/ld: cannot find -ljvm earlier in the build its able to find jvm to link against Full build log is http://files.ausil.us/aurora/openjdk-build.log spec file is http://files.ausil.us/aurora/java-1.6.0-openjdk.spec Dennis p.s. im not subscribed to this list so please CC me on replies -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: This is a digitally signed message part. Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080403/e98efeed/attachment.bin From gbenson at redhat.com Fri Apr 4 01:27:46 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 4 Apr 2008 09:27:46 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <200804031306.32076.dennis@ausil.us> References: <200804031306.32076.dennis@ausil.us> Message-ID: <20080404082746.GA4008@redhat.com> Hi Dennis, The real error is above this one -- it failed to build libjvm.so with a load of "relocation truncated to fit" errors. If you look in openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a bit like this: # position-independent code ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) PICFLAG = -fPIC else PICFLAG = -fpic endif Add "sparc" to that list, then rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the broken files, then try again. If that works I'll commit a fix. Cheers, Gary Dennis Gilmore wrote: > Trying to build openJDK on sparc linux using the zero implementation fails > with > gcc -g -c -o launcher.o > launcher.c -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/os/linux/launcher -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/prims -DFULL_VERSION=\"1.6.0-b08\" -DARCH=\"sparc\"-DGAMMA -DLAUNCHER_TYPE=\"gamma\" -DLINK_INTO_LIBJVM -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DSPARC -DZERO_LIBARCH=\"sparc\" -DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/asm -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/c1 -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/ci -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/classfile -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/code -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/compiler -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/shared -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parNew -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parallelScavenge -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/gc_interface -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/interpreter -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/memory -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/oops -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/prims -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/runtime -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/services -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/share/vm/utilities -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/cpu/zero/vm -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/os/linux/vm -I/builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/hotspot/src/os_cpu/linux_zero/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"1.6.0-b08\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"mockbuild\"" -DJRE_RELEASE_VERSION="\"1.6.0-b08\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" > { \ > echo Linking launcher...; \ > \ > gcc -Xlinker -O1 -export-dynamic -L `pwd` -o gamma > launcher.o -ljvm -lm -ldl -lpthread; \ > \ > } > Linking launcher... > /usr/bin/ld: cannot find -ljvm > > earlier in the build its able to find jvm to link against > > Full build log is http://files.ausil.us/aurora/openjdk-build.log > spec file is http://files.ausil.us/aurora/java-1.6.0-openjdk.spec > > Dennis > > p.s. im not subscribed to this list so please CC me on replies -- http://gbenson.net/ From gbenson at redhat.com Fri Apr 4 01:40:27 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 04 Apr 2008 08:40:27 +0000 Subject: changeset in /hg/icedtea6: 2008-04-04 Gary Benson changeset a5c32475a2e8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a5c32475a2e8 description: 2008-04-04 Gary Benson * patches/icedtea-ia64-bugfix.patch: New file. * Makefile.am: Added the above. * Makefile.in: Regenerated. diffstat: 4 files changed, 26 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 3 ++- Makefile.in | 3 ++- patches/icedtea-ia64-bugfix.patch | 16 ++++++++++++++++ diffs (59 lines): diff -r f9549e833bc4 -r a5c32475a2e8 ChangeLog --- a/ChangeLog Thu Apr 03 14:04:06 2008 -0400 +++ b/ChangeLog Fri Apr 04 04:40:21 2008 -0400 @@ -1,3 +1,9 @@ 2008-04-03 Lillian Angel + + * patches/icedtea-ia64-bugfix.patch: New file. + * Makefile.am: Added the above. + * Makefile.in: Regenerated. + 2008-04-03 Lillian Angel * acinclude.m4: Fixed typo. diff -r f9549e833bc4 -r a5c32475a2e8 Makefile.am --- a/Makefile.am Thu Apr 03 14:04:06 2008 -0400 +++ b/Makefile.am Fri Apr 04 04:40:21 2008 -0400 @@ -233,7 +233,8 @@ ZERO_PATCHES = \ patches/icedtea-signature-iterator.patch \ patches/icedtea-signed-types.patch \ patches/icedtea-test-atomic-operations.patch \ - patches/icedtea-zero.patch + patches/icedtea-zero.patch \ + patches/icedtea-ia64-bugfix.patch if ZERO_BUILD ZERO_PATCHES_COND = $(ZERO_PATCHES) diff -r f9549e833bc4 -r a5c32475a2e8 Makefile.in --- a/Makefile.in Thu Apr 03 14:04:06 2008 -0400 +++ b/Makefile.in Fri Apr 04 04:40:21 2008 -0400 @@ -354,7 +354,8 @@ ZERO_PATCHES = \ patches/icedtea-signature-iterator.patch \ patches/icedtea-signed-types.patch \ patches/icedtea-test-atomic-operations.patch \ - patches/icedtea-zero.patch + patches/icedtea-zero.patch \ + patches/icedtea-ia64-bugfix.patch @ZERO_BUILD_FALSE at ZERO_PATCHES_COND = @ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES) diff -r f9549e833bc4 -r a5c32475a2e8 patches/icedtea-ia64-bugfix.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-ia64-bugfix.patch Fri Apr 04 04:40:21 2008 -0400 @@ -0,0 +1,16 @@ +diff -r 114e54fc994e openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp +--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:33:18 2008 +0100 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:34:11 2008 +0100 +@@ -1281,12 +1281,7 @@ run: + jfloat f; + jdouble r; + f = STACK_FLOAT(-1); +-#ifdef IA64 +- // IA64 gcc bug +- r = ( f == 0.0f ) ? (jdouble) f : (jdouble) f + ia64_double_zero; +-#else + r = (jdouble) f; +-#endif + MORE_STACK(-1); // POP + SET_STACK_DOUBLE(r, 1); + UPDATE_PC_AND_TOS_AND_CONTINUE(1, 2); From gbenson at redhat.com Fri Apr 4 01:57:20 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 4 Apr 2008 09:57:20 +0100 Subject: icedtea zero ARM atomic patch In-Reply-To: <47F4E529.50001@zafena.se> References: <47F4E529.50001@zafena.se> Message-ID: <20080404085720.GE4008@redhat.com> Xerxes R?nby wrote: > Here is a patch for the ARM zero port to deal with missing atomic > operations in the ARM hardware, here implemented using > linux-kernelcalls. With this patch the zero hotspot and > bootstrap-ecj part of icedtea6 do compile on ARM targets. Hi Xerxes, I'll take a look at these, maybe later today but probably Monday. Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Fri Apr 4 02:02:49 2008 From: aph at redhat.com (Andrew Haley) Date: Fri, 04 Apr 2008 10:02:49 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080404082746.GA4008@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> Message-ID: <47F5EEB9.5090304@redhat.com> Gary Benson wrote: > Hi Dennis, > > The real error is above this one -- it failed to build libjvm.so with > a load of "relocation truncated to fit" errors. If you look in > openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a bit > like this: > > # position-independent code > ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) > PICFLAG = -fPIC > else > PICFLAG = -fpic > endif > > Add "sparc" to that list, then > rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the > broken files, then try again. If that works I'll commit a fix. I think for a program of this size you'll probably want "big PIC" (-fPIC) everywhere. Andrew. From gbenson at redhat.com Fri Apr 4 02:44:05 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 4 Apr 2008 10:44:05 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <47F5EEB9.5090304@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> Message-ID: <20080404094404.GF4008@redhat.com> Andrew Haley wrote: > Gary Benson wrote: > > The real error is above this one -- it failed to build libjvm.so > > with a load of "relocation truncated to fit" errors. If you look > > in openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see > > a bit like this: > > > > # position-independent code > > ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) > > PICFLAG = -fPIC > > else > > PICFLAG = -fpic > > endif > > > > Add "sparc" to that list, then > > rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the > > broken files, then try again. If that works I'll commit a fix. > > I think for a program of this size you'll probably want "big PIC" > (-fPIC) everywhere. Really? I only touched the platforms I saw failures on, didn't want to mess with anything else. Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Fri Apr 4 03:35:30 2008 From: aph at redhat.com (Andrew Haley) Date: Fri, 04 Apr 2008 11:35:30 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080404094404.GF4008@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> Message-ID: <47F60472.4060309@redhat.com> Gary Benson wrote: > Andrew Haley wrote: >> Gary Benson wrote: >>> The real error is above this one -- it failed to build libjvm.so >>> with a load of "relocation truncated to fit" errors. If you look >>> in openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see >>> a bit like this: >>> >>> # position-independent code >>> ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) >>> PICFLAG = -fPIC >>> else >>> PICFLAG = -fpic >>> endif >>> >>> Add "sparc" to that list, then >>> rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the >>> broken files, then try again. If that works I'll commit a fix. >> I think for a program of this size you'll probably want "big PIC" >> (-fPIC) everywhere. > > Really? I only touched the platforms I saw failures on, didn't want > to mess with anything else. I's probably best to make big PIC the default, and allow small PIC only where you know it'll work. Big PIC is never going to break anything, so it's the conservative choice. Andrew. From gbenson at redhat.com Fri Apr 4 03:42:17 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 4 Apr 2008 11:42:17 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <47F60472.4060309@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60472.4060309@redhat.com> Message-ID: <20080404104217.GG4008@redhat.com> Andrew Haley wrote: > Gary Benson wrote: > > Andrew Haley wrote: > > > I think for a program of this size you'll probably want "big > > > PIC" (-fPIC) everywhere. > > > > Really? I only touched the platforms I saw failures on, didn't > > want to mess with anything else. > > I's probably best to make big PIC the default, and allow small PIC > only where you know it'll work. Big PIC is never going to break > anything, so it's the conservative choice. Ok. Cheers, Gary -- http://gbenson.net/ From langel at redhat.com Fri Apr 4 07:00:07 2008 From: langel at redhat.com (Lillian Angel) Date: Fri, 04 Apr 2008 14:00:07 +0000 Subject: changeset in /hg/icedtea6: Added tag icedtea6-1.1 for changeset ... Message-ID: changeset 26bd96e2a20b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=26bd96e2a20b description: Added tag icedtea6-1.1 for changeset a5c32475a2e8 diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r a5c32475a2e8 -r 26bd96e2a20b .hgtags --- a/.hgtags Fri Apr 04 04:40:21 2008 -0400 +++ b/.hgtags Fri Apr 04 09:56:54 2008 -0400 @@ -6,3 +6,4 @@ 5ca86e9ca40533c48ca3445a10fd3b058ef94885 5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5 bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6 38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 +a5c32475a2e87f0f3bd7af28e632e6bd4f724b04 icedtea6-1.1 From langel at redhat.com Fri Apr 4 07:07:48 2008 From: langel at redhat.com (Lillian Angel) Date: Fri, 04 Apr 2008 10:07:48 -0400 Subject: IcedTea6 1.1 Released! Message-ID: <47F63634.2010808@redhat.com> We are proud to announce the release of IcedTea6 1.1. The IcedTea6 project provides a harness to build the source code from OpenJDK6 (http://openjdk.java.net) using Free Software build tools and provides replacements libraries for the binary plugs with code from the GNU Classpath project. More information on IcedTea can be found here: http://icedtea.classpath.org What's New? ----------------- - Zero builds on any architecture. - New features added to NetX: - Certificate fingerprints now show as part of certificate details. - gcjwebplugin can now run applets through NetX, taking advantage of NetX's sandboxing and application security. - User trusted certificates can be managed by passing the -viewer option to NetX. - Updated to b08. - Many bug fixes (http://icedtea.classpath.org/bugzilla/ and https://bugzilla.redhat.com/). ----------------- The tarball and nosrc RPM can be downloaded here: http://icedtea.classpath.org/download/fedora/java-1.6.0-openjdk-1.6.0.0-0.8.b08.fc9.nosrc.rpm http://icedtea.classpath.org/download/source/icedtea6-1.1.tar.gz The following people helped with this release: Matthias Klose, Christian Thalinger, Mark Wielaard, Joshua Sumali, Gary Benson, Andrew Haley, Thomas Fitzsimmons, Keith Seitz, Lillian Angel We would also like to thank the bug reporters and testers! To get started: $ hg clone http://icedtea.classpath.org/hg/icedtea6 $ cd icedtea6 Full build requirements and instructions are in INSTALL: $ ./configure $ make From dennis at ausil.us Fri Apr 4 07:30:06 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Fri, 4 Apr 2008 09:30:06 -0500 Subject: OpenJDK zero on sparc linux In-Reply-To: <200804040923.16318.dennis@ausil.us> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <200804040923.16318.dennis@ausil.us> Message-ID: <200804040930.08263.dennis@ausil.us> On Friday 04 April 2008, Dennis Gilmore wrote: > On Friday 04 April 2008, Gary Benson wrote: > > Hi Dennis, > > > > The real error is above this one -- it failed to build libjvm.so with > > a load of "relocation truncated to fit" errors. If you look in > > openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a bit > > like this: > > > > # position-independent code > > ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) > > PICFLAG = -fPIC > > else > > PICFLAG = -fpic > > endif > > > > Add "sparc" to that list, then > > rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the > > broken files, then try again. If that works I'll commit a fix. > > > > Cheers, > > Gary > > ok got through that. getting a new failure > Linking launcher... > /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho >tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to > `__sync_val_compare_and_swap_4' > /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho >tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to > `__sync_lock_test_and_set_4' > /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho >tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to > `__sync_add_and_fetch_4' > collect2: ld returned 1 exit status full build log is at http://files.ausil.us/aurora/openjdk-build-2.log Dennis From aph at redhat.com Fri Apr 4 07:44:11 2008 From: aph at redhat.com (Andrew Haley) Date: Fri, 04 Apr 2008 15:44:11 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <200804040930.08263.dennis@ausil.us> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <200804040923.16318.dennis@ausil.us> <200804040930.08263.dennis@ausil.us> Message-ID: <47F63EBB.9060405@redhat.com> Dennis Gilmore wrote: > On Friday 04 April 2008, Dennis Gilmore wrote: >> On Friday 04 April 2008, Gary Benson wrote: >>> Hi Dennis, >>> >>> The real error is above this one -- it failed to build libjvm.so with >>> a load of "relocation truncated to fit" errors. If you look in >>> openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a bit >>> like this: >>> >>> # position-independent code >>> ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) >>> PICFLAG = -fPIC >>> else >>> PICFLAG = -fpic >>> endif >>> >>> Add "sparc" to that list, then >>> rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the >>> broken files, then try again. If that works I'll commit a fix. >>> >>> Cheers, >>> Gary >> ok got through that. getting a new failure >> Linking launcher... >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho >> tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to >> `__sync_val_compare_and_swap_4' >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho >> tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to >> `__sync_lock_test_and_set_4' >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho >> tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to >> `__sync_add_and_fetch_4' >> collect2: ld returned 1 exit status > full build log is at http://files.ausil.us/aurora/openjdk-build-2.log This isn't really a bug; we just need someone with access to Sun hardware to write __sync_val_compare_and_swap_4, __sync_lock_test_and_set_4, and __sync_add_and_fetch_4. Andrew. From gnu_andrew at member.fsf.org Fri Apr 4 08:07:30 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 4 Apr 2008 16:07:30 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <47F63EBB.9060405@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <200804040923.16318.dennis@ausil.us> <200804040930.08263.dennis@ausil.us> <47F63EBB.9060405@redhat.com> Message-ID: <17c6771e0804040807i3e3c0f78y924aec0760b3480@mail.gmail.com> On 04/04/2008, Andrew Haley wrote: > Dennis Gilmore wrote: > > On Friday 04 April 2008, Dennis Gilmore wrote: > >> On Friday 04 April 2008, Gary Benson wrote: > >>> Hi Dennis, > >>> > >>> The real error is above this one -- it failed to build libjvm.so with > >>> a load of "relocation truncated to fit" errors. If you look in > >>> openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a bit > >>> like this: > >>> > >>> # position-independent code > >>> ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) > >>> PICFLAG = -fPIC > >>> else > >>> PICFLAG = -fpic > >>> endif > >>> > >>> Add "sparc" to that list, then > >>> rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the > >>> broken files, then try again. If that works I'll commit a fix. > >>> > >>> Cheers, > >>> Gary > >> ok got through that. getting a new failure > >> Linking launcher... > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho > >> tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to > >> `__sync_val_compare_and_swap_4' > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho > >> tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to > >> `__sync_lock_test_and_set_4' > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/ho > >> tspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to > >> `__sync_add_and_fetch_4' > >> collect2: ld returned 1 exit status > > full build log is at http://files.ausil.us/aurora/openjdk-build-2.log > > > This isn't really a bug; we just need someone with access to Sun hardware to > write __sync_val_compare_and_swap_4, __sync_lock_test_and_set_4, and > __sync_add_and_fetch_4. > > > Andrew. > I'm correct in assuming this is just an experiment to test zero, right? Because HotSpot has SPARC JIT support. -- Andrew :-) 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 dennis at ausil.us Fri Apr 4 08:16:35 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Fri, 4 Apr 2008 10:16:35 -0500 Subject: OpenJDK zero on sparc linux In-Reply-To: <17c6771e0804040807i3e3c0f78y924aec0760b3480@mail.gmail.com> References: <200804031306.32076.dennis@ausil.us> <47F63EBB.9060405@redhat.com> <17c6771e0804040807i3e3c0f78y924aec0760b3480@mail.gmail.com> Message-ID: <200804041016.36731.dennis@ausil.us> On Friday 04 April 2008, Andrew John Hughes wrote: > On 04/04/2008, Andrew Haley wrote: > > Dennis Gilmore wrote: > > > On Friday 04 April 2008, Dennis Gilmore wrote: > > >> On Friday 04 April 2008, Gary Benson wrote: > > >>> Hi Dennis, > > >>> > > >>> The real error is above this one -- it failed to build libjvm.so > > >>> with a load of "relocation truncated to fit" errors. If you look > > >>> in openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a > > >>> bit like this: > > >>> > > >>> # position-independent code > > >>> ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) > > >>> PICFLAG = -fPIC > > >>> else > > >>> PICFLAG = -fpic > > >>> endif > > >>> > > >>> Add "sparc" to that list, then > > >>> rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the > > >>> broken files, then try again. If that works I'll commit a fix. > > >>> > > >>> Cheers, > > >>> Gary > > >> > > >> ok got through that. getting a new failure > > >> Linking launcher... > > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sp > > >>arc/ho tspot/outputdir/linux_zero_core/product/libjvm.so: undefined > > >> reference to `__sync_val_compare_and_swap_4' > > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sp > > >>arc/ho tspot/outputdir/linux_zero_core/product/libjvm.so: undefined > > >> reference to `__sync_lock_test_and_set_4' > > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sp > > >>arc/ho tspot/outputdir/linux_zero_core/product/libjvm.so: undefined > > >> reference to `__sync_add_and_fetch_4' > > >> collect2: ld returned 1 exit status > > > > > > full build log is at http://files.ausil.us/aurora/openjdk-build-2.log > > > > This isn't really a bug; we just need someone with access to Sun hardware > > to write __sync_val_compare_and_swap_4, __sync_lock_test_and_set_4, and > > __sync_add_and_fetch_4. > > > > > > Andrew. > > I'm correct in assuming this is just an experiment to test zero, right? > Because HotSpot has SPARC JIT support. No, Its to build on SPARC Linux, HotSpot has solaris SPARC support not linux SPARC support. until someone writes the ASM for linux we have zero, which is more than exists now Dennis From gnu_andrew at member.fsf.org Fri Apr 4 08:24:34 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Fri, 4 Apr 2008 16:24:34 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <200804041016.36731.dennis@ausil.us> References: <200804031306.32076.dennis@ausil.us> <47F63EBB.9060405@redhat.com> <17c6771e0804040807i3e3c0f78y924aec0760b3480@mail.gmail.com> <200804041016.36731.dennis@ausil.us> Message-ID: <17c6771e0804040824s486eaed0j25473f0d48104905@mail.gmail.com> On 04/04/2008, Dennis Gilmore wrote: > On Friday 04 April 2008, Andrew John Hughes wrote: > > On 04/04/2008, Andrew Haley wrote: > > > Dennis Gilmore wrote: > > > > On Friday 04 April 2008, Dennis Gilmore wrote: > > > >> On Friday 04 April 2008, Gary Benson wrote: > > > >>> Hi Dennis, > > > >>> > > > >>> The real error is above this one -- it failed to build libjvm.so > > > >>> with a load of "relocation truncated to fit" errors. If you look > > > >>> in openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a > > > >>> bit like this: > > > >>> > > > >>> # position-independent code > > > >>> ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) > > > >>> PICFLAG = -fPIC > > > >>> else > > > >>> PICFLAG = -fpic > > > >>> endif > > > >>> > > > >>> Add "sparc" to that list, then > > > >>> rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the > > > >>> broken files, then try again. If that works I'll commit a fix. > > > >>> > > > >>> Cheers, > > > >>> Gary > > > >> > > > >> ok got through that. getting a new failure > > > >> Linking launcher... > > > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sp > > > >>arc/ho tspot/outputdir/linux_zero_core/product/libjvm.so: undefined > > > >> reference to `__sync_val_compare_and_swap_4' > > > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sp > > > >>arc/ho tspot/outputdir/linux_zero_core/product/libjvm.so: undefined > > > >> reference to `__sync_lock_test_and_set_4' > > > >> /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sp > > > >>arc/ho tspot/outputdir/linux_zero_core/product/libjvm.so: undefined > > > >> reference to `__sync_add_and_fetch_4' > > > >> collect2: ld returned 1 exit status > > > > > > > > full build log is at http://files.ausil.us/aurora/openjdk-build-2.log > > > > > > This isn't really a bug; we just need someone with access to Sun hardware > > > to write __sync_val_compare_and_swap_4, __sync_lock_test_and_set_4, and > > > __sync_add_and_fetch_4. > > > > > > > > > Andrew. > > > > I'm correct in assuming this is just an experiment to test zero, right? > > Because HotSpot has SPARC JIT support. > > > No, Its to build on SPARC Linux, HotSpot has solaris SPARC support not linux > SPARC support. until someone writes the ASM for linux we have zero, which > is more than exists now > > > Dennis > Yes, I noticed that, but assumed it would be easier to join the existing Linux support to the existing SPARC support and get full JIT support. I don't know much about HotSpot internals yet though, so no doubt someone more knowledgeable on this list can comment on what's required. FWIW, I think Gary's work on zero is fantastic and it's great to have OpenJDK on PPC64 here now. It just seems odd to be missing out on the existing full and presumably very optimised SPARC support. -- Andrew :-) 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 dennis at ausil.us Fri Apr 4 08:51:41 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Fri, 4 Apr 2008 10:51:41 -0500 Subject: OpenJDK zero on sparc linux In-Reply-To: <17c6771e0804040824s486eaed0j25473f0d48104905@mail.gmail.com> References: <200804031306.32076.dennis@ausil.us> <200804041016.36731.dennis@ausil.us> <17c6771e0804040824s486eaed0j25473f0d48104905@mail.gmail.com> Message-ID: <200804041051.41807.dennis@ausil.us> On Friday 04 April 2008, Andrew John Hughes wrote: > > Yes, I noticed that, but assumed it would be easier to join the > existing Linux support to the existing SPARC support and get full JIT > support. I don't know much about HotSpot internals yet though, so no > doubt someone more knowledgeable on this list can comment on what's > required. > > FWIW, I think Gary's work on zero is fantastic and it's great to have > OpenJDK on PPC64 here now. It just seems odd to be missing out on the > existing full and presumably very optimised SPARC support. from what i understand the missing ASM is all thats needed, I tried to port the solaris ASM to Linux but it is beyond my skills. though i also saw some parts of code that are assuming SPARC is only built for solaris. until we get the optimised port done. this will get things started. Gary has done an awesome Job. Dennis From gbenson at redhat.com Fri Apr 4 09:05:11 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 4 Apr 2008 17:05:11 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <200804041051.41807.dennis@ausil.us> References: <200804031306.32076.dennis@ausil.us> <200804041016.36731.dennis@ausil.us> <17c6771e0804040824s486eaed0j25473f0d48104905@mail.gmail.com> <200804041051.41807.dennis@ausil.us> Message-ID: <20080404160511.GH4008@redhat.com> Dennis Gilmore wrote: > On Friday 04 April 2008, Andrew John Hughes wrote: > > Yes, I noticed that, but assumed it would be easier to join the > > existing Linux support to the existing SPARC support and get full > > JIT support. I don't know much about HotSpot internals yet > > though, so no doubt someone more knowledgeable on this list can > > comment on what's required. > > > > FWIW, I think Gary's work on zero is fantastic and it's great to > > have OpenJDK on PPC64 here now. It just seems odd to be missing > > out on the existing full and presumably very optimised SPARC > > support. > > from what i understand the missing ASM is all thats needed, I tried > to port the solaris ASM to Linux but it is beyond my skills. though > i also saw some parts of code that are assuming SPARC is only built > for solaris. until we get the optimised port done. this will get > things started. Gary has done an awesome Job. FWIW I hear there's a linux_sparc port floating around Sun that'll be released Real Soon Now. And thanks! Cheers, Gary -- http://gbenson.net/ From gbenson at redhat.com Fri Apr 4 09:09:28 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 4 Apr 2008 17:09:28 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <47F63EBB.9060405@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <200804040923.16318.dennis@ausil.us> <200804040930.08263.dennis@ausil.us> <47F63EBB.9060405@redhat.com> Message-ID: <20080404160928.GI4008@redhat.com> Andrew Haley wrote: > This isn't really a bug; we just need someone with access to > Sun hardware to write __sync_val_compare_and_swap_4, > __sync_lock_test_and_set_4, and __sync_add_and_fetch_4. Speaking of which... Andrew, Xerces posted a patch with arm-specific versions of these functions. Would it be possible to get these rolled into gcc rather than committing them as workarounds in icedtea? (His patch is here: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-April/001607.html) Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Fri Apr 4 09:47:21 2008 From: aph at redhat.com (Andrew Haley) Date: Fri, 04 Apr 2008 17:47:21 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080404160928.GI4008@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <200804040923.16318.dennis@ausil.us> <200804040930.08263.dennis@ausil.us> <47F63EBB.9060405@redhat.com> <20080404160928.GI4008@redhat.com> Message-ID: <47F65B99.2020709@redhat.com> Gary Benson wrote: > Andrew Haley wrote: >> This isn't really a bug; we just need someone with access to >> Sun hardware to write __sync_val_compare_and_swap_4, >> __sync_lock_test_and_set_4, and __sync_add_and_fetch_4. > > Speaking of which... Andrew, Xerces posted a patch with arm-specific > versions of these functions. Would it be possible to get these rolled > into gcc rather than committing them as workarounds in icedtea? No, because gcc only generates these when the processor has hardware support; the RAM has nonse, so Xerces' code will only work on Linux. It really is hard to do this well and portably, so we're going to have to live with this on targets that don't have support. For a portable workaround, we can perhaps do something with pthreads mutexes. Not nice, but it'd work. Andrew. From pauldavidmena at gmail.com Fri Apr 4 10:54:20 2008 From: pauldavidmena at gmail.com (Paul David Mena) Date: Fri, 4 Apr 2008 13:54:20 -0400 Subject: libjavaplugin_oji.so Message-ID: <3e8bfba80804041054u3cd2cc81sc165d1c9e38fa19e@mail.gmail.com> I'm trying to make use of the Juniper Networks SSL VPN on a Linux desktop. According to this article, all that is required is a properly configured symbolic link to libjavaplugin_oji.so. Rather than using the Sun Java packages, I'm trying to do this entirely with icedtea. Accordingly, I've installed the following packages: [root at host]# rpm -qa | grep java tzdata-java-2007h-1.fc8 java-1.7.0-icedtea-plugin-1.7.0.0-0.19.b21.snapshot.fc8 java-1.7.0-icedtea-1.7.0.0-0.19.b21.snapshot.fc8 I noticed, however, that while gcjwebplugin.so is included in the java-1.7.0-icedtea-plugin package, libjavaplugin_oji.so is not: [root at host]# rpm -q java-1.7.0-icedtea-plugin-1.7.0.0-0.19.b21.snapshot.fc8 --provides gcjwebplugin.so java-1.7.0-plugin = 1.7.0.0 java-plugin = 1.7.0 java-1.7.0-icedtea-plugin = 1.7.0.0-0.19.b21.snapshot.fc8 Is this functionality not yet available in icedtea? Thanks in advance. -- Paul David Mena -------------------- pauldavidmena at gmail.com -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080404/8b91b8b5/attachment.html From langel at redhat.com Fri Apr 4 11:05:42 2008 From: langel at redhat.com (Lillian Angel) Date: Fri, 04 Apr 2008 14:05:42 -0400 Subject: libjavaplugin_oji.so In-Reply-To: <3e8bfba80804041054u3cd2cc81sc165d1c9e38fa19e@mail.gmail.com> References: <3e8bfba80804041054u3cd2cc81sc165d1c9e38fa19e@mail.gmail.com> Message-ID: <47F66DF6.1000202@redhat.com> Paul David Mena wrote: > I'm trying to make use of the Juniper Networks SSL VPN on a Linux > desktop. According to this article > , > all that is required is a properly configured symbolic link to > libjavaplugin_oji.so. Rather than using the Sun Java packages, I'm > trying to do this entirely with icedtea. Accordingly, I've installed > the following packages: > > [root at host]# rpm -qa | grep java > tzdata-java-2007h-1.fc8 > java-1.7.0-icedtea-plugin-1.7.0.0-0.19.b21.snapshot.fc8 > java-1.7.0-icedtea-1.7.0.0-0.19.b21.snapshot.fc8 > > I noticed, however, that while gcjwebplugin.so is included in the > java-1.7.0-icedtea-plugin package, libjavaplugin_oji.so is not: > > [root at host]# rpm -q > java-1.7.0-icedtea-plugin-1.7.0.0-0.19.b21.snapshot.fc8 --provides > gcjwebplugin.so > java-1.7.0-plugin = 1.7.0.0 > java-plugin = 1.7.0 > java-1.7.0-icedtea-plugin = 1.7.0.0-0.19.b21.snapshot.fc8 > > Is this functionality not yet available in icedtea? If you have installed java-1.7.0-icedtea-plugin, there should be a symlink between gcjwebplugin.so and libjavaplugin.so. You can easily create another symlink between gcjwebplugin.so and libjavaplugin_oji.so if needed. You might also want to upgrade the package to java-1.6.0-openjdk. This now replaces java-1.7.0-icedtea. Lillian From dennis at ausil.us Fri Apr 4 07:23:14 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Fri, 4 Apr 2008 09:23:14 -0500 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080404082746.GA4008@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> Message-ID: <200804040923.16318.dennis@ausil.us> On Friday 04 April 2008, Gary Benson wrote: > Hi Dennis, > > The real error is above this one -- it failed to build libjvm.so with > a load of "relocation truncated to fit" errors. If you look in > openjdk-ecj/hotspot/build/linux/makefiles/gcc.make you'll see a bit > like this: > > # position-independent code > ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) > PICFLAG = -fPIC > else > PICFLAG = -fpic > endif > > Add "sparc" to that list, then > rm -Rf openjdk-ecj/control/build/linux-*/hotspot to clear out the > broken files, then try again. If that works I'll commit a fix. > > Cheers, > Gary > ok got through that. getting a new failure Linking launcher... /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/hotspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to `__sync_val_compare_and_swap_4' /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/hotspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to `__sync_lock_test_and_set_4' /builddir/build/BUILD/icedtea6-1.0/openjdk-ecj/control/build/linux-sparc/hotspot/outputdir/linux_zero_core/product/libjvm.so: undefined reference to `__sync_add_and_fetch_4' collect2: ld returned 1 exit status Dennis From jsumali at redhat.com Fri Apr 4 13:13:59 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Fri, 04 Apr 2008 20:13:59 +0000 Subject: changeset in /hg/icedtea6: 2008-04-04 Joshua Sumali changeset 172f34f6f4b7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=172f34f6f4b7 description: 2008-04-04 Joshua Sumali * rt/net/sourceforge/jnlp/cache/CacheUtil.java: Added debugging code. * rt/net/sourceforge/jnlp/runtime/Boot.java: Likewise. * rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java: Improved Applet displaying. * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Fixed image loading on the cache dialog. * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Fixed window icon loading. * rt/net/sourceforge/jnlp/security/AccessWarningPane.java: Added icons to warning dialogs. * rt/net/sourceforge/jnlp/security/CertWarningPane.java: Likewise. * rt/net/sourceforge/jnlp/security/MoreInfoPane.java: Likewise. * rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Added NETWORK as type of security access. * rt/net/sourceforge/jnlp/resources/info-small.png: New file. * rt/net/sourceforge/jnlp/resources/warning-small.png: Likewise. * rt/net/sourceforge/jnlp/resources/warning.png: Likewise. diffstat: 10 files changed, 93 insertions(+), 48 deletions(-) ChangeLog | 20 +++++ rt/net/sourceforge/jnlp/cache/CacheUtil.java | 4 - rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 31 +++++--- rt/net/sourceforge/jnlp/runtime/Boot.java | 2 rt/net/sourceforge/jnlp/runtime/InstallDialog.java | 14 +-- rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 5 - rt/net/sourceforge/jnlp/security/AccessWarningPane.java | 41 +++++------ rt/net/sourceforge/jnlp/security/CertWarningPane.java | 9 +- rt/net/sourceforge/jnlp/security/MoreInfoPane.java | 14 +++ rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 1 diffs (336 lines): diff -r 26bd96e2a20b -r 172f34f6f4b7 ChangeLog --- a/ChangeLog Fri Apr 04 09:56:54 2008 -0400 +++ b/ChangeLog Fri Apr 04 16:13:34 2008 -0400 @@ -1,3 +1,23 @@ 2008-04-04 Gary Benson + + * rt/net/sourceforge/jnlp/cache/CacheUtil.java: Added debugging code. + * rt/net/sourceforge/jnlp/runtime/Boot.java: Likewise. + * rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java: Improved Applet + displaying. + * rt/net/sourceforge/jnlp/runtime/InstallDialog.java: Fixed image loading + on the cache dialog. + * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Fixed window icon + loading. + * rt/net/sourceforge/jnlp/security/AccessWarningPane.java: Added icons to + warning dialogs. + * rt/net/sourceforge/jnlp/security/CertWarningPane.java: Likewise. + * rt/net/sourceforge/jnlp/security/MoreInfoPane.java: Likewise. + * rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Added + NETWORK as type of security access. + * rt/net/sourceforge/jnlp/resources/info-small.png: New file. + * rt/net/sourceforge/jnlp/resources/warning-small.png: Likewise. + * rt/net/sourceforge/jnlp/resources/warning.png: Likewise. + 2008-04-04 Gary Benson * patches/icedtea-ia64-bugfix.patch: New file. diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/cache/CacheUtil.java --- a/rt/net/sourceforge/jnlp/cache/CacheUtil.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/cache/CacheUtil.java Fri Apr 04 16:13:34 2008 -0400 @@ -115,10 +115,12 @@ public class CacheUtil { else { try { // this is what URLClassLoader does - location.openConnection().getPermission(); + return location.openConnection().getPermission(); } catch (java.io.IOException ioe) { // should try to figure out the permission + if (JNLPRuntime.isDebug()) + ioe.printStackTrace(); } } diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/resources/info-small.png Binary file rt/net/sourceforge/jnlp/resources/info-small.png has changed diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/resources/warning-small.png Binary file rt/net/sourceforge/jnlp/resources/warning-small.png has changed diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/resources/warning.png Binary file rt/net/sourceforge/jnlp/resources/warning.png has changed diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java --- a/rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java Fri Apr 04 16:13:34 2008 -0400 @@ -22,6 +22,7 @@ import java.awt.event.*; import java.awt.event.*; import java.util.*; import java.util.List; +import java.lang.reflect.InvocationTargetException; import java.net.*; import java.io.*; import javax.swing.*; @@ -168,16 +169,26 @@ public class AppletEnvironment implement appletDesc.getHeight() + insets.top + insets.bottom); } - // do first because some applets need to be displayed before - // starting (they use Component.getImage or something) - cont.show(); - - applet.init(); - applet.start(); - - cont.invalidate(); // this should force the applet to - cont.validate(); // the correct size and to repaint - cont.repaint(); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + // do first because some applets need to be displayed before + // starting (they use Component.getImage or something) + cont.setVisible(true); + + applet.init(); + applet.start(); + + cont.invalidate(); // this should force the applet to + cont.validate(); // the correct size and to repaint + cont.repaint(); + } + }); + } catch (InterruptedException ie) { + + } catch (InvocationTargetException ite) { + + } } catch (Exception ex) { if (JNLPRuntime.isDebug()) diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/runtime/Boot.java --- a/rt/net/sourceforge/jnlp/runtime/Boot.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/Boot.java Fri Apr 04 16:13:34 2008 -0400 @@ -236,6 +236,8 @@ public final class Boot implements Privi url = new URL(ServiceUtil.getBasicService().getCodeBase(), location); } catch (Exception e) { fatalError("Invalid jnlp file " + location); + if (JNLPRuntime.isDebug()) + e.printStackTrace(); } boolean strict = (null != getOption("-strict")); diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/runtime/InstallDialog.java --- a/rt/net/sourceforge/jnlp/runtime/InstallDialog.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/InstallDialog.java Fri Apr 04 16:13:34 2008 -0400 @@ -54,11 +54,9 @@ class InstallDialog extends Dialog imple InstallDialog() { super(createFrame(), R("CChooseCache"), true); - /* - background = - new ImageIcon(getClass().getClassLoader().getResource("net/sourceforge/jnlp/resources/install.png")); - */ - + URL icon = (new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/install.png"); + + background = new ImageIcon(icon); setLayout(new BorderLayout()); setBackground(Color.white); @@ -120,10 +118,10 @@ class InstallDialog extends Dialog imple } public void paint(Graphics g) { - /* + Insets sin = super.getInsets(); g.drawImage(background.getImage(), sin.left, sin.top, this); - */ + } public void actionPerformed(ActionEvent evt) { @@ -161,7 +159,7 @@ class InstallDialog extends Dialog imple Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); id.setLocation(screen.width/2-id.getWidth()/2, screen.height/2-id.getHeight()/2); - id.show(); + id.setVisible(true); if (id.canceled) return null; diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Apr 04 16:13:34 2008 -0400 @@ -454,9 +454,8 @@ public class JNLPRuntime { return; try { - ClassLoader cl = JNLPRuntime.class.getClassLoader(); - windowIcon = new javax.swing.ImageIcon(cl.getResource( - "net/sourceforge/jnlp/resources/netx-icon.png")).getImage(); + windowIcon = new javax.swing.ImageIcon((new sun.misc.Launcher()) + .getClassLoader().getResource("net/sourceforge/jnlp/resources/netx-icon.png")).getImage(); } catch (Exception ex) { if (JNLPRuntime.isDebug()) diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/security/AccessWarningPane.java --- a/rt/net/sourceforge/jnlp/security/AccessWarningPane.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/security/AccessWarningPane.java Fri Apr 04 16:13:34 2008 -0400 @@ -39,21 +39,12 @@ package net.sourceforge.jnlp.security; import java.awt.*; import javax.swing.*; -import javax.swing.border.Border; -import javax.swing.plaf.OptionPaneUI; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeEvent; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.ComponentAdapter; -import java.util.List; -import java.security.cert.Certificate; -import java.security.cert.CertPath; -import sun.swing.DefaultLookup; +import java.net.URL; + import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.runtime.JNLPRuntime; -import net.sourceforge.jnlp.tools.KeyTool; /** * Provides the look and feel for a SecurityWarningDialog. These dialogs are @@ -66,9 +57,15 @@ public class AccessWarningPane extends S public class AccessWarningPane extends SecurityDialogUI { JCheckBox alwaysAllow; - + Object[] extras; + public AccessWarningPane(JComponent x) { super(x); + } + + public AccessWarningPane(JComponent x, Object[] extras) { + super(x); + this.extras = extras; } /** @@ -103,33 +100,31 @@ public class AccessWarningPane extends S //Top label String topLabelText = ""; - String propertyName = ""; switch (type) { case READ_FILE: topLabelText = R("SFileReadAccess"); - propertyName = "OptionPane.warningIcon"; break; case WRITE_FILE: topLabelText = R("SFileWriteAccess"); - propertyName = "OptionPane.warningIcon"; break; case CLIPBOARD_READ: topLabelText = R("SClipboardReadAccess"); - propertyName = "OptionPane.warningIcon"; break; case CLIPBOARD_WRITE: topLabelText = R("SClipboardWriteAccess"); - propertyName = "OptionPane.warningIcon"; break; case PRINTER: topLabelText = R("SPrinterAccess"); - propertyName = "OptionPane.warningIcon"; break; + case NETWORK: + if (extras != null && extras.length >= 0) + topLabelText = R("SNetworkAccess", extras[0]); + else + topLabelText = R("SNetworkAccess", "(address here)"); } - //TODO: Get system icons and add them to our dialogs. - //Icon icon = (Icon)DefaultLookup.get(optionPane,this,propertyName); - JLabel topLabel = new JLabel(htmlWrap(topLabelText)); + ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png")); + JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT); topLabel.setFont(new Font(topLabel.getFont().toString(), Font.BOLD, 12)); JPanel topPanel = new JPanel(new BorderLayout()); @@ -183,6 +178,10 @@ public class AccessWarningPane extends S return JNLPRuntime.getMessage(key); } + private static String R(String key, Object param) { + return JNLPRuntime.getMessage(key, new Object[] {param}); + } + protected String htmlWrap (String s) { return ""+s+""; } diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/security/CertWarningPane.java --- a/rt/net/sourceforge/jnlp/security/CertWarningPane.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/security/CertWarningPane.java Fri Apr 04 16:13:34 2008 -0400 @@ -39,6 +39,8 @@ package net.sourceforge.jnlp.security; import java.awt.*; import javax.swing.*; + + import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import java.security.cert.Certificate; @@ -128,9 +130,9 @@ public class CertWarningPane extends Sec propertyName = "OptionPane.warningIcon"; break; } - //TODO: Get system icons and add them to our dialogs. - //Icon icon = (Icon)DefaultLookup.get(optionPane,this,propertyName); - JLabel topLabel = new JLabel(htmlWrap(topLabelText)); + ImageIcon icon = new ImageIcon((new sun.misc.Launcher()) + .getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png")); + JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT); topLabel.setFont(new Font(topLabel.getFont().toString(), Font.BOLD, 12)); JPanel topPanel = new JPanel(new BorderLayout()); @@ -187,7 +189,6 @@ public class CertWarningPane extends Sec JButton moreInfo = new JButton("More information..."); moreInfo.addActionListener(new MoreInfoButtonListener()); - //TODO: This should check if the X500Issuer is in the cacerts file. if (((SecurityWarningDialog)optionPane).getJarSigner().getRootInCacerts()) bottomLabel = new JLabel(htmlWrap(R("STrustedSource"))); else diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/security/MoreInfoPane.java --- a/rt/net/sourceforge/jnlp/security/MoreInfoPane.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/security/MoreInfoPane.java Fri Apr 04 16:13:34 2008 -0400 @@ -73,7 +73,15 @@ public class MoreInfoPane extends Securi errorPanel.setPreferredSize(new Dimension(400, 70*(numLabels))); for (int i = 0; i < numLabels; i++) { - errorPanel.add(new JLabel(htmlWrap(details.get(i)))); + ImageIcon icon = null; + if (details.get(i).equals(R("STrustedCertificate"))) + icon = new ImageIcon((new sun.misc.Launcher()) + .getClassLoader().getResource("net/sourceforge/jnlp/resources/info-small.png")); + else + icon = new ImageIcon((new sun.misc.Launcher()) + .getClassLoader().getResource("net/sourceforge/jnlp/resources/warning-small.png")); + + errorPanel.add(new JLabel(htmlWrap(details.get(i)), icon, SwingConstants.LEFT)); } JPanel buttonsPanel = new JPanel(new BorderLayout()); @@ -92,6 +100,10 @@ public class MoreInfoPane extends Securi optionPane.add(main); } + private static String R(String key) { + return JNLPRuntime.getMessage(key); + } + /** * Needed to get word-wrap working in JLabels. */ diff -r 26bd96e2a20b -r 172f34f6f4b7 rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java --- a/rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java Fri Apr 04 09:56:54 2008 -0400 +++ b/rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java Fri Apr 04 16:13:34 2008 -0400 @@ -76,6 +76,7 @@ public class SecurityWarningDialog exten CLIPBOARD_READ, CLIPBOARD_WRITE, PRINTER, + NETWORK, VERIFIED, UNVERIFIED, SIGNING_ERROR From mvfranz at gmail.com Sat Apr 5 20:36:01 2008 From: mvfranz at gmail.com (Michael Franz) Date: Sat, 5 Apr 2008 23:36:01 -0400 Subject: request for disable-alsa configure option Message-ID: Hi, Would it be possible to add a --disable-alsa to the Icedtea6 configure script? I have been manually removing the check when building on OS X, but the latest couple of updates have caused problems as the autoconf/aclocal have been giving me trouble. I have been patching configure.ac and not configure as I figured it would be changing less and not require me to update my patch too often. I don't think this option will be intrusive as it can be defaulted to no (thus having alsa enabled by default). Functionality similar to --disable-gcjwebplugin would be sufficient. Thanks Michael -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080405/90afc22a/attachment.html From gnu_andrew at member.fsf.org Mon Apr 7 02:58:56 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 7 Apr 2008 10:58:56 +0100 Subject: request for disable-alsa configure option In-Reply-To: References: Message-ID: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> On 06/04/2008, Michael Franz wrote: > Hi, > > Would it be possible to add a --disable-alsa to the Icedtea6 configure > script? I have been manually removing the check when building on OS X, but > the latest couple of updates have caused problems as the autoconf/aclocal > have been giving me trouble. I have been patching configure.ac and not > configure as I figured it would be changing less and not require me to > update my patch too often. > > I don't think this option will be intrusive as it can be defaulted to no > (thus having alsa enabled by default). > > Functionality similar to --disable-gcjwebplugin would be sufficient. > > > Thanks > > Michael > Seems a sensible option to me. Do you have a patch you could post? -- Andrew :-) 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 twisti at complang.tuwien.ac.at Mon Apr 7 03:03:19 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 07 Apr 2008 12:03:19 +0200 Subject: request for disable-alsa configure option In-Reply-To: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> Message-ID: <1207562599.25074.8.camel@imac523d.theobroma-systems.com> On Mon, 2008-04-07 at 10:58 +0100, Andrew John Hughes wrote: > Seems a sensible option to me. > Do you have a patch you could post? When we are at options, I'd like to have a --disable-docs option. Maybe I can post a patch later. - twisti From gnu_andrew at member.fsf.org Mon Apr 7 03:09:05 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 7 Apr 2008 11:09:05 +0100 Subject: request for disable-alsa configure option In-Reply-To: <1207562599.25074.8.camel@imac523d.theobroma-systems.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <1207562599.25074.8.camel@imac523d.theobroma-systems.com> Message-ID: <17c6771e0804070309n7790abb9p9c88dfacb83ce602@mail.gmail.com> On 07/04/2008, Christian Thalinger wrote: > On Mon, 2008-04-07 at 10:58 +0100, Andrew John Hughes wrote: > > Seems a sensible option to me. > > Do you have a patch you could post? > > > When we are at options, I'd like to have a --disable-docs option. Maybe > I can post a patch later. > > - twisti > > +1 -- Andrew :-) 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 gnu_andrew at member.fsf.org Mon Apr 7 03:15:58 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 7 Apr 2008 11:15:58 +0100 Subject: Generated file changes in IcedTea6 Message-ID: <17c6771e0804070315i577ebc2ai17e50df3f1aed1cd@mail.gmail.com> Is anyone else seeing changed files in generated/sun/awt/X11 after building IcedTea? This is on ppc64 with zero. --- a/generated/sun/awt/X11/awtImageData.java Fri Apr 04 16:13:34 2008 -0400 +++ b/generated/sun/awt/X11/awtImageData.java Mon Apr 07 11:12:08 2008 +0100 @@ -8,7 +8,7 @@ public class awtImageData extends XWrapp public class awtImageData extends XWrapperBase { private Unsafe unsafe = XlibWrapper.unsafe; private final boolean should_free_memory; - public static int getSize() { return 304; } + public static int getSize() { return ((XlibWrapper.dataModel == 32)?(304):(560)); } public int getDataSize() { return getSize(); } long pData; Other files are also changed in a similar way. -- Andrew :-) 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 Mon Apr 7 03:23:17 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 7 Apr 2008 11:23:17 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <47F60698.2090300@frankengul.org> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> Message-ID: <20080407102317.GA3781@redhat.com> S?bastien Bernard wrote: > This turn to be some problem with the arch. > Sometimes, the path is build with sparc, sometimes , with > sparc64. While some libs are build in sparc, the link are done with > the other, thus leading to some not found syndrom. > Next, I rebuild using sparc32 ./configure. > Everything went smooth until it tried to execute the recently build > j2re and j2dk. > Execution aborts immediately, with a SIGABORT. I don't really know > why but I think it's related to the default compiler. > I run an unstable debian and the compiler used is the gcc-4.3, idem > for g++ and gcj. This is probably a multilib issue. What does your uname -m say normally, and what does it say when you use sparc32? > I tried to build the jdk on hppa too and it fails miserable for > the same reason than sparc (uname -m gives hppa64, but userland > is 32bit). Hmmm, that sounds broken. Can you post the output from ./configure for that one? Cheers, Gary -- http://gbenson.net/ From twisti at complang.tuwien.ac.at Mon Apr 7 03:48:14 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 07 Apr 2008 12:48:14 +0200 Subject: Generated file changes in IcedTea6 In-Reply-To: <17c6771e0804070315i577ebc2ai17e50df3f1aed1cd@mail.gmail.com> References: <17c6771e0804070315i577ebc2ai17e50df3f1aed1cd@mail.gmail.com> Message-ID: <1207565294.25074.11.camel@imac523d.theobroma-systems.com> On Mon, 2008-04-07 at 11:15 +0100, Andrew John Hughes wrote: > Is anyone else seeing changed files in generated/sun/awt/X11 after > building IcedTea? > > This is on ppc64 with zero. > > --- a/generated/sun/awt/X11/awtImageData.java Fri Apr 04 16:13:34 2008 -0400 > +++ b/generated/sun/awt/X11/awtImageData.java Mon Apr 07 11:12:08 2008 +0100 > @@ -8,7 +8,7 @@ public class awtImageData extends XWrapp > public class awtImageData extends XWrapperBase { > private Unsafe unsafe = XlibWrapper.unsafe; > private final boolean should_free_memory; > - public static int getSize() { return 304; } > + public static int getSize() { return ((XlibWrapper.dataModel > == 32)?(304):(560)); } > public int getDataSize() { return getSize(); } > > long pData; > > Other files are also changed in a similar way. Yes, this seems to be normal. Matthias Klose also posted something about this some time ago: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-March/001459.html - twisti From bugzilla-daemon at icedtea.classpath.org Mon Apr 7 04:01:01 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 07 Apr 2008 11:01:01 +0000 Subject: [Bug 134] New: Java on linux amd64. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=134 Summary: Java on linux amd64. Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: luis.parras at gmail.com Trying to launch the program ImageJ in a linux amd64, y got an error. Here is the log # # An unexpected error has been detected by Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007faf72588141, pid=13616, tid=1092114768 # # Java VM: IcedTea 64-Bit Server VM (1.7.0-b24 mixed mode linux-amd64) # Problematic frame: # V [libjvm.so+0x5ca141] # # If you would like to submit a bug report, please visit: # http://icedtea.classpath.org/bugzilla # --------------- T H R E A D --------------- Current thread (0x0000000000609000): JavaThread "main" [_thread_in_vm, id=13617, stack(0x0000000041085000,0x0000000041186000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=128 (), si_addr=0x0000000000000000 Registers: RAX=0x0000000000609000, RBX=0x0000000000609000, RCX=0x0000000000609000, RDX=0x00007faf73345280 RSP=0x0000000041183620, RBP=0x0000000041183650, RSI=0x0000000041185a30, RDI=0x0000000000000001 R8 =0x0000000000000000, R9 =0x0000000000000000, R10=0x00007faf6dab9825, R11=0x00007faf724f75a0 R12=0x1c03140000007fb8, R13=0x0000000000609000, R14=0x00000000411836f0, R15=0x00007faf7298e880 RIP=0x00007faf72588141, EFL=0x0000000000010246, CSGSFS=0x0000000000000033, ERR=0x0000000000000000 TRAPNO=0x000000000000000d Top of Stack: (sp=0x0000000041183620) 0x0000000041183620: 0000000041183740 00007faf265a4fc0 0x0000000041183630: 0000000000000101 00007faf265a4fc0 0x0000000041183640: 00000000411836f0 0000000000609000 0x0000000041183650: 00000000411836c0 00007faf6dab9852 0x0000000041183660: 0000000000c8fe30 0000000000c8fe50 0x0000000041183670: 0000000000c8fe58 0000000000c8fe58 0x0000000041183680: 0000000041183680 0000000000000000 0x0000000041183690: 00000000411836f0 00007faf265a8a38 0x00000000411836a0: 0000000000000000 00007faf265a4fc0 0x00000000411836b0: 0000000000000000 00000000411836e0 0x00000000411836c0: 0000000041183740 00007faf6daae322 0x00000000411836d0: 0000000000000000 00007faf6dab634e 0x00000000411836e0: 1c03140000007fb8 0000000000c8fe38 0x00000000411836f0: 00007faf596090c0 00000000000000ff 0x0000000041183700: 0000000041183700 00007faf26c1bff7 0x0000000041183710: 0000000041183758 00007faf26c1f4c0 0x0000000041183720: 0000000000000000 00007faf26c1c010 0x0000000041183730: 00000000411836e0 0000000041183750 0x0000000041183740: 00000000411837a0 00007faf6daae298 0x0000000041183750: 1c03140000007fb8 00007faf6daae1c9 0x0000000041183760: 0000000041183760 00007faf26c1c0cc 0x0000000041183770: 00000000411837c0 00007faf26c1f4c0 0x0000000041183780: 0000000000000000 00007faf26c1c0f0 0x0000000041183790: 0000000041183750 00000000411837b0 0x00000000411837a0: 0000000041183808 00007faf6daae298 0x00000000411837b0: 0000000000000009 1c03140000007faf 0x00000000411837c0: 0000000000000000 00000000411837c8 0x00000000411837d0: 00007faf26beef19 0000000041183898 0x00000000411837e0: 00007faf26bf6150 0000000000000000 0x00000000411837f0: 00007faf26bef1a8 00000000411837b0 0x0000000041183800: 00000000411838a0 00000000411838e0 0x0000000041183810: 00007faf6daae0fa 0000000000000000 Instructions: (pc=0x00007faf72588141) 0x00007faf72588131: 00 00 8b 38 e8 a6 05 b7 ff c6 80 44 02 00 00 01 0x00007faf72588141: 45 0f b6 34 24 c6 80 44 02 00 00 00 48 8b 5b 48 Stack: [0x0000000041085000,0x0000000041186000], sp=0x0000000041183620, free space=1017k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) V [libjvm.so+0x5ca141] j sun.misc.Unsafe.getByte(J)B+0 j sun.awt.X11.Native.getUByte(J)S+7 j sun.awt.X11.Native.getUByte(JI)S+4 j sun.awt.X11.XToolkit.setupModifierMap()V+177 j sun.awt.X11.XToolkit.()V+158 v ~StubRoutines::call_stub V [libjvm.so+0x3321cb] V [libjvm.so+0x331348] V [libjvm.so+0x30eb76] V [libjvm.so+0x31147d] V [libjvm.so+0x311961] V [libjvm.so+0x389e8a] V [libjvm.so+0x39478a] C [libjava.so+0x11fc9] Java_java_lang_Class_forName0+0x139 j java.lang.Class.forName0(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;+0 j java.lang.Class.forName(Ljava/lang/String;)Ljava/lang/Class;+5 j java.awt.Toolkit$2.run()Ljava/lang/Object;+13 v ~StubRoutines::call_stub V [libjvm.so+0x3321cb] V [libjvm.so+0x331348] V [libjvm.so+0x39bc18] j java.security.AccessController.doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;+0 j java.awt.Toolkit.getDefaultToolkit()Ljava/awt/Toolkit;+16 j java.awt.Window.getToolkit()Ljava/awt/Toolkit;+0 j java.awt.Window.init(Ljava/awt/GraphicsConfiguration;)V+111 j java.awt.Window.()V+87 j java.awt.Frame.(Ljava/lang/String;)V+1 j ij.ImageJ.(Ljava/applet/Applet;I)V+3 j ij.ImageJ.(Ljava/applet/Applet;)V+3 j ij.ImageJ.main([Ljava/lang/String;)V+231 v ~StubRoutines::call_stub V [libjvm.so+0x3321cb] V [libjvm.so+0x331348] V [libjvm.so+0x33b661] V [libjvm.so+0x3587d5] C [libjli.so+0x3e4d] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j sun.misc.Unsafe.getByte(J)B+0 j sun.awt.X11.Native.getUByte(J)S+7 j sun.awt.X11.Native.getUByte(JI)S+4 j sun.awt.X11.XToolkit.setupModifierMap()V+177 j sun.awt.X11.XToolkit.()V+158 v ~StubRoutines::call_stub j java.lang.Class.forName0(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;+0 j java.lang.Class.forName(Ljava/lang/String;)Ljava/lang/Class;+5 j java.awt.Toolkit$2.run()Ljava/lang/Object;+13 v ~StubRoutines::call_stub j java.security.AccessController.doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;+0 j java.awt.Toolkit.getDefaultToolkit()Ljava/awt/Toolkit;+16 j java.awt.Window.getToolkit()Ljava/awt/Toolkit;+0 j java.awt.Window.init(Ljava/awt/GraphicsConfiguration;)V+111 j java.awt.Window.()V+87 j java.awt.Frame.(Ljava/lang/String;)V+1 j ij.ImageJ.(Ljava/applet/Applet;I)V+3 j ij.ImageJ.(Ljava/applet/Applet;)V+3 j ij.ImageJ.main([Ljava/lang/String;)V+231 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x0000000000885000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=13628, stack(0x0000000041943000,0x0000000041a44000)] 0x0000000000762400 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=13626, stack(0x0000000041eb5000,0x0000000041fb6000)] 0x000000000075f800 JavaThread "CompilerThread1" daemon [_thread_blocked, id=13625, stack(0x0000000041db4000,0x0000000041eb5000)] 0x000000000075b800 JavaThread "CompilerThread0" daemon [_thread_blocked, id=13624, stack(0x0000000041cb3000,0x0000000041db4000)] 0x0000000000759c00 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=13623, stack(0x0000000041bb2000,0x0000000041cb3000)] 0x0000000000732400 JavaThread "Finalizer" daemon [_thread_blocked, id=13622, stack(0x00000000405b6000,0x00000000406b7000)] 0x0000000000730c00 JavaThread "Reference Handler" daemon [_thread_blocked, id=13621, stack(0x00000000404b5000,0x00000000405b6000)] =>0x0000000000609000 JavaThread "main" [_thread_in_vm, id=13617, stack(0x0000000041085000,0x0000000041186000)] Other Threads: 0x000000000072b000 VMThread [stack: 0x0000000040133000,0x0000000040234000] [id=13620] 0x0000000000764400 WatcherThread [stack: 0x0000000041fb6000,0x00000000420b7000] [id=13627] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap PSYoungGen total 18176K, used 2854K [0x00007faf59600000, 0x00007faf5aa40000, 0x00007faf6daa0000) eden space 15616K, 18% used [0x00007faf59600000,0x00007faf598c9958,0x00007faf5a540000) from space 2560K, 0% used [0x00007faf5a7c0000,0x00007faf5a7c0000,0x00007faf5aa40000) to space 2560K, 0% used [0x00007faf5a540000,0x00007faf5a540000,0x00007faf5a7c0000) PSOldGen total 41600K, used 0K [0x00007faf30ca0000, 0x00007faf33540000, 0x00007faf59600000) object space 41600K, 0% used [0x00007faf30ca0000,0x00007faf30ca0000,0x00007faf33540000) PSPermGen total 21248K, used 7680K [0x00007faf264a0000, 0x00007faf27960000, 0x00007faf30ca0000) object space 21248K, 36% used [0x00007faf264a0000,0x00007faf26c201d0,0x00007faf27960000) Dynamic libraries: 00400000-00401000 r-xp 00000000 08:11 8704044 /usr/lib/jvm/java-7-icedtea/jre/bin/java 00600000-00601000 rw-p 00000000 08:11 8704044 /usr/lib/jvm/java-7-icedtea/jre/bin/java 00601000-00e1a000 rw-p 00601000 00:00 0 [heap] 40133000-40134000 ---p 40133000 00:00 0 40134000-40234000 rwxp 40134000 00:00 0 404b5000-404b8000 ---p 404b5000 00:00 0 404b8000-405b6000 rwxp 404b8000 00:00 0 405b6000-405b9000 ---p 405b6000 00:00 0 405b9000-406b7000 rwxp 405b9000 00:00 0 41085000-41088000 ---p 41085000 00:00 0 41088000-41186000 rwxp 41088000 00:00 0 4149d000-4149e000 ---p 4149d000 00:00 0 4149e000-4159e000 rwxp 4149e000 00:00 0 4159e000-4159f000 ---p 4159e000 00:00 0 4159f000-4169f000 rwxp 4159f000 00:00 0 41943000-41946000 ---p 41943000 00:00 0 41946000-41a44000 rwxp 41946000 00:00 0 41bb2000-41bb5000 ---p 41bb2000 00:00 0 41bb5000-41cb3000 rwxp 41bb5000 00:00 0 41cb3000-41cb6000 ---p 41cb3000 00:00 0 41cb6000-41db4000 rwxp 41cb6000 00:00 0 41db4000-41db7000 ---p 41db4000 00:00 0 41db7000-41eb5000 rwxp 41db7000 00:00 0 41eb5000-41eb8000 ---p 41eb5000 00:00 0 41eb8000-41fb6000 rwxp 41eb8000 00:00 0 41fb6000-41fb7000 ---p 41fb6000 00:00 0 41fb7000-420b7000 rwxp 41fb7000 00:00 0 7faf1c000000-7faf1c1a6000 rw-p 7faf1c000000 00:00 0 7faf1c1a6000-7faf20000000 ---p 7faf1c1a6000 00:00 0 7faf23bc4000-7faf23bf3000 r-xp 00000000 08:11 8704024 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/liblcms.so 7faf23bf3000-7faf23df2000 ---p 0002f000 08:11 8704024 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/liblcms.so 7faf23df2000-7faf23df4000 rw-p 0002e000 08:11 8704024 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/liblcms.so 7faf23df4000-7faf23df6000 rw-p 7faf23df4000 00:00 0 7faf23df6000-7faf23e06000 r--s 00000000 08:11 8471447 /var/cache/fontconfig/77e5ef6b0a3f6a3667c7e88d16926aa6-x86-64.cache-2 7faf23e06000-7faf23e11000 r--s 00000000 08:11 8471421 /var/cache/fontconfig/7cbc2d42922ee62c9bd14511da2c33da-x86-64.cache-2 7faf23fa6000-7faf23fb6000 r--s 00000000 08:11 8471447 /var/cache/fontconfig/77e5ef6b0a3f6a3667c7e88d16926aa6-x86-64.cache-2 7faf23fb6000-7faf23fc1000 r--s 00000000 08:11 8471421 /var/cache/fontconfig/7cbc2d42922ee62c9bd14511da2c33da-x86-64.cache-2 7faf23fc1000-7faf23fca000 r--s 00000000 08:11 8472220 /var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86-64.cache-2 7faf23fca000-7faf23fcd000 r--s 00000000 08:11 8472251 /var/cache/fontconfig/e383d7ea5fbe662a33d9b44caf393297-x86-64.cache-2 7faf23fcd000-7faf23fd1000 r--s 00000000 08:11 8472238 /var/cache/fontconfig/a755afe4a08bf5b97852ceb7400b47bc-x86-64.cache-2 7faf23fd1000-7faf23fda000 r--s 00000000 08:11 8472221 /var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86-64.cache-2 7faf23fda000-7faf23fdd000 r--s 00000000 08:11 8472278 /var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86-64.cache-2 7faf23fdd000-7faf23fe8000 r--s 00000000 08:11 8475497 /var/cache/fontconfig/e3de0de479f42330eadf588a55fb5bf4-x86-64.cache-2 7faf23fe8000-7faf23ff3000 r--s 00000000 08:11 8472267 /var/cache/fontconfig/0f34bcd4b6ee430af32735b75db7f02b-x86-64.cache-2 7faf23ff3000-7faf23ffc000 r--s 00000000 08:11 8471561 /var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86-64.cache-2 7faf23ffc000-7faf24008000 r--s 00000000 08:11 8471566 /var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86-64.cache-2 7faf24008000-7faf2401b000 r--s 00000000 08:11 8472337 /var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86-64.cache-2 7faf24247000-7faf2424d000 r--s 000f6000 08:11 8537421 /usr/lib/jvm/java-7-icedtea/jre/lib/resources.jar 7faf2424d000-7faf24252000 r--s 00000000 08:11 8472303 /var/cache/fontconfig/921a30a17f0be15c70ac14043cb7a739-x86-64.cache-2 7faf24252000-7faf24266000 r--s 00000000 08:11 8472348 /var/cache/fontconfig/865f88548240fee46819705c6468c165-x86-64.cache-2 7faf24266000-7faf24273000 r-xp 00000000 08:11 688186 /lib/libgcc_s.so.1 7faf24273000-7faf24473000 ---p 0000d000 08:11 688186 /lib/libgcc_s.so.1 7faf24473000-7faf24474000 rw-p 0000d000 08:11 688186 /lib/libgcc_s.so.1 7faf24474000-7faf244ee000 r-xp 00000000 08:11 7964188 /usr/lib/libfreetype.so.6.3.16 7faf244ee000-7faf246ee000 ---p 0007a000 08:11 7964188 /usr/lib/libfreetype.so.6.3.16 7faf246ee000-7faf246f3000 rw-p 0007a000 08:11 7964188 /usr/lib/libfreetype.so.6.3.16 7faf246f3000-7faf24739000 r-xp 00000000 08:11 8704008 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libfontmanager.so 7faf24739000-7faf24938000 ---p 00046000 08:11 8704008 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libfontmanager.so 7faf24938000-7faf2493c000 rw-p 00045000 08:11 8704008 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libfontmanager.so 7faf2493c000-7faf2494c000 rw-p 7faf2493c000 00:00 0 7faf2494c000-7faf24951000 r-xp 00000000 08:11 7963966 /usr/lib/libXdmcp.so.6.0.0 7faf24951000-7faf24b50000 ---p 00005000 08:11 7963966 /usr/lib/libXdmcp.so.6.0.0 7faf24b50000-7faf24b51000 rw-p 00004000 08:11 7963966 /usr/lib/libXdmcp.so.6.0.0 7faf24b51000-7faf24b6c000 r-xp 00000000 08:11 7965284 /usr/lib/libxcb.so.1.0.0 7faf24b6c000-7faf24d6b000 ---p 0001b000 08:11 7965284 /usr/lib/libxcb.so.1.0.0 7faf24d6b000-7faf24d6c000 rw-p 0001a000 08:11 7965284 /usr/lib/libxcb.so.1.0.0 7faf24d6c000-7faf24d6d000 r-xp 00000000 08:11 7965286 /usr/lib/libxcb-xlib.so.0.0.0 7faf24d6d000-7faf24f6c000 ---p 00001000 08:11 7965286 /usr/lib/libxcb-xlib.so.0.0.0 7faf24f6c000-7faf24f6d000 rw-p 00000000 08:11 7965286 /usr/lib/libxcb-xlib.so.0.0.0 7faf24f6d000-7faf24f6f000 r-xp 00000000 08:11 7963955 /usr/lib/libXau.so.6.0.0 7faf24f6f000-7faf2516e000 ---p 00002000 08:11 7963955 /usr/lib/libXau.so.6.0.0 7faf2516e000-7faf2516f000 rw-p 00001000 08:11 7963955 /usr/lib/libXau.so.6.0.0 7faf2516f000-7faf25178000 r-xp 00000000 08:11 7963976 /usr/lib/libXi.so.6.0.0 7faf25178000-7faf25377000 ---p 00009000 08:11 7963976 /usr/lib/libXi.so.6.0.0 7faf25377000-7faf25378000 rw-p 00008000 08:11 7963976 /usr/lib/libXi.so.6.0.0 7faf25378000-7faf2537d000 r-xp 00000000 08:11 7963996 /usr/lib/libXtst.so.6.1.0 7faf2537d000-7faf2557d000 ---p 00005000 08:11 7963996 /usr/lib/libXtst.so.6.1.0 7faf2557d000-7faf2557e000 rw-p 00005000 08:11 7963996 /usr/lib/libXtst.so.6.1.0 7faf2557e000-7faf2567d000 r-xp 00000000 08:11 7965288 /usr/lib/libX11.so.6.2.0 7faf2567d000-7faf2587c000 ---p 000ff000 08:11 7965288 /usr/lib/libX11.so.6.2.0 7faf2587c000-7faf25881000 rw-p 000fe000 08:11 7965288 /usr/lib/libX11.so.6.2.0 7faf25881000-7faf25892000 r-xp 00000000 08:11 7963968 /usr/lib/libXext.so.6.4.0 7faf25892000-7faf25a91000 ---p 00011000 08:11 7963968 /usr/lib/libXext.so.6.4.0 7faf25a91000-7faf25a92000 rw-p 00010000 08:11 7963968 /usr/lib/libXext.so.6.4.0 7faf25a92000-7faf25ada000 r-xp 00000000 08:11 8704042 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/xawt/libmawt.so 7faf25ada000-7faf25cd9000 ---p 00048000 08:11 8704042 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/xawt/libmawt.so 7faf25cd9000-7faf25cdd000 rw-p 00047000 08:11 8704042 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/xawt/libmawt.so 7faf25cdd000-7faf25cde000 rw-p 7faf25cdd000 00:00 0 7faf25cde000-7faf25d75000 r-xp 00000000 08:11 8704006 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libawt.so 7faf25d75000-7faf25f74000 ---p 00097000 08:11 8704006 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libawt.so 7faf25f74000-7faf25f80000 rw-p 00096000 08:11 8704006 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libawt.so 7faf25f80000-7faf25fa4000 rw-p 7faf25f80000 00:00 0 7faf25fa4000-7faf2611f000 r--s 031ce000 08:11 8537422 /usr/lib/jvm/java-7-icedtea/jre/lib/rt.jar 7faf2611f000-7faf26134000 rwxp 7faf2611f000 00:00 0 7faf26134000-7faf26264000 rwxp 7faf26134000 00:00 0 7faf26264000-7faf2626f000 rwxp 7faf26264000 00:00 0 7faf2626f000-7faf262b8000 rwxp 7faf2626f000 00:00 0 7faf262b8000-7faf262cd000 rwxp 7faf262b8000 00:00 0 7faf262cd000-7faf263fc000 rwxp 7faf262cd000 00:00 0 7faf263fc000-7faf26407000 rwxp 7faf263fc000 00:00 0 7faf26407000-7faf2649f000 rwxp 7faf26407000 00:00 0 7faf2649f000-7faf27960000 rwxp 7faf2649f000 00:00 0 7faf27960000-7faf30ca0000 rwxp 7faf27960000 00:00 0 7faf30ca0000-7faf33540000 rwxp 7faf30ca0000 00:00 0 7faf33540000-7faf59600000 rwxp 7faf33540000 00:00 0 7faf59600000-7faf5aa40000 rwxp 7faf59600000 00:00 0 7faf5aa40000-7faf6daa0000 rwxp 7faf5aa40000 00:00 0 7faf6daa0000-7faf6daa2000 r--s 00000000 08:11 8472234 /var/cache/fontconfig/e3fa16a14183b06aa45b3e009278fd14-x86-64.cache-2 7faf6daa2000-7faf6daab000 r--s 00000000 08:11 8472220 /var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86-64.cache-2 7faf6daab000-7faf6dd1b000 rwxp 7faf6daab000 00:00 0 7faf6dd1b000-7faf70aab000 rwxp 7faf6dd1b000 00:00 0 7faf70aab000-7faf70ab2000 r-xp 00000000 08:11 8704035 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libzip.so 7faf70ab2000-7faf70cb2000 ---p 00007000 08:11 8704035 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libzip.so 7faf70cb2000-7faf70cb3000 rw-p 00007000 08:11 8704035 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libzip.so 7faf70cb3000-7faf70ce0000 r-xp 00000000 08:11 8704015 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libjava.so 7faf70ce0000-7faf70edf000 ---p 0002d000 08:11 8704015 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libjava.so 7faf70edf000-7faf70ee3000 rw-p 0002c000 08:11 8704015 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libjava.so 7faf70ee3000-7faf70ef0000 r-xp 00000000 08:11 8704034 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libverify.so 7faf70ef0000-7faf710ef000 ---p 0000d000 08:11 8704034 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libverify.so 7faf710ef000-7faf710f1000 rw-p 0000c000 08:11 8704034 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/libverify.so 7faf710f1000-7faf710fb000 r-xp 00000000 08:11 688297 /lib/libnss_files-2.7.so 7faf710fb000-7faf712fb000 ---p 0000a000 08:11 688297 /lib/libnss_files-2.7.so 7faf712fb000-7faf712fd000 rw-p 0000a000 08:11 688297 /lib/libnss_files-2.7.so 7faf712fd000-7faf71307000 r-xp 00000000 08:11 688299 /lib/libnss_nis-2.7.so 7faf71307000-7faf71506000 ---p 0000a000 08:11 688299 /lib/libnss_nis-2.7.so 7faf71506000-7faf71508000 rw-p 00009000 08:11 688299 /lib/libnss_nis-2.7.so 7faf71508000-7faf71510000 r-xp 00000000 08:11 688295 /lib/libnss_compat-2.7.so 7faf71510000-7faf7170f000 ---p 00008000 08:11 688295 /lib/libnss_compat-2.7.so 7faf7170f000-7faf71711000 rw-p 00007000 08:11 688295 /lib/libnss_compat-2.7.so 7faf71711000-7faf71727000 r-xp 00000000 08:11 688294 /lib/libnsl-2.7.so 7faf71727000-7faf71926000 ---p 00016000 08:11 688294 /lib/libnsl-2.7.so 7faf71926000-7faf71928000 rw-p 00015000 08:11 688294 /lib/libnsl-2.7.so 7faf71928000-7faf7192a000 rw-p 7faf71928000 00:00 0 7faf7192a000-7faf71932000 r-xp 00000000 08:11 8704037 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/native_threads/libhpi.so 7faf71932000-7faf71b32000 ---p 00008000 08:11 8704037 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/native_threads/libhpi.so 7faf71b32000-7faf71b33000 rw-p 00008000 08:11 8704037 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/native_threads/libhpi.so 7faf71b33000-7faf71b34000 rw-p 7faf71b33000 00:00 0 7faf71b34000-7faf71b3c000 r-xp 00000000 08:11 688304 /lib/librt-2.7.so 7faf71b3c000-7faf71d3b000 ---p 00008000 08:11 688304 /lib/librt-2.7.so 7faf71d3b000-7faf71d3d000 rw-p 00007000 08:11 688304 /lib/librt-2.7.so 7faf71d3d000-7faf71dbd000 r-xp 00000000 08:11 688292 /lib/libm-2.7.so 7faf71dbd000-7faf71fbc000 ---p 00080000 08:11 688292 /lib/libm-2.7.so 7faf71fbc000-7faf71fbe000 rw-p 0007f000 08:11 688292 /lib/libm-2.7.so 7faf71fbe000-7faf72707000 r-xp 00000000 08:11 8704039 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/server/libjvm.so 7faf72707000-7faf72907000 ---p 00749000 08:11 8704039 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/server/libjvm.so 7faf72907000-7faf72982000 rw-p 00749000 08:11 8704039 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/server/libjvm.so 7faf72982000-7faf729bb000 rw-p 7faf72982000 00:00 0 7faf729bb000-7faf72b13000 r-xp 00000000 08:11 688288 /lib/libc-2.7.so 7faf72b13000-7faf72d13000 ---p 00158000 08:11 688288 /lib/libc-2.7.so 7faf72d13000-7faf72d16000 r--p 00158000 08:11 688288 /lib/libc-2.7.so 7faf72d16000-7faf72d18000 rw-p 0015b000 08:11 688288 /lib/libc-2.7.so 7faf72d18000-7faf72d1d000 rw-p 7faf72d18000 00:00 0 7faf72d1d000-7faf72d1f000 r-xp 00000000 08:11 688291 /lib/libdl-2.7.so 7faf72d1f000-7faf72f1f000 ---p 00002000 08:11 688291 /lib/libdl-2.7.so 7faf72f1f000-7faf72f21000 rw-p 00002000 08:11 688291 /lib/libdl-2.7.so 7faf72f21000-7faf72f2d000 r-xp 00000000 08:11 8704004 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/jli/libjli.so 7faf72f2d000-7faf7312d000 ---p 0000c000 08:11 8704004 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/jli/libjli.so 7faf7312d000-7faf7312e000 rw-p 0000c000 08:11 8704004 /usr/lib/jvm/java-7-icedtea/jre/lib/amd64/jli/libjli.so 7faf7312e000-7faf73144000 r-xp 00000000 08:11 688302 /lib/libpthread-2.7.so 7faf73144000-7faf73344000 ---p 00016000 08:11 688302 /lib/libpthread-2.7.so 7faf73344000-7faf73346000 rw-p 00016000 08:11 688302 /lib/libpthread-2.7.so 7faf73346000-7faf7334a000 rw-p 7faf73346000 00:00 0 7faf7334a000-7faf73360000 r-xp 00000000 08:11 7964938 /usr/lib/libz.so.1.2.3.3 7faf73360000-7faf73560000 ---p 00016000 08:11 7964938 /usr/lib/libz.so.1.2.3.3 7faf73560000-7faf73561000 rw-p 00016000 08:11 7964938 /usr/lib/libz.so.1.2.3.3 7faf73561000-7faf7357e000 r-xp 00000000 08:11 688285 /lib/ld-2.7.so 7faf7357e000-7faf7357f000 r--s 00000000 08:11 8472242 /var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86-64.cache-2 7faf7357f000-7faf73580000 r--s 00000000 08:11 8472224 /var/cache/fontconfig/4c73fe0c47614734b17d736dbde7580a-x86-64.cache-2 7faf73580000-7faf73581000 r--s 00000000 08:11 8472245 /var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86-64.cache-2 7faf73581000-7faf73583000 r--s 00000000 08:11 8472277 /var/cache/fontconfig/2c5ba8142dffc8bf0377700342b8ca1a-x86-64.cache-2 7faf73583000-7faf73586000 r--s 00000000 08:11 8471477 /var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86-64.cache-2 7faf73586000-7faf73589000 r--s 00000000 08:11 8472251 /var/cache/fontconfig/e383d7ea5fbe662a33d9b44caf393297-x86-64.cache-2 7faf73589000-7faf7358b000 r--s 00000000 08:11 8472234 /var/cache/fontconfig/e3fa16a14183b06aa45b3e009278fd14-x86-64.cache-2 7faf7358b000-7faf73590000 r--s 00000000 08:11 8472303 /var/cache/fontconfig/921a30a17f0be15c70ac14043cb7a739-x86-64.cache-2 7faf73590000-7faf73594000 r--s 00000000 08:11 8472238 /var/cache/fontconfig/a755afe4a08bf5b97852ceb7400b47bc-x86-64.cache-2 7faf73594000-7faf7359d000 r--s 00000000 08:11 8472221 /var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86-64.cache-2 7faf7359d000-7faf735a0000 r--s 00000000 08:11 8472278 /var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86-64.cache-2 7faf735a0000-7faf735ab000 r--s 00000000 08:11 8475497 /var/cache/fontconfig/e3de0de479f42330eadf588a55fb5bf4-x86-64.cache-2 7faf735ab000-7faf735b6000 r--s 00000000 08:11 8472267 /var/cache/fontconfig/0f34bcd4b6ee430af32735b75db7f02b-x86-64.cache-2 7faf735b6000-7faf735b8000 r--s 00000000 08:11 8472277 /var/cache/fontconfig/2c5ba8142dffc8bf0377700342b8ca1a-x86-64.cache-2 7faf735b8000-7faf735bb000 r--s 00000000 08:11 8471477 /var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86-64.cache-2 7faf735bb000-7faf735c4000 r--s 00000000 08:11 8471561 /var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86-64.cache-2 7faf735c4000-7faf735d0000 r--s 00000000 08:11 8471566 /var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86-64.cache-2 7faf735d0000-7faf735e3000 r--s 00000000 08:11 8472337 /var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86-64.cache-2 7faf735e3000-7faf735f7000 r--s 00000000 08:11 8472348 /var/cache/fontconfig/865f88548240fee46819705c6468c165-x86-64.cache-2 7faf735f7000-7faf735fb000 r--s 00079000 08:11 8537416 /usr/lib/jvm/java-7-icedtea/jre/lib/jsse.jar 7faf735fb000-7faf73601000 r--s 00117000 08:12 15597577 /home/lparras/documentos/Research/ImageJ/ImageJ/ij.jar 7faf73601000-7faf7360a000 r--s 00065000 08:11 8537401 /usr/lib/jvm/java-7-icedtea/jre/lib/ext/gnome-java-bridge.jar 7faf7360a000-7faf73649000 r--p 00000000 08:11 9388033 /usr/lib/locale/es_ES.utf8/LC_CTYPE 7faf73649000-7faf73654000 rwxp 7faf73649000 00:00 0 7faf73654000-7faf7369d000 rwxp 7faf73654000 00:00 0 7faf7369d000-7faf736a7000 rwxp 7faf7369d000 00:00 0 7faf736a7000-7faf7375d000 rwxp 7faf736a7000 00:00 0 7faf7375d000-7faf73761000 rw-p 7faf7375d000 00:00 0 7faf73761000-7faf73762000 r--s 00000000 08:11 8472242 /var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86-64.cache-2 7faf73762000-7faf73763000 r--s 00000000 08:11 8472224 /var/cache/fontconfig/4c73fe0c47614734b17d736dbde7580a-x86-64.cache-2 7faf73763000-7faf73764000 r--s 00000000 08:11 8472245 /var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86-64.cache-2 7faf73764000-7faf7376a000 r--s 00117000 08:12 15597577 /home/lparras/documentos/Research/ImageJ/ImageJ/ij.jar 7faf7376a000-7faf73771000 r--s 00000000 08:11 7979145 /usr/lib/gconv/gconv-modules.cache 7faf73771000-7faf73779000 rw-s 00000000 08:11 6963283 /tmp/hsperfdata_lparras/13616 7faf73779000-7faf7377a000 rw-p 7faf73779000 00:00 0 7faf7377a000-7faf7377b000 r--p 7faf7377a000 00:00 0 7faf7377b000-7faf7377e000 rw-p 7faf7377b000 00:00 0 7faf7377e000-7faf73780000 rw-p 0001d000 08:11 688285 /lib/ld-2.7.so 7fff7b76b000-7fff7b77f000 rwxp 7ffffffea000 00:00 0 [stack] 7fff7b77f000-7fff7b780000 rw-p 7fffffffe000 00:00 0 7fff7b7fe000-7fff7b800000 r-xp 7fff7b7fe000 00:00 0 [vdso] ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall] VM Arguments: java_command: ij.jar Launcher Type: SUN_STANDARD Environment Variables: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games LD_LIBRARY_PATH=/usr/lib/jvm/java-7-icedtea/jre/lib/amd64/server:/usr/lib/jvm/java-7-icedtea/jre/lib/amd64:/usr/lib/jvm/java-7-icedtea/jre/../lib/amd64::/usr/local/umfpack/lib/:/usr/local/trilinos-8.0.3/lib/ SHELL=/bin/bash DISPLAY=:0.0 Signal Handlers: SIGSEGV: [libjvm.so+0x5eaa40], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x5eaa40], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x4c9790], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: [libjvm.so+0x4c9790], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGXFSZ: [libjvm.so+0x4c9790], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x4c9790], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x4ccbe0], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x4caa80], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x4caa80], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x4caa80], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x4caa80], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:Ubuntu 8.04 (hardy) uname:Linux 2.6.24-12-generic #1 SMP Wed Mar 12 22:31:43 UTC 2008 x86_64 libc:glibc 2.7 NPTL 2.7 rlimit: STACK 8192k, CORE 0k, NPROC 38400, NOFILE 1024, AS infinity load average:0.06 0.09 0.03 CPU:total 2 (2 cores per cpu, 1 threads per core) family 6 model 15 stepping 6, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3 Memory: 4k page, physical 3988512k(203072k free), swap 4466060k(4432136k free) vm_info: IcedTea 64-Bit Server VM (1.7.0-b24) for linux-amd64 JRE (1.7.0-b24), built on Jan 19 2008 17:37:38 by "buildd" with gcc 4.2.3 20080114 (prerelease) (Ubuntu 4.2.2-7ubuntu1) time: Mon Apr 7 12:57:13 2008 elapsed time: 1 seconds -- 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 Apr 7 05:15:18 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 07 Apr 2008 12:15:18 +0000 Subject: [Bug 134] Java on linux amd64. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=134 langel at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |DUPLICATE ------- Comment #1 from langel at redhat.com 2008-04-07 12:15 ------- *** This bug has been marked as a duplicate of bug 113 *** -- 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 gnu_andrew at member.fsf.org Mon Apr 7 05:53:23 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 7 Apr 2008 13:53:23 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407102317.GA3781@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> Message-ID: <17c6771e0804070553p6de25363r4c057a61a22392da@mail.gmail.com> On 07/04/2008, Gary Benson wrote: > S?bastien Bernard wrote: > > This turn to be some problem with the arch. > > Sometimes, the path is build with sparc, sometimes , with > > sparc64. While some libs are build in sparc, the link are done with > > the other, thus leading to some not found syndrom. > > Next, I rebuild using sparc32 ./configure. > > Everything went smooth until it tried to execute the recently build > > j2re and j2dk. > > Execution aborts immediately, with a SIGABORT. I don't really know > > why but I think it's related to the default compiler. > > I run an unstable debian and the compiler used is the gcc-4.3, idem > > for g++ and gcj. > > This is probably a multilib issue. What does your uname -m say > normally, and what does it say when you use sparc32? > > > I tried to build the jdk on hppa too and it fails miserable for > > the same reason than sparc (uname -m gives hppa64, but userland > > is 32bit). > > Hmmm, that sounds broken. Can you post the output from ./configure > for that one? > > > Cheers, > Gary > > -- > http://gbenson.net/ > Don't know if this is relevant or not, but I seem to recall that HotSpot on SPARC is built in a rather strange way to handle 32/64-bit. This is where ARCH_DATA_MODEL comes in. From the build README: Solaris: Note that ARCH_DATA_MODEL is really only needed on Solaris to indicate you want to built the 64-bit version. And before the Solaris 64-bit binaries can be used, they must be merged with the binaries from a separate 32-bit build. The merged binaries may then be used in either 32-bit or 64-bit mode, with the selection occurring at runtime with the -d32 or -d64 options. -- Andrew :-) 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 gnu_andrew at member.fsf.org Mon Apr 7 06:05:30 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 7 Apr 2008 14:05:30 +0100 Subject: Generated file changes in IcedTea6 In-Reply-To: <1207565294.25074.11.camel@imac523d.theobroma-systems.com> References: <17c6771e0804070315i577ebc2ai17e50df3f1aed1cd@mail.gmail.com> <1207565294.25074.11.camel@imac523d.theobroma-systems.com> Message-ID: <17c6771e0804070605y6985f742l770464f779e20bc9@mail.gmail.com> On 07/04/2008, Christian Thalinger wrote: > On Mon, 2008-04-07 at 11:15 +0100, Andrew John Hughes wrote: > > Is anyone else seeing changed files in generated/sun/awt/X11 after > > building IcedTea? > > > > This is on ppc64 with zero. > > > > --- a/generated/sun/awt/X11/awtImageData.java Fri Apr 04 16:13:34 2008 -0400 > > +++ b/generated/sun/awt/X11/awtImageData.java Mon Apr 07 11:12:08 2008 +0100 > > @@ -8,7 +8,7 @@ public class awtImageData extends XWrapp > > public class awtImageData extends XWrapperBase { > > private Unsafe unsafe = XlibWrapper.unsafe; > > private final boolean should_free_memory; > > - public static int getSize() { return 304; } > > + public static int getSize() { return ((XlibWrapper.dataModel > > == 32)?(304):(560)); } > > public int getDataSize() { return getSize(); } > > > > long pData; > > > > Other files are also changed in a similar way. > > > Yes, this seems to be normal. Matthias Klose also posted something > about this some time ago: > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-March/001459.html > > - twisti > > Yes, I remember that mail now. It seems the 64-bit version should just be used throughout, as it read almost like an improvement patch to me. -- Andrew :-) 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 jsumali at redhat.com Mon Apr 7 06:16:03 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Mon, 07 Apr 2008 09:16:03 -0400 Subject: request for disable-alsa configure option In-Reply-To: <1207562599.25074.8.camel@imac523d.theobroma-systems.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <1207562599.25074.8.camel@imac523d.theobroma-systems.com> Message-ID: <47FA1E93.3050801@redhat.com> Christian Thalinger wrote: > On Mon, 2008-04-07 at 10:58 +0100, Andrew John Hughes wrote: > >> Seems a sensible option to me. >> Do you have a patch you could post? >> > > When we are at options, I'd like to have a --disable-docs option. Maybe > I can post a patch later. > > - twisti > > +1 This would speed up full builds quite a bit, I think. Josh From seb at frankengul.org Mon Apr 7 06:21:24 2008 From: seb at frankengul.org (seb at frankengul.org) Date: Mon, 7 Apr 2008 15:21:24 +0200 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407102317.GA3781@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> Message-ID: <20080407132124.GA20943@frankengul.org> On Mon, Apr 07, 2008 at 11:23:17AM +0100, Gary Benson wrote: > S?bastien Bernard wrote: > > This turn to be some problem with the arch. > > Sometimes, the path is build with sparc, sometimes , with > > sparc64. While some libs are build in sparc, the link are done with > > the other, thus leading to some not found syndrom. > > Next, I rebuild using sparc32 ./configure. > > Everything went smooth until it tried to execute the recently build > > j2re and j2dk. > > Execution aborts immediately, with a SIGABORT. I don't really know > > why but I think it's related to the default compiler. > > I run an unstable debian and the compiler used is the gcc-4.3, idem > > for g++ and gcj. > > This is probably a multilib issue. What does your uname -m say > normally, and what does it say when you use sparc32? Can you elaborate ? uname -m says sparc64 sparc32 uname -m says sparc I saw a lot of `uname -m` in the Makefiles. It would be much easier to get the ARCH once and for all in the configure script. On hppa, I tricked the build with a uname script which returns hppa. Unfortunately, I'm unable to trick the build into using gcc-4.1 instead of gcc. Even passing gcc-4.1 as CC works with the configure script but is ignored when building the interpreter. I could do the same trick as the uname ie a gcc shell script than invokes the right command. I'll try tonight (gmt+1) to check if the output is correct as gcc-4.3 is known to have some known regressions. > > > I tried to build the jdk on hppa too and it fails miserable for > > the same reason than sparc (uname -m gives hppa64, but userland > > is 32bit). > > Hmmm, that sounds broken. Can you post the output from ./configure > for that one? The plain output of configure ? I'm joining the output. It says everithing is ok but the zero_platform is set to Makefile:ZERO_ARCHDEF = PARISC64 platform_zero:sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DPARISC64 -DZERO_LIBARCH=\"parisc64\" There is no hppa64 in userland. Only the kernel is built this way with a special cross-compile toolchain. > > Cheers, > Gary > > -- > http://gbenson.net/ -------------- next part -------------- seb at hpnux:~/icedtea6$ ./configure --with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-4.2-1.5.0.0 --with-libgcj-jar=/usr//share/java/libgcj-4.2.jar --prefix=/usr/local/icedtea --with-jar=gjar-4.2 checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking how to create a pax tar archive... gnutar checking build system type... hppa2.0-unknown-linux-gnu checking host system type... hppa2.0-unknown-linux-gnu checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking for style of include used by make... GNU checking dependency style of gcc... none checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... none checking for find... /usr/bin/find checking for patch... /usr/bin/patch checking for tar... /bin/tar checking for chmod... /bin/chmod checking for md5sum... /usr/bin/md5sum checking for wget... /usr/bin/wget checking for zip... /usr/bin/zip checking for unzip... /usr/bin/unzip checking for cpio... /bin/cpio checking for file... /usr/bin/file checking for fastjar... fastjar checking for gawk... /usr/bin/gawk checking for gij... /usr/bin/gij checking for ecj... /usr/bin/ecj checking for javac... /usr/bin/ecj -nowarn checking for gjavah... /usr/bin/gjavah checking for gjar-4.2... /usr/bin/gjar-4.2 checking for grmic... /usr/bin/grmic checking for eclipse-ecj.jar... /usr/share/java/eclipse-ecj.jar checking libgcj jar... /usr/share/java/libgcj-4.2.jar checking for xalan2 jar... /usr/share/java/xalan2.jar checking for xalan2-serializer jar... /usr/share/java/serializer.jar checking for xerces2 jar... /usr/share/java/xercesImpl.jar checking openjdk source zip... not specified checking openjdk sources... /home/seb/icedtea6/openjdk checking whether to use CACAO as VM... no checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking whether to use the zero-assembler port... yes checking for void *... yes checking size of void *... 4 checking whether byte ordering is bigendian... yes checking cups/cups.h usability... yes checking cups/cups.h presence... yes checking for cups/cups.h... yes checking cups/ppd.h usability... yes checking cups/ppd.h presence... yes checking for cups/ppd.h... yes checking X11/X.h usability... yes checking X11/X.h presence... yes checking for X11/X.h... yes checking Xm/Xm.h usability... yes checking Xm/Xm.h presence... yes checking for Xm/Xm.h... yes checking Xm/XmP.h usability... yes checking Xm/XmP.h presence... yes checking for Xm/XmP.h... yes checking Xm/Display.h usability... yes checking Xm/Display.h presence... yes checking for Xm/Display.h... yes checking for main in -ljpeg... yes checking for main in -lgif... yes checking for main in -lz... yes checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for XPROTO... yes checking for XT... yes checking for XP... yes checking for X11... yes checking for XINERAMA... yes checking for LIBPNG... yes checking for XTST... yes checking for FREETYPE2... yes checking for ALSA... yes checking for MOZILLA... no checking for MOZILLA... no checking for MOZILLA... no checking for MOZILLA... yes checking for GLIB... yes checking for GTK... yes checking for LIBFFI... no checking ffi.h usability... yes checking ffi.h presence... yes checking for ffi.h... yes checking for library containing ffi_call... -lffi configure: creating ./config.status config.status: creating Makefile config.status: creating javac config.status: creating javap config.status: creating platform_zero config.status: creating jvm.cfg config.status: creating ergo.c config.status: executing depfiles commands seb at hpnux:~/icedtea6$ echo $PATH /home/seb/bin:/home/seb/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games seb at hpnux:~/icedtea6$ export PATH=/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games seb at hpnux:~/icedtea6$ ./configure --with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-4.2-1.5.0.0 --with-libgcj-jar=/usr/share//java/libgcj-4.2.jar --prefix=/usr/local/icedtea --with-jar=gjar-4.2 checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking how to create a pax tar archive... gnutar checking build system type... hppa-unknown-linux-gnu checking host system type... hppa-unknown-linux-gnu checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking for style of include used by make... GNU checking dependency style of gcc... none checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... none checking for find... /usr/bin/find checking for patch... /usr/bin/patch checking for tar... /bin/tar checking for chmod... /bin/chmod checking for md5sum... /usr/bin/md5sum checking for wget... /usr/bin/wget checking for zip... /usr/bin/zip checking for unzip... /usr/bin/unzip checking for cpio... /bin/cpio checking for file... /usr/bin/file checking for fastjar... fastjar checking for gawk... /usr/bin/gawk checking for gij... /usr/bin/gij checking for ecj... /usr/bin/ecj checking for javac... /usr/bin/ecj -nowarn checking for gjavah... /usr/bin/gjavah checking for gjar-4.2... /usr/bin/gjar-4.2 checking for grmic... /usr/bin/grmic checking for eclipse-ecj.jar... /usr/share/java/eclipse-ecj.jar checking libgcj jar... /usr/share/java/libgcj-4.2.jar checking for xalan2 jar... /usr/share/java/xalan2.jar checking for xalan2-serializer jar... /usr/share/java/serializer.jar checking for xerces2 jar... /usr/share/java/xercesImpl.jar checking openjdk source zip... not specified checking openjdk sources... /home/seb/icedtea6/openjdk checking whether to use CACAO as VM... no checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking whether to use the zero-assembler port... yes checking for void *... yes checking size of void *... 4 checking whether byte ordering is bigendian... yes checking cups/cups.h usability... yes checking cups/cups.h presence... yes checking for cups/cups.h... yes checking cups/ppd.h usability... yes checking cups/ppd.h presence... yes checking for cups/ppd.h... yes checking X11/X.h usability... yes checking X11/X.h presence... yes checking for X11/X.h... yes checking Xm/Xm.h usability... yes checking Xm/Xm.h presence... yes checking for Xm/Xm.h... yes checking Xm/XmP.h usability... yes checking Xm/XmP.h presence... yes checking for Xm/XmP.h... yes checking Xm/Display.h usability... yes checking Xm/Display.h presence... yes checking for Xm/Display.h... yes checking for main in -ljpeg... yes checking for main in -lgif... yes checking for main in -lz... yes checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for XPROTO... yes checking for XT... yes checking for XP... yes checking for X11... yes checking for XINERAMA... yes checking for LIBPNG... yes checking for XTST... yes checking for FREETYPE2... yes checking for ALSA... yes checking for MOZILLA... no checking for MOZILLA... no checking for MOZILLA... no checking for MOZILLA... yes checking for GLIB... yes checking for GTK... yes checking for LIBFFI... no checking ffi.h usability... yes checking ffi.h presence... yes checking for ffi.h... yes checking for library containing ffi_call... -lffi configure: creating ./config.status config.status: creating Makefile config.status: creating javac config.status: creating javap config.status: creating platform_zero config.status: creating jvm.cfg config.status: creating ergo.c config.status: executing depfiles commands seb at hpnux:~/icedtea6$ From dennis at ausil.us Mon Apr 7 06:24:08 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Mon, 7 Apr 2008 08:24:08 -0500 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407102317.GA3781@redhat.com> References: <200804031306.32076.dennis@ausil.us> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> Message-ID: <200804070824.10185.dennis@ausil.us> On Monday 07 April 2008, Gary Benson wrote: > S?bastien Bernard wrote: > > This turn to be some problem with the arch. > > Sometimes, the path is build with sparc, sometimes , with > > sparc64. While some libs are build in sparc, the link are done with > > the other, thus leading to some not found syndrom. > > Next, I rebuild using sparc32 ./configure. > > Everything went smooth until it tried to execute the recently build > > j2re and j2dk. > > Execution aborts immediately, with a SIGABORT. I don't really know > > why but I think it's related to the default compiler. > > I run an unstable debian and the compiler used is the gcc-4.3, idem > > for g++ and gcj. > > This is probably a multilib issue. What does your uname -m say > normally, and what does it say when you use sparc32? > > > I tried to build the jdk on hppa too and it fails miserable for > > the same reason than sparc (uname -m gives hppa64, but userland > > is 32bit). > > Hmmm, that sounds broken. Can you post the output from ./configure > for that one? > > Cheers, > Gary looks like i missed S?bastien's post but here is the output [dennis at daedalus ~]$ sparc64 uname -m sparc64 [dennis at daedalus ~]$ sparc32 uname -m sparc I was building in mock using a pure 32bit rawhide chroot. ive not yet tried to build a sparc64 version. Dennis From seb at frankengul.org Mon Apr 7 06:26:48 2008 From: seb at frankengul.org (seb at frankengul.org) Date: Mon, 7 Apr 2008 15:26:48 +0200 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080404160511.GH4008@redhat.com> References: <200804031306.32076.dennis@ausil.us> <200804041016.36731.dennis@ausil.us> <17c6771e0804040824s486eaed0j25473f0d48104905@mail.gmail.com> <200804041051.41807.dennis@ausil.us> <20080404160511.GH4008@redhat.com> Message-ID: <20080407132648.GB20943@frankengul.org> On Fri, Apr 04, 2008 at 05:05:11PM +0100, Gary Benson wrote: > > FWIW I hear there's a linux_sparc port floating around Sun that'll be > released Real Soon Now. And I think this is the port done by the blackdown team and never released because of Licence Term. I asked them to release the ports they made as patches, but I never got any response from them regarding the issue. They had a working port for 1.4.2 but non-working now due to some library symbol missing. I got some word that the port to 1.5.0 was almost there but for one bug which prevents the release of the complete work. It was some years ago and never got any news since. Seb From twisti at complang.tuwien.ac.at Mon Apr 7 06:35:39 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 07 Apr 2008 15:35:39 +0200 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407132124.GA20943@frankengul.org> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> <20080407132124.GA20943@frankengul.org> Message-ID: <1207575339.25074.18.camel@imac523d.theobroma-systems.com> On Mon, 2008-04-07 at 15:21 +0200, seb at frankengul.org wrote: > Unfortunately, I'm unable to trick the build into using gcc-4.1 > instead of gcc. > Even passing gcc-4.1 as CC works with the configure script but is > ignored when building > the interpreter. When cross-compiling I use: $ make ARCH=arm ARCH_DATA_MODEL=32 ALT_COMPILER_PATH=/path/to/compiler This should let you pick another GCC version. - twisti From gbenson at redhat.com Mon Apr 7 06:39:21 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 07 Apr 2008 13:39:21 +0000 Subject: changeset in /hg/icedtea6: 2008-04-07 Gary Benson changeset fddbd2aeed27 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fddbd2aeed27 description: 2008-04-07 Gary Benson * acinclude.m4 (ENABLE_ZERO_BUILD): Added sparc and sparc64. * configure: Regenerated. diffstat: 3 files changed, 19 insertions(+), 8 deletions(-) ChangeLog | 5 +++++ acinclude.m4 | 11 +++++++---- configure | 11 +++++++---- diffs (91 lines): diff -r 172f34f6f4b7 -r fddbd2aeed27 ChangeLog --- a/ChangeLog Fri Apr 04 16:13:34 2008 -0400 +++ b/ChangeLog Mon Apr 07 09:39:14 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-04 Joshua Sumali + + * acinclude.m4 (ENABLE_ZERO_BUILD): Added sparc and sparc64. + * configure: Regenerated. + 2008-04-04 Joshua Sumali * rt/net/sourceforge/jnlp/cache/CacheUtil.java: Added debugging code. diff -r 172f34f6f4b7 -r fddbd2aeed27 acinclude.m4 --- a/acinclude.m4 Fri Apr 04 16:13:34 2008 -0400 +++ b/acinclude.m4 Mon Apr 07 09:39:14 2008 -0400 @@ -543,10 +543,10 @@ AC_DEFUN([ENABLE_ZERO_BUILD], ZERO_LIBARCH="${INSTALL_ARCH_DIR}" dnl can't use AC_CHECK_SIZEOF on multilib case "${ZERO_LIBARCH}" in - i386|ppc|s390) + i386|ppc|s390|sparc) ZERO_BITSPERWORD=32 ;; - amd64|ppc64|s390x) + amd64|ppc64|s390x|sparc64) ZERO_BITSPERWORD=64 ;; *) @@ -564,18 +564,21 @@ AC_DEFUN([ENABLE_ZERO_BUILD], s390*) ZERO_ARCHDEF="S390" ;; + sparc*) + ZERO_ARCHDEF="SPARC" + ;; *) 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) + i386|ppc|sparc) ZERO_ARCHFLAG="-m32" ;; s390) ZERO_ARCHFLAG="-m31" ;; - amd64|ppc64|s390x) + amd64|ppc64|s390x|sparc64) ZERO_ARCHFLAG="-m64" ;; esac diff -r 172f34f6f4b7 -r fddbd2aeed27 configure --- a/configure Fri Apr 04 16:13:34 2008 -0400 +++ b/configure Mon Apr 07 09:39:14 2008 -0400 @@ -8305,10 +8305,10 @@ fi if test "x${use_zero}" = xyes; then ZERO_LIBARCH="${INSTALL_ARCH_DIR}" case "${ZERO_LIBARCH}" in - i386|ppc|s390) + i386|ppc|s390|sparc) ZERO_BITSPERWORD=32 ;; - amd64|ppc64|s390x) + amd64|ppc64|s390x|sparc64) ZERO_BITSPERWORD=64 ;; *) @@ -8961,17 +8961,20 @@ esac s390*) ZERO_ARCHDEF="S390" ;; + sparc*) + ZERO_ARCHDEF="SPARC" + ;; *) ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z` esac case "${ZERO_LIBARCH}" in - i386|ppc) + i386|ppc|sparc) ZERO_ARCHFLAG="-m32" ;; s390) ZERO_ARCHFLAG="-m31" ;; - amd64|ppc64|s390x) + amd64|ppc64|s390x|sparc64) ZERO_ARCHFLAG="-m64" ;; esac From seb at frankengul.org Mon Apr 7 06:40:25 2008 From: seb at frankengul.org (seb at frankengul.org) Date: Mon, 7 Apr 2008 15:40:25 +0200 Subject: OpenJDK zero on sparc linux In-Reply-To: <1207575339.25074.18.camel@imac523d.theobroma-systems.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> <20080407132124.GA20943@frankengul.org> <1207575339.25074.18.camel@imac523d.theobroma-systems.com> Message-ID: <20080407134025.GA23066@frankengul.org> On Mon, Apr 07, 2008 at 03:35:39PM +0200, Christian Thalinger wrote: > > When cross-compiling I use: > > $ make ARCH=arm ARCH_DATA_MODEL=32 ALT_COMPILER_PATH=/path/to/compiler > > This should let you pick another GCC version. Duh, I forgot about that one. This makes 2 possibility. I'm compiling now. I'll have the result in a couple of hours. > > - twisti > From dennis at ausil.us Mon Apr 7 06:44:23 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Mon, 7 Apr 2008 08:44:23 -0500 Subject: OpenJDK zero on sparc linux In-Reply-To: <1207575339.25074.18.camel@imac523d.theobroma-systems.com> References: <200804031306.32076.dennis@ausil.us> <20080407132124.GA20943@frankengul.org> <1207575339.25074.18.camel@imac523d.theobroma-systems.com> Message-ID: <200804070844.24114.dennis@ausil.us> On Monday 07 April 2008, Christian Thalinger wrote: > On Mon, 2008-04-07 at 15:21 +0200, seb at frankengul.org wrote: > > Unfortunately, I'm unable to trick the build into using gcc-4.1 > > instead of gcc. > > Even passing gcc-4.1 as CC works with the configure script but is > > ignored when building > > the interpreter. > > When cross-compiling I use: > > $ make ARCH=arm ARCH_DATA_MODEL=32 ALT_COMPILER_PATH=/path/to/compiler > > This should let you pick another GCC version. > > - twisti to ensure that you always get sparc32 you can run sparc32bash first if debian doesnt have sparc32bash then run sparc32 bash that will give you a 32 bit shell to start from. it will ensure that things are always the 32 bit variant. ive seen some build fail due to reverting to 64 bit mid way through a build if you run sparc32 ./configure && sparc32 make Dennis From gnu_andrew at member.fsf.org Mon Apr 7 06:47:46 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 7 Apr 2008 14:47:46 +0100 Subject: request for disable-alsa configure option In-Reply-To: <47FA1E93.3050801@redhat.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <1207562599.25074.8.camel@imac523d.theobroma-systems.com> <47FA1E93.3050801@redhat.com> Message-ID: <17c6771e0804070647n5ef7d2d1m7d3220faceb652d7@mail.gmail.com> On 07/04/2008, Joshua Sumali wrote: > Christian Thalinger wrote: > > > On Mon, 2008-04-07 at 10:58 +0100, Andrew John Hughes wrote: > > > > > > > Seems a sensible option to me. > > > Do you have a patch you could post? > > > > > > > > > > When we are at options, I'd like to have a --disable-docs option. Maybe > > I can post a patch later. > > > > - twisti > > > > > > > +1 > > This would speed up full builds quite a bit, I think. > > Josh > Patch attached. Okay to commit? -- Andrew :-) 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 -------------- next part -------------- A non-text attachment was scrubbed... Name: docs.patch Type: application/octet-stream Size: 5835 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080407/391c899f/docs.patch From gbenson at redhat.com Mon Apr 7 06:48:10 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 7 Apr 2008 14:48:10 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <200804070844.24114.dennis@ausil.us> References: <200804031306.32076.dennis@ausil.us> <20080407132124.GA20943@frankengul.org> <1207575339.25074.18.camel@imac523d.theobroma-systems.com> <200804070844.24114.dennis@ausil.us> Message-ID: <20080407134810.GC3781@redhat.com> Dennis Gilmore wrote: > to ensure that you always get sparc32 you can run sparc32bash first > if debian doesnt have sparc32bash then run sparc32 bash that will > give you a 32 bit shell to start from. it will ensure that things > are always the 32 bit variant. ive seen some build fail due to > reverting to 64 bit mid way through a build if you run sparc32 > ./configure && sparc32 make That shouldn't happen with the commit I just made. Cheers, Gary -- http://gbenson.net/ From langel at redhat.com Mon Apr 7 06:46:31 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 07 Apr 2008 09:46:31 -0400 Subject: request for disable-alsa configure option In-Reply-To: <17c6771e0804070647n5ef7d2d1m7d3220faceb652d7@mail.gmail.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <1207562599.25074.8.camel@imac523d.theobroma-systems.com> <47FA1E93.3050801@redhat.com> <17c6771e0804070647n5ef7d2d1m7d3220faceb652d7@mail.gmail.com> Message-ID: <47FA25B7.8000309@redhat.com> Andrew John Hughes wrote: > On 07/04/2008, Joshua Sumali wrote: >> Christian Thalinger wrote: >> >>> On Mon, 2008-04-07 at 10:58 +0100, Andrew John Hughes wrote: >>> >>> >>>> Seems a sensible option to me. >>>> Do you have a patch you could post? >>>> >>>> >>> When we are at options, I'd like to have a --disable-docs option. Maybe >>> I can post a patch later. >>> >>> - twisti >>> >>> >>> >> +1 >> >> This would speed up full builds quite a bit, I think. >> >> Josh >> > > Patch attached. Okay to commit? If you tested out a full build, then go ahead. Thanks, Lillian From gbenson at redhat.com Mon Apr 7 06:46:59 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 7 Apr 2008 14:46:59 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407132124.GA20943@frankengul.org> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> <20080407132124.GA20943@frankengul.org> Message-ID: <20080407134659.GB3781@redhat.com> seb at frankengul.org wrote: > Can you elaborate ? > uname -m says sparc64 > sparc32 uname -m says sparc That's the bit I wanted. I just committed a fix that should make it correctly build libraries for both. > I saw a lot of `uname -m` in the Makefiles. > It would be much easier to get the ARCH once and for all in the > configure script. Yes. Zero pretty much does this. > > > I tried to build the jdk on hppa too and it fails miserable for > > > the same reason than sparc (uname -m gives hppa64, but userland > > > is 32bit). > > > > Hmmm, that sounds broken. Can you post the output from ./configure > > for that one? > > The plain output of configure ? > I'm joining the output. > It says everithing is ok but the zero_platform is set to > Makefile:ZERO_ARCHDEF = PARISC64 Hmmm, I don't understand this, if "uname -m" says hppa64 then ZERO_ARCHDEF should be HPPA64. Where did the parisc64 come from? Either way it detected it as a 32-bit platform. > Unfortunately, I'm unable to trick the build into using gcc-4.1 > instead of gcc. Even passing gcc-4.1 as CC works with the configure > script but is ignored when building the interpreter. Probably some extra variable needs passing through in ICEDTEA_ENV and ICEDTEA_ENV_ECJ. Cheers, Gary -- http://gbenson.net/ From twisti at complang.tuwien.ac.at Mon Apr 7 07:17:02 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 07 Apr 2008 16:17:02 +0200 Subject: request for disable-alsa configure option In-Reply-To: <17c6771e0804070647n5ef7d2d1m7d3220faceb652d7@mail.gmail.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <1207562599.25074.8.camel@imac523d.theobroma-systems.com> <47FA1E93.3050801@redhat.com> <17c6771e0804070647n5ef7d2d1m7d3220faceb652d7@mail.gmail.com> Message-ID: <1207577822.25074.21.camel@imac523d.theobroma-systems.com> On Mon, 2008-04-07 at 14:47 +0100, Andrew John Hughes wrote: > Patch attached. Okay to commit? Maybe we should remove this patch then (from patches/icedtea-speed.patch): diff -urN openjdk.orig/jdk/make/Makefile openjdk/jdk/make/Makefile --- openjdk.orig/jdk/make/Makefile 2007-10-12 03:54:03.000000000 -0400 +++ openjdk/jdk/make/Makefile 2007-10-12 17:41:02.000000000 -0400 @@ -249,9 +249,9 @@ # # Docs # -OTHERSUBDIRS = docs -docs:: sanity-docs post-sanity-docs - $(OTHERSUBDIRS-loop) +#OTHERSUBDIRS = docs +#docs:: sanity-docs post-sanity-docs +# $(OTHERSUBDIRS-loop) # # Release engineering targets. - twisti From seb at frankengul.org Mon Apr 7 07:23:25 2008 From: seb at frankengul.org (seb at frankengul.org) Date: Mon, 7 Apr 2008 16:23:25 +0200 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407134659.GB3781@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> <20080407132124.GA20943@frankengul.org> <20080407134659.GB3781@redhat.com> Message-ID: <20080407142325.GB23066@frankengul.org> On Mon, Apr 07, 2008 at 02:46:59PM +0100, Gary Benson wrote: > That's the bit I wanted. I just committed a fix that should make it > correctly build libraries for both. Could you just explain the multilib bug ? > > > I saw a lot of `uname -m` in the Makefiles. > > It would be much easier to get the ARCH once and for all in the > > configure script. > > Yes. Zero pretty much does this. > > > > > I tried to build the jdk on hppa too and it fails miserable for > > > > the same reason than sparc (uname -m gives hppa64, but userland > > > > is 32bit). > > > > > > Hmmm, that sounds broken. Can you post the output from ./configure > > > for that one? > > > > The plain output of configure ? > > I'm joining the output. > > It says everithing is ok but the zero_platform is set to > > Makefile:ZERO_ARCHDEF = PARISC64 > > Hmmm, I don't understand this, if "uname -m" says hppa64 then > ZERO_ARCHDEF should be HPPA64. Where did the parisc64 come from? > Either way it detected it as a 32-bit platform. Oops, my mistake. uname -m gives parisc64 uname -a gives Linux hpnux 2.6.24-1-parisc64 #2 Mon Feb 11 14:10:01 MST 2008 parisc64 GNU/Linux The trigram for this architecture is hppa-linux-gnu since there is no 64bit userland. > > > Unfortunately, I'm unable to trick the build into using gcc-4.1 > > instead of gcc. Even passing gcc-4.1 as CC works with the configure > > script but is ignored when building the interpreter. > > Probably some extra variable needs passing through in ICEDTEA_ENV and > ICEDTEA_ENV_ECJ. > > Cheers, > Gary > > -- > http://gbenson.net/ From gbenson at redhat.com Mon Apr 7 07:39:34 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 7 Apr 2008 15:39:34 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407142325.GB23066@frankengul.org> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> <20080407132124.GA20943@frankengul.org> <20080407134659.GB3781@redhat.com> <20080407142325.GB23066@frankengul.org> Message-ID: <20080407143934.GD3781@redhat.com> seb at frankengul.org wrote: > On Mon, Apr 07, 2008 at 02:46:59PM +0100, Gary Benson wrote: > > That's the bit I wanted. I just committed a fix that should make it > > correctly build libraries for both. > > Could you just explain the multilib bug ? On multilib systems you need to pass a flag to gcc telling it which set to use. Typically this is either -m32 or -m64. Zero doesn't know to add this unless it is explicitly told. > uname -m gives parisc64 > uname -a gives Linux hpnux 2.6.24-1-parisc64 #2 Mon Feb 11 14:10:01 > MST 2008 parisc64 GNU/Linux > The trigram for this architecture is hppa-linux-gnu since there is > no 64bit userland. Are you using java-gcj-compat? Cheers, Gary -- http://gbenson.net/ From seb at frankengul.org Mon Apr 7 07:52:37 2008 From: seb at frankengul.org (seb at frankengul.org) Date: Mon, 7 Apr 2008 16:52:37 +0200 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407143934.GD3781@redhat.com> References: <200804031306.32076.dennis@ausil.us> <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> <20080407132124.GA20943@frankengul.org> <20080407134659.GB3781@redhat.com> <20080407142325.GB23066@frankengul.org> <20080407143934.GD3781@redhat.com> Message-ID: <20080407145236.GC23066@frankengul.org> On Mon, Apr 07, 2008 at 03:39:34PM +0100, Gary Benson wrote: > seb at frankengul.org wrote: > > On Mon, Apr 07, 2008 at 02:46:59PM +0100, Gary Benson wrote: > > > That's the bit I wanted. I just committed a fix that should make it > > > correctly build libraries for both. > > > > Could you just explain the multilib bug ? > > On multilib systems you need to pass a flag to gcc telling it which > set to use. Typically this is either -m32 or -m64. Zero doesn't > know to add this unless it is explicitly told. So the SIGABORT is yielded when you dlink a 64bit librarie with a 32Bit program ? > > > uname -m gives parisc64 > > uname -a gives Linux hpnux 2.6.24-1-parisc64 #2 Mon Feb 11 14:10:01 > > MST 2008 parisc64 GNU/Linux > > The trigram for this architecture is hppa-linux-gnu since there is > > no 64bit userland. > > Are you using java-gcj-compat? yes I do. Is that bad ? Java support on hppa is nowhere close to the sparc's one. > > Cheers, > Gary > > -- > http://gbenson.net/ From gbenson at redhat.com Mon Apr 7 08:16:42 2008 From: gbenson at redhat.com (Gary Benson) Date: Mon, 7 Apr 2008 16:16:42 +0100 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407145236.GC23066@frankengul.org> References: <20080404082746.GA4008@redhat.com> <47F5EEB9.5090304@redhat.com> <20080404094404.GF4008@redhat.com> <47F60698.2090300@frankengul.org> <20080407102317.GA3781@redhat.com> <20080407132124.GA20943@frankengul.org> <20080407134659.GB3781@redhat.com> <20080407142325.GB23066@frankengul.org> <20080407143934.GD3781@redhat.com> <20080407145236.GC23066@frankengul.org> Message-ID: <20080407151642.GE3781@redhat.com> seb at frankengul.org wrote: > On Mon, Apr 07, 2008 at 03:39:34PM +0100, Gary Benson wrote: > > seb at frankengul.org wrote: > > > On Mon, Apr 07, 2008 at 02:46:59PM +0100, Gary Benson wrote: > > > > That's the bit I wanted. I just committed a fix that should > > > > make it correctly build libraries for both. > > > > > > Could you just explain the multilib bug ? > > > > On multilib systems you need to pass a flag to gcc telling it > > which set to use. Typically this is either -m32 or -m64. Zero > > doesn't know to add this unless it is explicitly told. > > So the SIGABORT is yielded when you dlink a 64bit librarie with a > 32Bit program ? I wouldn't have thought it would link, but maybe. > > > uname -m gives parisc64 > > > uname -a gives Linux hpnux 2.6.24-1-parisc64 #2 Mon Feb 11 14:10:01 > > > MST 2008 parisc64 GNU/Linux > > > The trigram for this architecture is hppa-linux-gnu since there is > > > no 64bit userland. > > > > Are you using java-gcj-compat? > > yes I do. Is that bad ? Java support on hppa is nowhere close to the > sparc's one. Not at all. I just wanted to know the path of the directory in which it puts it's libjvm.so links. Cheers, Gary -- http://gbenson.net/ From jsumali at redhat.com Mon Apr 7 10:06:38 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Mon, 07 Apr 2008 17:06:38 +0000 Subject: changeset in /hg/icedtea6: 2008-04-07 Joshua Sumali changeset 0c0add06bfb7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0c0add06bfb7 description: 2008-04-07 Joshua Sumali * patches/icedtea-netx-plugin.patch: Removed reflection hunk. * rt/net/sourceforge/jnlp/Parser.java: Removed inner Node class to ... * rt/net/sourceforge/jnlp/Node.java: here, as a separate class. diffstat: 4 files changed, 167 insertions(+), 167 deletions(-) ChangeLog | 6 + patches/icedtea-netx-plugin.patch | 40 +++------ rt/net/sourceforge/jnlp/Node.java | 147 +++++++++++++++++++++++++++++++++++ rt/net/sourceforge/jnlp/Parser.java | 141 --------------------------------- diffs (368 lines): diff -r fddbd2aeed27 -r 0c0add06bfb7 ChangeLog --- a/ChangeLog Mon Apr 07 09:39:14 2008 -0400 +++ b/ChangeLog Mon Apr 07 13:06:27 2008 -0400 @@ -1,3 +1,9 @@ 2008-04-07 Gary Benson + + * patches/icedtea-netx-plugin.patch: Removed reflection hunk. + * rt/net/sourceforge/jnlp/Parser.java: Removed inner Node class to ... + * rt/net/sourceforge/jnlp/Node.java: here, as a separate class. + 2008-04-07 Gary Benson * acinclude.m4 (ENABLE_ZERO_BUILD): Added sparc and sparc64. diff -r fddbd2aeed27 -r 0c0add06bfb7 patches/icedtea-netx-plugin.patch --- a/patches/icedtea-netx-plugin.patch Mon Apr 07 09:39:14 2008 -0400 +++ b/patches/icedtea-netx-plugin.patch Mon Apr 07 13:06:27 2008 -0400 @@ -1,16 +1,14 @@ diff -u openjdk.orig/jdk/src/share/class -diff -u openjdk.orig/jdk/src/share/classes/sun/applet/PluginAppletViewer.java openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java ---- openjdk.orig/jdk/src/share/classes/sun/applet/PluginAppletViewer.java 2008-02-27 08:45:37.000000000 -0500 -+++ openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java 2008-02-27 08:51:14.000000000 -0500 -@@ -40,6 +40,8 @@ - import java.security.PrivilegedAction; - import java.lang.reflect.InvocationTargetException; - import java.lang.reflect.Method; -+import java.lang.reflect.Constructor; -+import java.lang.ClassNotFoundException; - import sun.awt.SunToolkit; +--- openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java.orig 2008-04-07 11:31:28.000000000 -0400 ++++ openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java 2008-04-07 11:30:52.000000000 -0400 +@@ -44,6 +44,7 @@ import sun.awt.AppContext; import sun.awt.X11.*; -@@ -97,14 +99,33 @@ + import java.lang.ref.WeakReference; ++import net.sourceforge.jnlp.NetxPanel; + + /** + * Lets us construct one using unix-style one shot behaviors +@@ -97,14 +98,21 @@ /** * Create the applet viewer */ @@ -24,22 +22,10 @@ diff -u openjdk.orig/jdk/src/share/class this.statusMsgStream = statusMsgStream; - add("Center", panel = new AppletViewerPanel(doc, atts)); -+ try -+ { -+ Class c = Thread.currentThread().getContextClassLoader().loadClass("net.sourceforge.jnlp.NetxPanel"); -+ Class[] constructClasses = new Class[] {doc.getClass(), atts.getClass()}; -+ Constructor constructor = c.getConstructor(constructClasses); -+ Object[] constructArgs = new Object[] {doc, atts}; -+ panel = (AppletViewerPanel) constructor.newInstance(constructArgs); -+ AppletViewerPanel.debug("Using Netx panel"); -+ } -+ catch (ClassNotFoundException ex) -+ { -+ AppletViewerPanel.debug("Netx Panel not found - using AppletViewerPanel", ex); -+ panel = new AppletViewerPanel(doc, atts); -+ } -+ catch (Exception ex) -+ { ++ try { ++ panel = new NetxPanel(doc, atts); ++ AppletViewerPanel.debug("Using NetX panel"); ++ } catch (Exception ex) { + AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex); + panel = new AppletViewerPanel(doc, atts); + } diff -r fddbd2aeed27 -r 0c0add06bfb7 rt/net/sourceforge/jnlp/Node.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/net/sourceforge/jnlp/Node.java Mon Apr 07 13:06:27 2008 -0400 @@ -0,0 +1,147 @@ +package net.sourceforge.jnlp; + +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; + +import net.sourceforge.nanoxml.XMLElement; + +// this class makes assumptions on how parser calls methods (such +// as getFirstChild->getNextChild only called by a single loop at +// a time, so no need for an iterator). + +/** + * This class converts the NanoXML's XMLElement nodes into the + * regular XML Node interface (for the methods used by Parser). + */ +/* NANO */ +class Node { + private XMLElement xml; + private Node next; + private Node children[]; + + Node(XMLElement xml) { + this.xml = xml; + } + + Node getFirstChild() { + if (children == null) + getChildNodes(); + + if (children.length == 0) + return null; + else + return children[0]; + } + + Node getNextSibling() { + return next; + } + + void normalize() { + } + + String getNodeValue() { + return xml.getContent(); + } + + Node[] getChildNodes() { + if (children == null) { + List list = new ArrayList(); + + for (Enumeration e = xml.enumerateChildren(); e.hasMoreElements();) + list.add( new Node((XMLElement)e.nextElement()) ); + + children = (Node[]) list.toArray( new Node[list.size()] ); + + for (int i=0; i < children.length-1; i++) + children[i].next = children[i+1]; + } + + return children; + } + + String getAttribute(String name) { + return (String)xml.getAttribute(name); + } + + String getNodeName() { + if (xml.getName() == null) + return ""; + else + return xml.getName(); + } + + public String toString() { + return getNodeName(); + } +} + +/** + * This class converts the TinyXML's ParsedXML nodes into the + * regular XML Node interface (for the methods used by Parser). + */ +/* TINY +class Node { + private ParsedXML tinyNode; + private Node next; + private Node children[]; + + Node(ParsedXML tinyNode) { + this.tinyNode = tinyNode; + } + + Node getFirstChild() { + if (children == null) + getChildNodes(); + + if (children.length == 0) + return null; + else + return children[0]; + } + + Node getNextSibling() { + return next; + } + + void normalize() { + } + + String getNodeValue() { + return tinyNode.getContent(); + } + + Node[] getChildNodes() { + if (children == null) { + List list = new ArrayList(); + + for (Enumeration e = tinyNode.elements(); e.hasMoreElements();) { + list.add( new Node((ParsedXML)e.nextElement()) ); + } + children = (Node[]) list.toArray( new Node[list.size()] ); + + for (int i=0; i < children.length-1; i++) + children[i].next = children[i+1]; + } + + return children; + } + + String getAttribute(String name) { + return tinyNode.getAttribute(name); + } + + String getNodeName() { + if (tinyNode.getName() == null) + return ""; + else + return tinyNode.getName(); + } + + public String toString() { + return getNodeName(); + } +} +*/ + diff -r fddbd2aeed27 -r 0c0add06bfb7 rt/net/sourceforge/jnlp/Parser.java --- a/rt/net/sourceforge/jnlp/Parser.java Mon Apr 07 09:39:14 2008 -0400 +++ b/rt/net/sourceforge/jnlp/Parser.java Mon Apr 07 13:06:27 2008 -0400 @@ -959,143 +959,4 @@ class Parser { } -// this class makes assumptions on how parser calls methods (such -// as getFirstChild->getNextChild only called by a single loop at -// a time, so no need for an iterator). - -/** - * This class converts the NanoXML's XMLElement nodes into the - * regular XML Node interface (for the methods used by Parser). - */ -/* NANO */ -class Node { - private XMLElement xml; - private Node next; - private Node children[]; - - Node(XMLElement xml) { - this.xml = xml; - } - - Node getFirstChild() { - if (children == null) - getChildNodes(); - - if (children.length == 0) - return null; - else - return children[0]; - } - - Node getNextSibling() { - return next; - } - - void normalize() { - } - - String getNodeValue() { - return xml.getContent(); - } - - Node[] getChildNodes() { - if (children == null) { - List list = new ArrayList(); - - for (Enumeration e = xml.enumerateChildren(); e.hasMoreElements();) - list.add( new Node((XMLElement)e.nextElement()) ); - - children = (Node[]) list.toArray( new Node[list.size()] ); - - for (int i=0; i < children.length-1; i++) - children[i].next = children[i+1]; - } - - return children; - } - - String getAttribute(String name) { - return (String)xml.getAttribute(name); - } - - String getNodeName() { - if (xml.getName() == null) - return ""; - else - return xml.getName(); - } - - public String toString() { - return getNodeName(); - } -} - -/** - * This class converts the TinyXML's ParsedXML nodes into the - * regular XML Node interface (for the methods used by Parser). - */ -/* TINY -class Node { - private ParsedXML tinyNode; - private Node next; - private Node children[]; - - Node(ParsedXML tinyNode) { - this.tinyNode = tinyNode; - } - - Node getFirstChild() { - if (children == null) - getChildNodes(); - - if (children.length == 0) - return null; - else - return children[0]; - } - - Node getNextSibling() { - return next; - } - - void normalize() { - } - - String getNodeValue() { - return tinyNode.getContent(); - } - - Node[] getChildNodes() { - if (children == null) { - List list = new ArrayList(); - - for (Enumeration e = tinyNode.elements(); e.hasMoreElements();) { - list.add( new Node((ParsedXML)e.nextElement()) ); - } - children = (Node[]) list.toArray( new Node[list.size()] ); - - for (int i=0; i < children.length-1; i++) - children[i].next = children[i+1]; - } - - return children; - } - - String getAttribute(String name) { - return tinyNode.getAttribute(name); - } - - String getNodeName() { - if (tinyNode.getName() == null) - return ""; - else - return tinyNode.getName(); - } - - public String toString() { - return getNodeName(); - } -} -*/ - - + From Paul.Hohensee at Sun.COM Mon Apr 7 11:31:04 2008 From: Paul.Hohensee at Sun.COM (Paul Hohensee) Date: Mon, 07 Apr 2008 14:31:04 -0400 Subject: OpenJDK zero on sparc linux In-Reply-To: <20080407132648.GB20943@frankengul.org> References: <200804031306.32076.dennis@ausil.us> <200804041016.36731.dennis@ausil.us> <17c6771e0804040824s486eaed0j25473f0d48104905@mail.gmail.com> <200804041051.41807.dennis@ausil.us> <20080404160511.GH4008@redhat.com> <20080407132648.GB20943@frankengul.org> Message-ID: <47FA6868.4050408@sun.com> An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080407/fa9d03e2/attachment.html From seb at frankengul.org Mon Apr 7 11:46:01 2008 From: seb at frankengul.org (=?ISO-8859-1?Q?Bernard_S=E9bastien?=) Date: Mon, 07 Apr 2008 20:46:01 +0200 Subject: OpenJDK zero on sparc linux In-Reply-To: <47FA6868.4050408@sun.com> References: <200804031306.32076.dennis@ausil.us> <200804041016.36731.dennis@ausil.us> <17c6771e0804040824s486eaed0j25473f0d48104905@mail.gmail.com> <200804041051.41807.dennis@ausil.us> <20080404160511.GH4008@redhat.com> <20080407132648.GB20943@frankengul.org> <47FA6868.4050408@sun.com> Message-ID: <47FA6BE9.9020902@frankengul.org> Paul Hohensee a ?crit : > No, it's actually a jdk7 linux-sparc port done by us (Sun). It's not > derived from > any Blackdown code. We're still having logistical issues with the openjdk > repositories so it's not out there yet. You may have noticed that > nothing's > gone back to the openjdk hotspot repositories since they were nominally > opened awhile ago. > > Thanks for your patience. > > Paul > My mistake then. It's such a waste that the port done by those people will go to /dev/null. No source code has gone out since the JDK 1.3. And IMHO, the openjdk and the java community would benefit of the immense work they've done if they could contribute back. Not only for sparc, but for powerpc, and several exotic architectures too. Seb From seb at frankengul.org Mon Apr 7 13:29:41 2008 From: seb at frankengul.org (=?ISO-8859-1?Q?Bernard_S=E9bastien?=) Date: Mon, 07 Apr 2008 22:29:41 +0200 Subject: SIGABORT on linux-sparc Message-ID: <47FA8435.7040705@frankengul.org> I'm still having the sigabort effect. If one could have a look to the following http://www.frankengul.org/~seb/screenlog.txt.gz he will find the complete buildlog. 1st : configure without sparc32 starts to build the sparc64. But since the mandatory libraries don't exist in 64bit, the sanity checks fails. 2nd: the sparc32 build goes all the way but any run led to a SIGABORT. As show at the end. I'm putting the hs_err_pid1983.log in attachment produced by the latest build of the jdk. If one can have access to a sparc, I can tar the produced jdk. Seb From seb at frankengul.org Mon Apr 7 13:33:29 2008 From: seb at frankengul.org (=?ISO-8859-1?Q?Bernard_S=E9bastien?=) Date: Mon, 07 Apr 2008 22:33:29 +0200 Subject: SIGABORT on linux-sparc In-Reply-To: <47FA8435.7040705@frankengul.org> References: <47FA8435.7040705@frankengul.org> Message-ID: <47FA8519.2000406@frankengul.org> Bernard S?bastien a ?crit : > I'm still having the sigabort effect. > If one could have a look to the following > http://www.frankengul.org/~seb/screenlog.txt.gz > he will find the complete buildlog. > > 1st : configure without sparc32 starts to build the sparc64. But since > the mandatory libraries don't exist > in 64bit, the sanity checks fails. > > 2nd: the sparc32 build goes all the way but any run led to a SIGABORT. > As show at the end. > > I'm putting the hs_err_pid1983.log in attachment produced by the > latest build of the jdk. > If one can have access to a sparc, I can tar the produced jdk. > > Seb > > This time with the attachement, promised :-). Seb -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hs_err_pid1983.log Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080407/225656ab/hs_err_pid1983.log From dennis at ausil.us Mon Apr 7 14:25:19 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Mon, 7 Apr 2008 16:25:19 -0500 Subject: SIGABORT on linux-sparc In-Reply-To: <47FA8435.7040705@frankengul.org> References: <47FA8435.7040705@frankengul.org> Message-ID: <200804071625.20502.dennis@ausil.us> On Monday 07 April 2008, Bernard S?bastien wrote: > I'm still having the sigabort effect. > If one could have a look to the following > http://www.frankengul.org/~seb/screenlog.txt.gz > he will find the complete buildlog. > > 1st : configure without sparc32 starts to build the sparc64. But since > the mandatory libraries don't exist > in 64bit, the sanity checks fails. > > 2nd: the sparc32 build goes all the way but any run led to a SIGABORT. > As show at the end. > > I'm putting the hs_err_pid1983.log in attachment produced by the latest > build of the jdk. > If one can have access to a sparc, I can tar the produced jdk. > > Seb I can test the jdk. I have aurora and fedora linux boxes i can test on. Dennis From mvfranz at gmail.com Mon Apr 7 18:53:04 2008 From: mvfranz at gmail.com (Michael Franz) Date: Mon, 7 Apr 2008 21:53:04 -0400 Subject: request for disable-alsa configure option In-Reply-To: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> Message-ID: On Mon, Apr 7, 2008 at 5:58 AM, Andrew John Hughes < gnu_andrew at member.fsf.org> wrote: > On 06/04/2008, Michael Franz wrote: > > Hi, > > > > Would it be possible to add a --disable-alsa to the Icedtea6 configure > > script? I have been manually removing the check when building on OS X, > but > > the latest couple of updates have caused problems as the > autoconf/aclocal > > have been giving me trouble. I have been patching configure.ac and not > > configure as I figured it would be changing less and not require me to > > update my patch too often. > > > > I don't think this option will be intrusive as it can be defaulted to no > > (thus having alsa enabled by default). > > > > Functionality similar to --disable-gcjwebplugin would be sufficient. > > > > > > Thanks > > > > Michael > > > > Seems a sensible option to me. > Do you have a patch you could post? > -- > Andrew :-) Here is my patch. I tested it on OS X. Michael -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080407/275d2e29/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: patch-configure.ac Type: application/octet-stream Size: 969 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080407/275d2e29/patch-configure.ac From bugzilla-daemon at icedtea.classpath.org Mon Apr 7 21:00:08 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 08 Apr 2008 04:00:08 +0000 Subject: [Bug 108] Assistive Technology not found: org.GNOME.Accessibility.JavaBridge Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=108 ------- Comment #2 from david.filiatrault at gmail.com 2008-04-08 04:00 ------- Ubuntu package as contained in Ubuntu's Hardy Alpha 5. Only want this to work with default packages, not interested in installing openjdk-6-jre -- 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 Tue Apr 8 00:25:04 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 8 Apr 2008 08:25:04 +0100 Subject: SIGABORT on linux-sparc In-Reply-To: <47FA8519.2000406@frankengul.org> References: <47FA8435.7040705@frankengul.org> <47FA8519.2000406@frankengul.org> Message-ID: <20080408072503.GA3651@redhat.com> Bernard S?bastien wrote: > 2nd: the sparc32 build goes all the way but any run led to a > SIGABORT. As show at the end. > > I'm putting the hs_err_pid1983.log in attachment produced by the > latest build of the jdk. Ah, the code that produces the hs_err_pid*.log files calls abort(), so the SIGABORT is possibly a side-effect of that. > # Internal Error (os_linux_zero.cpp:144), pid=1983, tid=1887509392 > # Error: caught unhandled signal 10 Is signal 10 USR1 on your machine? Cheers, Gary -- http://gbenson.net/ From gnu_andrew at member.fsf.org Tue Apr 8 00:55:49 2008 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Tue, 08 Apr 2008 07:55:49 +0000 Subject: changeset in /hg/icedtea6: 2008-04-08 Andrew John Hughes changeset ff3d152968b5 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ff3d152968b5 description: 2008-04-08 Andrew John Hughes * Makefile.am: Add NO_DOCS option as appropriate to ICEDTEA_ENV and ICEDTEA_ENV_ECJ * Makefile.in: Regenerated. * configure: Likewise. * configure.ac: Add --disable-docs option. diffstat: 5 files changed, 64 insertions(+), 6 deletions(-) ChangeLog | 8 ++++++++ Makefile.am | 10 ++++++++++ Makefile.in | 16 +++++++++++----- configure | 30 +++++++++++++++++++++++++++++- configure.ac | 6 ++++++ diffs (182 lines): diff -r 0c0add06bfb7 -r ff3d152968b5 ChangeLog --- a/ChangeLog Mon Apr 07 13:06:27 2008 -0400 +++ b/ChangeLog Tue Apr 08 08:55:33 2008 +0100 @@ -1,3 +1,11 @@ 2008-04-07 Joshua Sumali + + * Makefile.am: Add NO_DOCS option as + appropriate to ICEDTEA_ENV and ICEDTEA_ENV_ECJ + * Makefile.in: Regenerated. + * configure: Likewise. + * configure.ac: Add --disable-docs option. + 2008-04-07 Joshua Sumali * patches/icedtea-netx-plugin.patch: Removed reflection hunk. diff -r 0c0add06bfb7 -r ff3d152968b5 Makefile.am --- a/Makefile.am Mon Apr 07 13:06:27 2008 -0400 +++ b/Makefile.am Tue Apr 08 08:55:33 2008 +0100 @@ -102,6 +102,11 @@ if WITH_CACAO if WITH_CACAO ICEDTEA_ENV += \ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" +endif + +if !ENABLE_DOCS +ICEDTEA_ENV += \ + "NO_DOCS=true" endif env: @@ -152,6 +157,11 @@ if WITH_CACAO if WITH_CACAO ICEDTEA_ENV_ECJ += \ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" +endif + +if !ENABLE_DOCS +ICEDTEA_ENV_ECJ += \ + "NO_DOCS=true" endif env-ecj: diff -r 0c0add06bfb7 -r ff3d152968b5 Makefile.in --- a/Makefile.in Mon Apr 07 13:06:27 2008 -0400 +++ b/Makefile.in Tue Apr 08 08:55:33 2008 +0100 @@ -34,10 +34,16 @@ host_triplet = @host@ @WITH_CACAO_TRUE at am__append_1 = \ @WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" - at WITH_CACAO_TRUE@am__append_2 = \ + at ENABLE_DOCS_FALSE@am__append_2 = \ + at ENABLE_DOCS_FALSE@ "NO_DOCS=true" + + at WITH_CACAO_TRUE@am__append_3 = \ @WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" - at WITH_CACAO_TRUE@am__append_3 = \ + at ENABLE_DOCS_FALSE@am__append_4 = \ + at ENABLE_DOCS_FALSE@ "NO_DOCS=true" + + at WITH_CACAO_TRUE@am__append_5 = \ @WITH_CACAO_TRUE@ patches/icedtea-cacao.patch subdir = . @@ -289,7 +295,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \ - "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1) + "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1) $(am__append_2) # OpenJDK ecj build environment. ICEDTEA_BUILD_DIR_ECJ = \ @@ -326,7 +332,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \ - "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2) + "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_3) $(am__append_4) # OpenJDK Source Preparation Targets # ================================== @@ -387,7 +393,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ patches/icedtea-arm-uname.patch $(GCC_PATCH) \ - $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3) + $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5) # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch diff -r 0c0add06bfb7 -r ff3d152968b5 configure --- a/configure Mon Apr 07 13:06:27 2008 -0400 +++ b/configure Tue Apr 08 08:55:33 2008 +0100 @@ -722,6 +722,8 @@ SYSTEM_ICEDTEA_DIR SYSTEM_ICEDTEA_DIR SYSTEM_ANT_DIR ENABLE_PLUGIN +ENABLE_DOCS_TRUE +ENABLE_DOCS_FALSE WITH_ICEDTEA_TRUE WITH_ICEDTEA_FALSE WITH_OPENJDK_TRUE @@ -1417,6 +1419,7 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-gcjwebplugin Disable compilation of browser plugin + --disable-docs Disable generation of documentation --enable-fast-build optimize for quick building: use -O0 and do not build documentation --enable-zero use zero-assembler port on non-zero platforms @@ -5539,6 +5542,22 @@ fi +# Check whether --enable-docs was given. +if test "${enable_docs+set}" = set; then + enableval=$enable_docs; ENABLE_DOCS="$val" +else + ENABLE_DOCS='yes' +fi + + if test x$ENABLE_DOCS = xyes; then + ENABLE_DOCS_TRUE= + ENABLE_DOCS_FALSE='#' +else + ENABLE_DOCS_TRUE='#' + ENABLE_DOCS_FALSE= +fi + + # Check whether --with-icedtea was given. if test "${with_icedtea+set}" = set; then @@ -11777,6 +11796,13 @@ if test -z "${am__fastdepCXX_TRUE}" && t { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -12560,6 +12586,8 @@ SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$a SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim ENABLE_PLUGIN!$ENABLE_PLUGIN$ac_delim +ENABLE_DOCS_TRUE!$ENABLE_DOCS_TRUE$ac_delim +ENABLE_DOCS_FALSE!$ENABLE_DOCS_FALSE$ac_delim WITH_ICEDTEA_TRUE!$WITH_ICEDTEA_TRUE$ac_delim WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim @@ -12635,7 +12663,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -r 0c0add06bfb7 -r ff3d152968b5 configure.ac --- a/configure.ac Mon Apr 07 13:06:27 2008 -0400 +++ b/configure.ac Tue Apr 08 08:55:33 2008 +0100 @@ -100,6 +100,12 @@ AC_ARG_ENABLE([gcjwebplugin], [Disable compilation of browser plugin])], [ENABLE_PLUGIN="$val"], [ENABLE_PLUGIN='yes']) AC_SUBST(ENABLE_PLUGIN) + +AC_ARG_ENABLE([docs], + [AS_HELP_STRING([--disable-docs], + [Disable generation of documentation])], + [ENABLE_DOCS="$val"], [ENABLE_DOCS='yes']) +AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes]) AC_ARG_WITH([icedtea], [AS_HELP_STRING([--with-icedtea], From gnu_andrew at member.fsf.org Tue Apr 8 00:58:01 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 8 Apr 2008 08:58:01 +0100 Subject: Generated file changes in IcedTea6 In-Reply-To: <17c6771e0804070605y6985f742l770464f779e20bc9@mail.gmail.com> References: <17c6771e0804070315i577ebc2ai17e50df3f1aed1cd@mail.gmail.com> <1207565294.25074.11.camel@imac523d.theobroma-systems.com> <17c6771e0804070605y6985f742l770464f779e20bc9@mail.gmail.com> Message-ID: <17c6771e0804080058k43c27c47q7ce74f660df3045e@mail.gmail.com> On 07/04/2008, Andrew John Hughes wrote: > On 07/04/2008, Christian Thalinger wrote: > > On Mon, 2008-04-07 at 11:15 +0100, Andrew John Hughes wrote: > > > Is anyone else seeing changed files in generated/sun/awt/X11 after > > > building IcedTea? > > > > > > This is on ppc64 with zero. > > > > > > --- a/generated/sun/awt/X11/awtImageData.java Fri Apr 04 16:13:34 2008 -0400 > > > +++ b/generated/sun/awt/X11/awtImageData.java Mon Apr 07 11:12:08 2008 +0100 > > > @@ -8,7 +8,7 @@ public class awtImageData extends XWrapp > > > public class awtImageData extends XWrapperBase { > > > private Unsafe unsafe = XlibWrapper.unsafe; > > > private final boolean should_free_memory; > > > - public static int getSize() { return 304; } > > > + public static int getSize() { return ((XlibWrapper.dataModel > > > == 32)?(304):(560)); } > > > public int getDataSize() { return getSize(); } > > > > > > long pData; > > > > > > Other files are also changed in a similar way. > > > > > > Yes, this seems to be normal. Matthias Klose also posted something > > about this some time ago: > > > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-March/001459.html > > > > - twisti > > > > > > > Yes, I remember that mail now. It seems the 64-bit version should > just be used throughout, as it read almost like an improvement patch > to me. > > -- > Andrew :-) > > 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 > Do we need these files committed to IcedTea? If so, can we patch this locally, because otherwise we have to delete generated locally before committing (at least, on 64-bit)? -- Andrew :-) 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 gnu_andrew at member.fsf.org Tue Apr 8 00:59:28 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 8 Apr 2008 08:59:28 +0100 Subject: request for disable-alsa configure option In-Reply-To: <47FA25B7.8000309@redhat.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <1207562599.25074.8.camel@imac523d.theobroma-systems.com> <47FA1E93.3050801@redhat.com> <17c6771e0804070647n5ef7d2d1m7d3220faceb652d7@mail.gmail.com> <47FA25B7.8000309@redhat.com> Message-ID: <17c6771e0804080059k55024516s449add8a19c0040c@mail.gmail.com> On 07/04/2008, Lillian Angel wrote: > > > Andrew John Hughes wrote: > > > On 07/04/2008, Joshua Sumali wrote: > > > > > Christian Thalinger wrote: > > > > > > > > > > On Mon, 2008-04-07 at 10:58 +0100, Andrew John Hughes wrote: > > > > > > > > > > > > > > > > > Seems a sensible option to me. > > > > > Do you have a patch you could post? > > > > > > > > > > > > > > > > > > > When we are at options, I'd like to have a --disable-docs option. > Maybe > > > > I can post a patch later. > > > > > > > > - twisti > > > > > > > > > > > > > > > > > > > +1 > > > > > > This would speed up full builds quite a bit, I think. > > > > > > Josh > > > > > > > > > > Patch attached. Okay to commit? > > > > If you tested out a full build, then go ahead. > > Thanks, > Lillian > Tested with a full bootstrapping build on ppc64 and committed. -- Andrew :-) 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 gnu_andrew at member.fsf.org Tue Apr 8 01:00:42 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Tue, 8 Apr 2008 09:00:42 +0100 Subject: request for disable-alsa configure option In-Reply-To: References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> Message-ID: <17c6771e0804080100j6d7d3311k39291710849ef273@mail.gmail.com> On 08/04/2008, Michael Franz wrote: > > > On Mon, Apr 7, 2008 at 5:58 AM, Andrew John Hughes > wrote: > > > > > > > > On 06/04/2008, Michael Franz wrote: > > > Hi, > > > > > > Would it be possible to add a --disable-alsa to the Icedtea6 configure > > > script? I have been manually removing the check when building on OS X, > but > > > the latest couple of updates have caused problems as the > autoconf/aclocal > > > have been giving me trouble. I have been patching configure.ac and not > > > configure as I figured it would be changing less and not require me to > > > update my patch too often. > > > > > > I don't think this option will be intrusive as it can be defaulted to no > > > (thus having alsa enabled by default). > > > > > > Functionality similar to --disable-gcjwebplugin would be sufficient. > > > > > > > > > Thanks > > > > > > Michael > > > > > > > Seems a sensible option to me. > > Do you have a patch you could post? > > -- > > Andrew :-) > > Here is my patch. I tested it on OS X. > > Michael > > > I take it the OpenJDK build doesn't halt if ALSA is not present? -- Andrew :-) 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 seb at frankengul.org Tue Apr 8 01:20:50 2008 From: seb at frankengul.org (=?ISO-8859-1?Q?S=E9bastien_Bernard?=) Date: Tue, 08 Apr 2008 10:20:50 +0200 Subject: SIGABORT on linux-sparc In-Reply-To: <20080408072503.GA3651@redhat.com> References: <47FA8435.7040705@frankengul.org> <47FA8519.2000406@frankengul.org> <20080408072503.GA3651@redhat.com> Message-ID: <47FB2AE2.3080808@frankengul.org> Gary Benson a ?crit : > Bernard S?bastien wrote: > >> 2nd: the sparc32 build goes all the way but any run led to a >> SIGABORT. As show at the end. >> >> I'm putting the hs_err_pid1983.log in attachment produced by the >> latest build of the jdk. >> > > Ah, the code that produces the hs_err_pid*.log files calls abort(), > so the SIGABORT is possibly a side-effect of that. > > >> # Internal Error (os_linux_zero.cpp:144), pid=1983, tid=1887509392 >> # Error: caught unhandled signal 10 >> > > Is signal 10 USR1 on your machine? > No, signal 10 is SIGBUS. From dennis at ausil.us Tue Apr 8 04:57:13 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Tue, 8 Apr 2008 06:57:13 -0500 Subject: SIGABORT on linux-sparc In-Reply-To: <47FB2AE2.3080808@frankengul.org> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> Message-ID: <200804080657.13929.dennis@ausil.us> On Tuesday 08 April 2008, S?bastien Bernard wrote: > Gary Benson a ?crit : > > Bernard S?bastien wrote: > >> 2nd: the sparc32 build goes all the way but any run led to a > >> SIGABORT. As show at the end. > >> > >> I'm putting the hs_err_pid1983.log in attachment produced by the > >> latest build of the jdk. > > > > Ah, the code that produces the hs_err_pid*.log files calls abort(), > > so the SIGABORT is possibly a side-effect of that. > > > >> # Internal Error (os_linux_zero.cpp:144), pid=1983, tid=1887509392 > >> # Error: caught unhandled signal 10 > > > > Is signal 10 USR1 on your machine? > > No, signal 10 is SIGBUS. Which means that memory access in not aligned Dennis From gbenson at redhat.com Tue Apr 8 06:00:15 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 8 Apr 2008 14:00:15 +0100 Subject: SIGABORT on linux-sparc In-Reply-To: <200804080657.13929.dennis@ausil.us> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> Message-ID: <20080408130015.GD3651@redhat.com> Dennis Gilmore wrote: > On Tuesday 08 April 2008, S?bastien Bernard wrote: > > Gary Benson a ?crit : > > > Bernard S?bastien wrote: > > > > 2nd: the sparc32 build goes all the way but any run led to a > > > > SIGABORT. As show at the end. > > > > > > > > I'm putting the hs_err_pid1983.log in attachment produced by > > > > the latest build of the jdk. > > > > > > Ah, the code that produces the hs_err_pid*.log files calls abort(), > > > so the SIGABORT is possibly a side-effect of that. > > > > > >> # Internal Error (os_linux_zero.cpp:144), pid=1983, tid=1887509392 > > >> # Error: caught unhandled signal 10 > > > > > > Is signal 10 USR1 on your machine? > > > > No, signal 10 is SIGBUS. > > Which means that memory access in not aligned Interesting. Do you know what it was trying to access? Cheers, Gary -- http://gbenson.net/ From seb at frankengul.org Tue Apr 8 06:07:34 2008 From: seb at frankengul.org (=?UTF-8?B?U8OpYmFzdGllbiBCZXJuYXJk?=) Date: Tue, 08 Apr 2008 15:07:34 +0200 Subject: SIGABORT on linux-sparc In-Reply-To: <200804080657.13929.dennis@ausil.us> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> Message-ID: <47FB6E16.2040707@frankengul.org> Dennis Gilmore a ?crit : > On Tuesday 08 April 2008, S?bastien Bernard wrote: > >> Gary Benson a ?crit : >> >>> Bernard S?bastien wrote: >>> >>>> 2nd: the sparc32 build goes all the way but any run led to a >>>> SIGABORT. As show at the end. >>>> >>>> I'm putting the hs_err_pid1983.log in attachment produced by the >>>> latest build of the jdk. >>>> >>> Ah, the code that produces the hs_err_pid*.log files calls abort(), >>> so the SIGABORT is possibly a side-effect of that. >>> >>> >>>> # Internal Error (os_linux_zero.cpp:144), pid=1983, tid=1887509392 >>>> # Error: caught unhandled signal 10 >>>> >>> Is signal 10 USR1 on your machine? >>> >> No, signal 10 is SIGBUS. >> > > Which means that memory access in not aligned > > Dennis > Hum, that is a plague on the sparc. Caught from a ./java -version, here is the stack trace : #0 0xf7d3f5ac in raise () from /lib/libc.so.6 #1 0xf7d410b8 in abort () from /lib/libc.so.6 #2 0xf7bd775c in os::abort (dump_core=true) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp:1473 #3 0xf7c77dd8 in VMError::report_and_die (this=0xf781c000) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/utilities/vmError.cpp:834 #4 0xf7a97340 in report_fatal ( file_name=0xf7caf010 "/home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp", line_no=144, message=0xf781c0a0 "caught unhandled signal 10") at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/utilities/debug.cpp:179 #5 0xf7bdae10 in JVM_handle_linux_signal (sig=10, info=0xf781c150, ucVoid=0xf781c1d0, abort_if_unrecognized=1) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:144 #6 #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 #8 0xf7a96cac in CppInterpreter::normal_entry (method=0xf1645128, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:89 #9 0xf7a96cac in CppInterpreter::normal_entry (method=0xf789aa5c, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:89 #10 0xf7c2fdcc in StubGenerator::call_stub (call_wrapper=0xf789ab8c, result=0xf789adb0, result_type=T_INT, method=0xf16447b0, entry_point=0xf7a96b6c "\235?\220?\026 (/", parameters=, parameter_words=0, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp:69 #11 0xf7af000c in JavaCalls::call_helper (result=0xf789ada8, m=, args=0xf789ad1c, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime/javaCalls.cpp:388 #12 0xf7bd3318 in os::os_exception_wrapper ( f=0xf7aefdc0 , value=0xf789ada8, method=0xf789ad14, args=0xf789ad1c, thread=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp:3798 #13 0xf7aef2a0 in JavaCalls::call (result=0xf789ada8, args=0xf789ad1c, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime/javaCalls.cpp:298 #14 0xf7ad713c in instanceKlass::call_class_initializer_impl (this_oop= { = { = {_handle = 0x1}, }, }, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/oops/instanceKlass.cpp:626 #15 0xf7ad719c in instanceKlass::call_class_initializer (this=, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/oops/instanceKlass.cpp:606 #16 0xf7ad9304 in instanceKlass::initialize_impl (this_oop= { = { = {_handle = 0x2f490}, }, }, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/oops/instanceKlass.cpp:356 #17 0xf7ad97cc in instanceKlass::initialize (this=, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/oops/instanceKlass.cpp:98 #18 0xf7c44994 in initialize_class (class_name={ = {_handle = 0xf789b0f4}, }, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime/thread.cpp:832 #19 0xf7c49d0c in Threads::create_vm (args=, canTryAgain=) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime/thread.cpp:2930 #20 0xf7af9538 in JNI_CreateJavaVM (vm=0xf789b2f4, penv=0xf789b2f0, args=0x0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/share/vm/prims/jni.cpp:3260 #21 0x000125f8 in JavaMain (_args=) at ../../../../src/share/bin/java.c:1255 #22 0xf7eaebfc in start_thread () from /lib/libpthread.so.0 #23 0xf7def6dc in __thread_start () from /lib/libc.so.6 #24 0xf7def6dc in __thread_start () from /lib/libc.so.6 Backtrace stopped: previous frame identical to this frame (corrupt stack?) From seb at frankengul.org Tue Apr 8 06:18:34 2008 From: seb at frankengul.org (=?UTF-8?B?U8OpYmFzdGllbiBCZXJuYXJk?=) Date: Tue, 08 Apr 2008 15:18:34 +0200 Subject: SIGABORT on linux-sparc In-Reply-To: <20080408130015.GD3651@redhat.com> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> <20080408130015.GD3651@redhat.com> Message-ID: <47FB70AA.8040001@frankengul.org> Gary Benson a ?crit : > Dennis Gilmore wrote: > >> On Tuesday 08 April 2008, S?bastien Bernard wrote: >> >>> Gary Benson a ?crit : >>> >>>> Bernard S?bastien wrote: >>>> >>>>> 2nd: the sparc32 build goes all the way but any run led to a >>>>> SIGABORT. As show at the end. >>>>> >>>>> I'm putting the hs_err_pid1983.log in attachment produced by >>>>> the latest build of the jdk. >>>>> >>>> Ah, the code that produces the hs_err_pid*.log files calls abort(), >>>> so the SIGABORT is possibly a side-effect of that. >>>> >>>> >>>>> # Internal Error (os_linux_zero.cpp:144), pid=1983, tid=1887509392 >>>>> # Error: caught unhandled signal 10 >>>>> >>>> Is signal 10 USR1 on your machine? >>>> >>> No, signal 10 is SIGBUS. >>> >> Which means that memory access in not aligned >> > > Interesting. Do you know what it was trying to access? > > Cheers, > Gary > > See my previous mail. The sigbus happens in icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp line 356. The line is : case T_LONG: SET_LOCALS_LONG(*(jlong *) result, 0); break; The SET_LOCALS_LONG is breaking the access. The value of result according to gdb is (long long int *) 0xf781c420 From gbenson at redhat.com Tue Apr 8 06:25:21 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 8 Apr 2008 14:25:21 +0100 Subject: SIGABORT on linux-sparc In-Reply-To: <47FB70AA.8040001@frankengul.org> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> <20080408130015.GD3651@redhat.com> <47FB70AA.8040001@frankengul.org> Message-ID: <20080408132521.GE3651@redhat.com> S?bastien Bernard wrote: > The sigbus happens in > icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp > line 356. > > The line is : > > case T_LONG: > SET_LOCALS_LONG(*(jlong *) result, 0); > break; > > The SET_LOCALS_LONG is breaking the access. > The value of result according to gdb is (long long int *) 0xf781c420 That looks pretty aligned to me. What does gdb say the variable "locals" is at that point? Cheers, Gary -- http://gbenson.net/ From jsumali at redhat.com Tue Apr 8 06:37:25 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Tue, 08 Apr 2008 13:37:25 +0000 Subject: changeset in /hg/icedtea6: 2008-04-08 Joshua Sumali changeset 8f5c92edd931 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8f5c92edd931 description: 2008-04-08 Joshua Sumali * generated/sun/awt/X11/generator/sizer.32: Regenerated. * patches/icedtea-webservices.patch: Relaxed visiblity a bit more in sun.applet.AppletPanel for NetxPanel. * rt/net/sourceforge/jnlp/Launcher.java (getApplet(file, enableCodeBase, container)): New method. (createAppletObject(file, enableCodeBase, container)): Likewise. * rt/net/sourceforge/jnlp/NetxPanel.java: Removed run() and replaced with new method runLoader(). * rt/net/sourceforge/jnlp/PluginBridge.java: Refactored. (isApplet): New method. (isApplication): Likewise. (isComponent): Likewise. (isInstaller): Likewise. * rt/net/sourceforge/jnlp/resources/Messages.properties: Added message for network access. * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (runtimePermissions): New field. (setSecurity): New method. (addPermission(perm)): Likewise. (getSecurity): Likewise. * rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java: Check runtime permissions for permissions that may have been granted by the user. (implies): New method. * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Catch socket permission requests, and ask user for permission when application is unsigned. (askPermission(perm)): New method. (addPermission(perm)): Likewise. * rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Add NETWORK type access, and allow passing of parameters for message dialogs. (showAccessWarningDialogs(accessType, file, extras)): New method. * rt/net/sourceforge/jnlp/services/ServiceUtil.java (checkAccess(type, extras)): New method. diffstat: 11 files changed, 610 insertions(+), 393 deletions(-) ChangeLog | 36 + patches/icedtea-webservices.patch | 70 ++- rt/net/sourceforge/jnlp/Launcher.java | 99 +++- rt/net/sourceforge/jnlp/NetxPanel.java | 169 ++----- rt/net/sourceforge/jnlp/PluginBridge.java | 245 ++++------- rt/net/sourceforge/jnlp/resources/Messages.properties | 1 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 54 ++ rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 18 rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 135 ++++-- rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 140 +++--- rt/net/sourceforge/jnlp/services/ServiceUtil.java | 36 + diffs (truncated from 1393 to 500 lines): diff -r ff3d152968b5 -r 8f5c92edd931 ChangeLog --- a/ChangeLog Tue Apr 08 08:55:33 2008 +0100 +++ b/ChangeLog Tue Apr 08 09:37:00 2008 -0400 @@ -1,3 +1,39 @@ 2008-04-08 Andrew John Hughes + + * generated/sun/awt/X11/generator/sizer.32: Regenerated. + * patches/icedtea-webservices.patch: Relaxed visiblity a bit more in + sun.applet.AppletPanel for NetxPanel. + * rt/net/sourceforge/jnlp/Launcher.java + (getApplet(file, enableCodeBase, container)): New method. + (createAppletObject(file, enableCodeBase, container)): Likewise. + * rt/net/sourceforge/jnlp/NetxPanel.java: Removed run() and replaced with + new method runLoader(). + * rt/net/sourceforge/jnlp/PluginBridge.java: Refactored. + (isApplet): New method. + (isApplication): Likewise. + (isComponent): Likewise. + (isInstaller): Likewise. + * rt/net/sourceforge/jnlp/resources/Messages.properties: Added message for + network access. + * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (runtimePermissions): New field. + (setSecurity): New method. + (addPermission(perm)): Likewise. + (getSecurity): Likewise. + * rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java: Check runtime + permissions for permissions that may have been granted by the user. + (implies): New method. + * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Catch socket + permission requests, and ask user for permission when application is + unsigned. + (askPermission(perm)): New method. + (addPermission(perm)): Likewise. + * rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Add NETWORK + type access, and allow passing of parameters for message dialogs. + (showAccessWarningDialogs(accessType, file, extras)): New method. + * rt/net/sourceforge/jnlp/services/ServiceUtil.java + (checkAccess(type, extras)): New method. + 2008-04-08 Andrew John Hughes * Makefile.am: Add NO_DOCS option as diff -r ff3d152968b5 -r 8f5c92edd931 generated/sun/awt/X11/generator/sizer.32 Binary file generated/sun/awt/X11/generator/sizer.32 has changed diff -r ff3d152968b5 -r 8f5c92edd931 patches/icedtea-webservices.patch --- a/patches/icedtea-webservices.patch Tue Apr 08 08:55:33 2008 +0100 +++ b/patches/icedtea-webservices.patch Tue Apr 08 09:37:00 2008 -0400 @@ -10,27 +10,6 @@ diff -urN openjdk.orig/jdk/make/launcher $(call make-launcher, orbd, com.sun.corba.se.impl.activation.ORBD, \ -J-Dcom.sun.CORBA.activation.DbDir=./orb.db \ -J-Dcom.sun.CORBA.activation.Port=1049 \ -diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java ---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java 2008-01-12 15:53:45.000000000 -0500 -+++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java 2008-01-14 15:00:08.000000000 -0500 -@@ -68,7 +68,7 @@ - /** - * The applet (if loaded). - */ -- Applet applet; -+ protected Applet applet; - - /** - * Applet will allow initialization. Should be -@@ -306,7 +306,7 @@ - /** - * Get an event from the queue. - */ -- synchronized AppletEvent getNextEvent() throws InterruptedException { -+ protected synchronized AppletEvent getNextEvent() throws InterruptedException { - while (queue == null || queue.isEmpty()) { - wait(); - } diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java --- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2008-01-12 15:53:45.000000000 -0500 +++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2008-02-04 11:51:20.000000000 -0500 @@ -1371,3 +1350,52 @@ diff -ruN openjdk.orig/jdk/src/share/cla + } + } +} +--- openjdk-clean/jdk/src/share/classes/sun/applet/AppletPanel.java 2008-03-26 04:58:12.000000000 -0400 ++++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java 2008-04-07 21:55:56.000000000 -0400 +@@ -68,7 +68,7 @@ + /** + * The applet (if loaded). + */ +- Applet applet; ++ protected Applet applet; + + /** + * Applet will allow initialization. Should be +@@ -117,7 +117,7 @@ + /** + * The thread for the applet. + */ +- Thread handler; ++ protected Thread handler; + + + /** +@@ -162,7 +162,8 @@ + * Creates a thread to run the applet. This method is called + * each time an applet is loaded and reloaded. + */ +- synchronized void createAppletThread() { ++ //Overridden by NetxPanel. ++ protected synchronized void createAppletThread() { + // Create a thread group for the applet, and start a new + // thread to load the applet. + String nm = "applet-" + getCode(); +@@ -306,7 +307,7 @@ + /** + * Get an event from the queue. + */ +- synchronized AppletEvent getNextEvent() throws InterruptedException { ++ protected synchronized AppletEvent getNextEvent() throws InterruptedException { + while (queue == null || queue.isEmpty()) { + wait(); + } +@@ -695,7 +696,8 @@ + * applet event processing so that it can be gracefully interrupted from + * things like HotJava. + */ +- private void runLoader() { ++ //Overridden by NetxPanel. ++ protected void runLoader() { + if (status != APPLET_DISPOSE) { + showAppletStatus("notdisposed"); + return; diff -r ff3d152968b5 -r 8f5c92edd931 rt/net/sourceforge/jnlp/Launcher.java --- a/rt/net/sourceforge/jnlp/Launcher.java Tue Apr 08 08:55:33 2008 +0100 +++ b/rt/net/sourceforge/jnlp/Launcher.java Tue Apr 08 09:37:00 2008 -0400 @@ -21,8 +21,6 @@ import java.awt.Container; import java.awt.Container; import java.io.*; import java.net.*; -import java.util.*; -import java.security.*; import java.lang.reflect.*; import net.sourceforge.jnlp.cache.*; @@ -157,10 +155,12 @@ public class Launcher { public ApplicationInstance launch(JNLPFile file, Container cont) throws LaunchException { TgThread tg; - if (cont == null) - tg = new TgThread(file); + if (file instanceof PluginBridge && cont != null) + tg = new TgThread(file, cont, true); + else if (cont == null) + tg = new TgThread(file); else - tg = new TgThread(file, cont); + tg = new TgThread(file, cont); tg.start(); @@ -357,11 +357,30 @@ public class Launcher { throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplet"), R("LNotAppletInfo"))); try { - AppletInstance applet= createApplet(file, enableCodeBase, cont); + AppletInstance applet = createApplet(file, enableCodeBase, cont); applet.initialize(); - + applet.getAppletEnvironment().startApplet(); // this should be a direct call to applet instance - + return applet; + } + catch (LaunchException lex) { + throw launchError(lex); + } + catch (Exception ex) { + throw launchError(new LaunchException(file, ex, R("LSFatal"), R("LCLaunching"), R("LCouldNotLaunch"), R("LCouldNotLaunchInfo"))); + } + } + + /** + * Gets an ApplicationInstance, but does not launch the applet. + */ + protected ApplicationInstance getApplet(JNLPFile file, boolean enableCodeBase, Container cont) throws LaunchException { + if (!file.isApplet()) + throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplet"), R("LNotAppletInfo"))); + + try { + AppletInstance applet = createApplet(file, enableCodeBase, cont); + applet.initialize(); return applet; } catch (LaunchException lex) { @@ -418,7 +437,34 @@ public class Launcher { } } - + /** + * Creates an Applet object from a JNLPFile. This is mainly to be used with + * gcjwebplugin. + * @param file the PluginBridge to be used. + * @param enableCodeBase whether to add the code base URL to the classloader. + */ + protected Applet createAppletObject(JNLPFile file, boolean enableCodeBase, Container cont) throws LaunchException { + try { + JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy); + + if (enableCodeBase || file.getResources().getJARs().length == 0) + loader.enableCodeBase(); + + String appletName = file.getApplet().getMainClass(); + + //Classloader chokes if there's '/' in the path to the main class. + //Must replace with '.' instead. + appletName = appletName.replace('/', '.'); + Class appletClass = loader.loadClass(appletName); + Applet applet = (Applet) appletClass.newInstance(); + + return applet; + } + catch (Exception ex) { + throw launchError(new LaunchException(file, ex, R("LSFatal"), R("CLInit"), R("LInitApplet"), R("LInitAppletInfo"))); + } + } + /** * Creates an Application. */ @@ -483,6 +529,7 @@ public class Launcher { private ApplicationInstance application; private LaunchException exception; private Container cont; + private boolean isPlugin = false; TgThread(JNLPFile file) { this(file, null); @@ -493,21 +540,34 @@ public class Launcher { this.file = file; this.cont = cont; + } + + TgThread(JNLPFile file, Container cont, boolean isPlugin) { + super(createThreadGroup(file), file.getTitle()); + this.file = file; + this.cont = cont; + this.isPlugin = isPlugin; } public void run() { try { if (context) - new Reflect().invokeStatic("sun.awt.SunToolkit", "createNewAppContext"); - - if (file.isApplication()) - application = launchApplication(file); - else if (file.isApplet()) - application = launchApplet(file, true, cont); // enable applet code base - else if (file.isInstaller()) - application = launchInstaller(file); - else - throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotLaunchable"), R("LNotLaunchableInfo"))); + new Reflect().invokeStatic("sun.awt.SunToolkit", "createNewAppContext"); + + if (isPlugin) { + application = getApplet(file, true, cont); + } else { + if (file.isApplication()) + application = launchApplication(file); + else if (file.isApplet()) + application = launchApplet(file, true, cont); // enable applet code base + else if (file.isInstaller()) + application = launchInstaller(file); + else + throw launchError(new LaunchException(file, null, + R("LSFatal"), R("LCClient"), R("LNotLaunchable"), + R("LNotLaunchableInfo"))); + } } catch (LaunchException ex) { exception = ex; @@ -521,6 +581,7 @@ public class Launcher { public ApplicationInstance getApplication() { return application; } + }; diff -r ff3d152968b5 -r 8f5c92edd931 rt/net/sourceforge/jnlp/NetxPanel.java --- a/rt/net/sourceforge/jnlp/NetxPanel.java Tue Apr 08 08:55:33 2008 +0100 +++ b/rt/net/sourceforge/jnlp/NetxPanel.java Tue Apr 08 09:37:00 2008 -0400 @@ -27,7 +27,8 @@ import net.sourceforge.jnlp.runtime.JNLP import java.net.URL; import java.util.Hashtable; -import sun.applet.*; + +import sun.applet.AppletViewerPanel; /** * This panel calls into netx to run an applet, and pipes the display @@ -44,116 +45,68 @@ public class NetxPanel extends AppletVie super(documentURL, atts); } - public void run() - { - Thread curThread = Thread.currentThread(); - boolean disposed = false; - while (!disposed && !curThread.isInterrupted()) { - AppletEvent evt; - try { - evt = getNextEvent(); - } catch (InterruptedException e) { - showAppletStatus("bail"); - return; - } + //Overriding to use Netx classloader. You might need to relax visibility + //in sun.applet.AppletPanel for runLoader(). + protected void runLoader() { - try { - switch (evt.getID()) { - case APPLET_LOAD: - case APPLET_INIT: - // TODO: split out the load/init/start steps in Netx - break; + try { + bridge = new PluginBridge(baseURL, + getDocumentBase(), + getJarFiles(), + getCode(), + getWidth(), + getHeight(), + atts); + + //The custom NetX Policy and SecurityManager are set here. + if (!JNLPRuntime.isInitialized()) { + System.out.println("initializing JNLPRuntime..."); + JNLPRuntime.initialize(); + } else { + System.out.println("JNLPRuntime already initialized"); + } - case APPLET_START: - // FIXME: in sun.applet.AppletPanel, the validation and running - // of the applet all happen in the event dispatch thread. Need - // to carefully audit what they do and where, and see if we need - // to do the same here or in netx code. + doInit = true; + dispatchAppletEvent(APPLET_LOADING, null); + status = APPLET_LOAD; + + //FIXME: For some reason, when this applet is loaded by NetX, + //keyboard input will not make it to the applet when displayed in + //firefox, unless a mouse button is held down. + Launcher l = new Launcher(); + AppletInstance appInst = (AppletInstance) l.launch(bridge, this); + applet = appInst.getApplet(); + + //On the other hand, if you create an applet this way, it'll work + //fine. Note that you might to open visibility in sun.applet.AppletPanel + //for this to work (the loader field, and getClassLoader). + //loader = getClassLoader(getCodeBase(), getClassLoaderCacheKey()); + //applet = createApplet(loader); + + // This shows that when using NetX's JNLPClassLoader, keyboard input + // won't make it to the applet, whereas using sun.applet.AppletClassLoader + // works just fine. + + dispatchAppletEvent(APPLET_LOADING_COMPLETED, null); - bridge = new PluginBridge(baseURL, - getDocumentBase(), - getJarFiles(), - getCode(), - getWidth(), getHeight(), - atts); - - if (! JNLPRuntime.isInitialized()) - JNLPRuntime.initialize(); - - Launcher l = new Launcher(); - dispatchAppletEvent(APPLET_LOADING_COMPLETED, null); // not quite.. - - applet = ((AppletInstance)l.launch(bridge, this)).getApplet(); - - status = APPLET_START; - showAppletStatus("started"); - break; - - case APPLET_STOP: - if (status != APPLET_START) { - showAppletStatus("notstarted"); - break; - } - - status = APPLET_STOP; - - applet.setVisible(false); - applet.stop(); - - showAppletStatus("stopped"); - break; - - case APPLET_DESTROY: - if (status != APPLET_STOP && status != APPLET_INIT) { - showAppletStatus("notstopped"); - break; - } - status = APPLET_DESTROY; - - applet.destroy(); - showAppletStatus("destroyed"); - break; - - case APPLET_DISPOSE: - if (status != APPLET_DESTROY && status != APPLET_LOAD) { - showAppletStatus("notdestroyed"); - break; - } - status = APPLET_DISPOSE; - - remove(applet); - applet = null; - showAppletStatus("disposed"); - disposed = true; - break; - - case APPLET_QUIT: - return; - } - } catch (Exception e) { - status = APPLET_ERROR; - if (e.getMessage() != null) { - showAppletStatus("exception2", e.getClass().getName(), - e.getMessage()); - } else { - showAppletStatus("exception", e.getClass().getName()); - } - showAppletException(e); - } catch (ThreadDeath e) { - showAppletStatus("death"); - return; - } catch (Error e) { - status = APPLET_ERROR; - if (e.getMessage() != null) { - showAppletStatus("error2", e.getClass().getName(), - e.getMessage()); - } else { - showAppletStatus("error", e.getClass().getName()); - } - showAppletException(e); - } - clearLoadAbortRequest(); - } + if (applet != null) + { + // Stick it in the frame + applet.setStub(this); + applet.setVisible(false); + add("Center", applet); + showAppletStatus("loaded"); + validate(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + // Reminder: Relax visibility in sun.applet.AppletPanel + protected synchronized void createAppletThread() { + handler = new Thread(this); + handler.start(); } } diff -r ff3d152968b5 -r 8f5c92edd931 rt/net/sourceforge/jnlp/PluginBridge.java --- a/rt/net/sourceforge/jnlp/PluginBridge.java Tue Apr 08 08:55:33 2008 +0100 +++ b/rt/net/sourceforge/jnlp/PluginBridge.java Tue Apr 08 09:37:00 2008 -0400 @@ -2,19 +2,19 @@ * Copyright 2007 Red Hat, Inc. * This file is part of IcedTea, http://icedtea.classpath.org * 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). - * + * From seb at frankengul.org Tue Apr 8 06:56:00 2008 From: seb at frankengul.org (=?UTF-8?B?U8OpYmFzdGllbiBCZXJuYXJk?=) Date: Tue, 08 Apr 2008 15:56:00 +0200 Subject: SIGABORT on linux-sparc In-Reply-To: <20080408132521.GE3651@redhat.com> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> <20080408130015.GD3651@redhat.com> <47FB70AA.8040001@frankengul.org> <20080408132521.GE3651@redhat.com> Message-ID: <47FB7970.3030201@frankengul.org> Gary Benson a ?crit : > S?bastien Bernard wrote: > >> The sigbus happens in >> icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp >> line 356. >> >> The line is : >> >> case T_LONG: >> SET_LOCALS_LONG(*(jlong *) result, 0); >> break; >> >> The SET_LOCALS_LONG is breaking the access. >> The value of result according to gdb is (long long int *) 0xf781c420 >> > > That looks pretty aligned to me. > What does gdb say the variable "locals" is at that point? > #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 356 SET_LOCALS_LONG(*(jlong *) result, 0); (gdb) p (void*) locals $1 = (void *) 0xf789aa58 (gdb) From doko at ubuntu.com Tue Apr 8 07:11:07 2008 From: doko at ubuntu.com (doko at ubuntu.com) Date: Tue, 08 Apr 2008 14:11:07 +0000 Subject: changeset in /hg/icedtea6: 2008-04-08 Matthias Klose changeset c8437bd435d8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c8437bd435d8 description: 2008-04-08 Matthias Klose * patches/icedtea-text-relocations.patch: Use -fPIC on sparc/sparc64. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ patches/icedtea-text-relocations.patch | 2 +- diffs (23 lines): diff -r 8f5c92edd931 -r c8437bd435d8 ChangeLog --- a/ChangeLog Tue Apr 08 09:37:00 2008 -0400 +++ b/ChangeLog Tue Apr 08 16:11:16 2008 +0200 @@ -1,3 +1,7 @@ 2008-04-08 Joshua Sumali + + * patches/icedtea-text-relocations.patch: Use -fPIC on sparc/sparc64. + 2008-04-08 Joshua Sumali * generated/sun/awt/X11/generator/sizer.32: Regenerated. diff -r 8f5c92edd931 -r c8437bd435d8 patches/icedtea-text-relocations.patch --- a/patches/icedtea-text-relocations.patch Tue Apr 08 09:37:00 2008 -0400 +++ b/patches/icedtea-text-relocations.patch Tue Apr 08 16:11:16 2008 +0200 @@ -4,7 +4,7 @@ # Compiler flags # position-independent code -+ifneq ($(filter ppc ppc64,$(ZERO_LIBARCH)),) ++ifneq ($(filter ppc ppc64 sparc sparc64,$(ZERO_LIBARCH)),) PICFLAG = -fPIC +else +PICFLAG = -fpic From aph at redhat.com Tue Apr 8 07:33:26 2008 From: aph at redhat.com (Andrew Haley) Date: Tue, 08 Apr 2008 15:33:26 +0100 Subject: SIGABORT on linux-sparc In-Reply-To: <47FB7970.3030201@frankengul.org> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> <20080408130015.GD3651@redhat.com> <47FB70AA.8040001@frankengul.org> <20080408132521.GE3651@redhat.com> <47FB7970.3030201@frankengul.org> Message-ID: <47FB8236.6020204@redhat.com> S?bastien Bernard wrote: > Gary Benson a ?crit : >> S?bastien Bernard wrote: >> >>> The sigbus happens in >>> icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp >>> line 356. >>> >>> The line is : >>> >>> case T_LONG: SET_LOCALS_LONG(*(jlong *) result, 0); >>> break; >>> >>> The SET_LOCALS_LONG is breaking the access. >>> The value of result according to gdb is (long long int *) 0xf781c420 >>> >> >> That looks pretty aligned to me. >> What does gdb say the variable "locals" is at that point? >> > #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, > __the_thread__=0x2ecb0) > at > /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 > > 356 SET_LOCALS_LONG(*(jlong *) result, 0); > (gdb) p (void*) locals > $1 = (void *) 0xf789aa58 > (gdb) That's pretty aligned too. Try x/i $pc and then tell us what the contents of the address register is. Andrew. From seb at frankengul.org Tue Apr 8 07:41:39 2008 From: seb at frankengul.org (=?UTF-8?B?U8OpYmFzdGllbiBCZXJuYXJk?=) Date: Tue, 08 Apr 2008 16:41:39 +0200 Subject: SIGABORT on linux-sparc In-Reply-To: <47FB8236.6020204@redhat.com> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> <20080408130015.GD3651@redhat.com> <47FB70AA.8040001@frankengul.org> <20080408132521.GE3651@redhat.com> <47FB7970.3030201@frankengul.org> <47FB8236.6020204@redhat.com> Message-ID: <47FB8423.4010807@frankengul.org> Andrew Haley a ?crit : > S?bastien Bernard wrote: > >> Gary Benson a ?crit : >> >>> S?bastien Bernard wrote: >>> >>> >>>> The sigbus happens in >>>> icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp >>>> line 356. >>>> >>>> The line is : >>>> >>>> case T_LONG: SET_LOCALS_LONG(*(jlong *) result, 0); >>>> break; >>>> >>>> The SET_LOCALS_LONG is breaking the access. >>>> The value of result according to gdb is (long long int *) 0xf781c420 >>>> >>>> >>> That looks pretty aligned to me. >>> What does gdb say the variable "locals" is at that point? >>> >>> >> #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, >> __the_thread__=0x2ecb0) >> at >> /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 >> >> 356 SET_LOCALS_LONG(*(jlong *) result, 0); >> (gdb) p (void*) locals >> $1 = (void *) 0xf789aa58 >> (gdb) >> > > That's pretty aligned too. Try > > x/i $pc > > and then tell us what the contents of the address register is. > > Andrew. > Maybe an irc channel would be better suited for that kind of debugging. Anyway, here's the info (gdb) up #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, __the_thread__=0x2ecb0) at /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 356 SET_LOCALS_LONG(*(jlong *) result, 0); (gdb) x/i $pc 0xf7a96a9c <_ZN14CppInterpreter12native_entryEP13methodOopDescP6Thread+1456>: std %g2, [ %g1 + -4 ] Seb From aph at redhat.com Tue Apr 8 08:04:14 2008 From: aph at redhat.com (Andrew Haley) Date: Tue, 08 Apr 2008 16:04:14 +0100 Subject: SIGABORT on linux-sparc In-Reply-To: <47FB8423.4010807@frankengul.org> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> <20080408130015.GD3651@redhat.com> <47FB70AA.8040001@frankengul.org> <20080408132521.GE3651@redhat.com> <47FB7970.3030201@frankengul.org> <47FB8236.6020204@redhat.com> <47FB8423.4010807@frankengul.org> Message-ID: <47FB896E.40508@redhat.com> S?bastien Bernard wrote: > Andrew Haley a ?crit : >> S?bastien Bernard wrote: >> >>> Gary Benson a ?crit : >>> >>>> S?bastien Bernard wrote: >>>> >>>> >>>>> The sigbus happens in >>>>> icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp >>>>> line 356. >>>>> >>>>> The line is : >>>>> >>>>> case T_LONG: SET_LOCALS_LONG(*(jlong *) result, 0); >>>>> break; >>>>> >>>>> The SET_LOCALS_LONG is breaking the access. >>>>> The value of result according to gdb is (long long int *) 0xf781c420 >>>>> >>>> That looks pretty aligned to me. >>>> What does gdb say the variable "locals" is at that point? >>>> >>> #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, >>> __the_thread__=0x2ecb0) >>> at >>> /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 >>> >>> >>> 356 SET_LOCALS_LONG(*(jlong *) result, 0); >>> (gdb) p (void*) locals >>> $1 = (void *) 0xf789aa58 >>> (gdb) >>> >> >> That's pretty aligned too. Try >> >> x/i $pc >> >> and then tell us what the contents of the address register is. >> >> Andrew. >> > Maybe an irc channel would be better suited for that kind of debugging. We're on #openjdk at irc.oftc.net > Anyway, here's the info > (gdb) up > #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, > __the_thread__=0x2ecb0) > at > /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 > > 356 SET_LOCALS_LONG(*(jlong *) result, 0); > (gdb) x/i $pc > 0xf7a96a9c > <_ZN14CppInterpreter12native_entryEP13methodOopDescP6Thread+1456>: > std %g2, [ %g1 + -4 ] Eww, nasty. p $g1 ? Andrew. From seb at frankengul.org Tue Apr 8 14:01:53 2008 From: seb at frankengul.org (=?UTF-8?B?U8OpYmFzdGllbiBCZXJuYXJk?=) Date: Tue, 08 Apr 2008 23:01:53 +0200 Subject: SIGABORT on linux-sparc In-Reply-To: <47FB896E.40508@redhat.com> References: <47FA8435.7040705@frankengul.org> <20080408072503.GA3651@redhat.com> <47FB2AE2.3080808@frankengul.org> <200804080657.13929.dennis@ausil.us> <20080408130015.GD3651@redhat.com> <47FB70AA.8040001@frankengul.org> <20080408132521.GE3651@redhat.com> <47FB7970.3030201@frankengul.org> <47FB8236.6020204@redhat.com> <47FB8423.4010807@frankengul.org> <47FB896E.40508@redhat.com> Message-ID: <47FBDD41.9090303@frankengul.org> Andrew Haley a ?crit : > S?bastien Bernard wrote: >> Andrew Haley a ?crit : >>> S?bastien Bernard wrote: >>> >>>> Gary Benson a ?crit : >>>> >>>>> S?bastien Bernard wrote: >>>>> >>>>> >>>>>> The sigbus happens in >>>>>> icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp >>>>>> line 356. >>>>>> >>>>>> The line is : >>>>>> >>>>>> case T_LONG: SET_LOCALS_LONG(*(jlong *) result, 0); >>>>>> break; >>>>>> >>>>>> The SET_LOCALS_LONG is breaking the access. >>>>>> The value of result according to gdb is (long long int *) 0xf781c420 >>>>>> >>>>> That looks pretty aligned to me. >>>>> What does gdb say the variable "locals" is at that point? >>>>> >>>> #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, >>>> __the_thread__=0x2ecb0) >>>> at >>>> /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 >>>> >>>> >>>> 356 SET_LOCALS_LONG(*(jlong *) result, 0); >>>> (gdb) p (void*) locals >>>> $1 = (void *) 0xf789aa58 >>>> (gdb) >>>> >>> That's pretty aligned too. Try >>> >>> x/i $pc >>> >>> and then tell us what the contents of the address register is. >>> >>> Andrew. >>> >> Maybe an irc channel would be better suited for that kind of debugging. > > We're on #openjdk at irc.oftc.net > >> Anyway, here's the info >> (gdb) up >> #7 0xf7a96a9c in CppInterpreter::native_entry (method=0xf1645128, >> __the_thread__=0x2ecb0) >> at >> /home/seb/dev/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:356 >> >> 356 SET_LOCALS_LONG(*(jlong *) result, 0); >> (gdb) x/i $pc >> 0xf7a96a9c >> <_ZN14CppInterpreter12native_entryEP13methodOopDescP6Thread+1456>: >> std %g2, [ %g1 + -4 ] > > Eww, nasty. > > p $g1 ? > > Andrew. (gdb) x locals 0xf789aa58: 0xf789aaa4 (gdb) p/x $g1 $3 = 0xf789aa58 (gdb) x $g1 0xf789aa58: Cannot access memory at address 0xf789aa58 Seb From mvfranz at gmail.com Tue Apr 8 17:16:14 2008 From: mvfranz at gmail.com (Michael Franz) Date: Tue, 8 Apr 2008 20:16:14 -0400 Subject: request for disable-alsa configure option In-Reply-To: <17c6771e0804080100j6d7d3311k39291710849ef273@mail.gmail.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <17c6771e0804080100j6d7d3311k39291710849ef273@mail.gmail.com> Message-ID: > > Here is my patch. I tested it on OS X. > > > > Michael > > > > > > > > I take it the OpenJDK build doesn't halt if ALSA is not present? > -- > Andrew :-) > For as much as I can get to build, no. It does not halt. The farthest I have been able to get was up to the corba stuff. I ran into some linking errors I could not work around. I had to start over with my efforts as I accidentally deleted some important files. I have a bunch of new files and patches to make files that I need to verify. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080408/29396ea5/attachment.html From gnu_andrew at member.fsf.org Tue Apr 8 17:22:15 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 9 Apr 2008 01:22:15 +0100 Subject: request for disable-alsa configure option In-Reply-To: References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <17c6771e0804080100j6d7d3311k39291710849ef273@mail.gmail.com> Message-ID: <17c6771e0804081722j56df3642s482fbd338e6a8148@mail.gmail.com> On 09/04/2008, Michael Franz wrote: > > > > > > > > > Here is my patch. I tested it on OS X. > > > > > > Michael > > > > > > > > > > > > > I take it the OpenJDK build doesn't halt if ALSA is not present? > > > > > > > > -- > > Andrew :-) > For as much as I can get to build, no. It does not halt. The farthest I > have been able to get was up to the corba stuff. I ran into some linking > errors I could not work around. > > I had to start over with my efforts as I accidentally deleted some important > files. I have a bunch of new files and patches to make files that I need to > verify. > Ok I'll have to test this before adding it to IcedTea. CORBA is very early in the build (just after langtools), whereas ALSA will feature in the later J2SE stage. Be aware that the default build of IcedTea6 bootstraps by building IcedTea with your system stuff, and then building it using itself. -- Andrew :-) 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 mvfranz at gmail.com Tue Apr 8 17:39:39 2008 From: mvfranz at gmail.com (Michael Franz) Date: Tue, 8 Apr 2008 20:39:39 -0400 Subject: request for disable-alsa configure option In-Reply-To: <17c6771e0804081722j56df3642s482fbd338e6a8148@mail.gmail.com> References: <17c6771e0804070258s2b4d2d58gade490988f4c115@mail.gmail.com> <17c6771e0804080100j6d7d3311k39291710849ef273@mail.gmail.com> <17c6771e0804081722j56df3642s482fbd338e6a8148@mail.gmail.com> Message-ID: > Ok I'll have to test this before adding it to IcedTea. CORBA is very > early in the build (just after langtools), whereas ALSA will feature > in the later J2SE stage. > > Be aware that the default build of IcedTea6 bootstraps by building > IcedTea with your system stuff, and then building it using itself. > I was going to test on my Fedora install (VMware image) but it got corrupted and I have to rebuild and install - doing that now. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080408/bfc72805/attachment.html From mvfranz at gmail.com Tue Apr 8 20:07:51 2008 From: mvfranz at gmail.com (Michael Franz) Date: Tue, 8 Apr 2008 23:07:51 -0400 Subject: IcedTea6 - Mercurial Fails on Fedora 8 64bit Message-ID: Hi, I followed the instructions in the Icedtea6 release announcement and get the following error on Fedora 8 64 bit. /usr/bin/ld: cannot find -ljvm collect2: ld returned 1 exit status make[5]: *** [/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/build/linux-amd64/corba/lib/amd64/libioser12.so] Error 1 make[5]: Leaving directory `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba/core' make[4]: *** [build] Error 1 make[4]: Leaving directory `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba' make[3]: *** [build] Error 1 make[3]: Leaving directory `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun' make[2]: *** [build] Error 1 make[2]: Leaving directory `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make' make[1]: *** [corba-build] Error 2 make[1]: Leaving directory `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/make' make: *** [stamps/icedtea-ecj.stamp] Error 2 This is on a clean install with updates and the yum command: yum install /usr/bin/ecj mercurial cups-devel lesstif-devel libXp-devel libXtst-devel libXi-devel xalan-j2 xerces-j2 \ libXt-devel libgcj freetype-devel gcc gcc-c++ wget java-1.5.0-gcj-devel firefox-devel glib2-devel gtk2-devel \ ant libXinerama-devel libjpeg-devel libpng-devel giflib-devel zlib-devel You will notice that alsa-lib-devel is missing since it will not install correctly. Michael -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080408/1519dd5c/attachment.html From gbenson at redhat.com Wed Apr 9 00:39:48 2008 From: gbenson at redhat.com (Gary Benson) Date: Wed, 09 Apr 2008 07:39:48 +0000 Subject: changeset in /hg/icedtea6: 2008-04-09 Gary Benson changeset 4811f10b1d69 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4811f10b1d69 description: 2008-04-09 Gary Benson Xerxes R?nby * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp (__kernel_cmpxchg_t): New type. (__kernel_cmpxchg): New macro. (arm_compare_and_swap): New function. (Atomic::cmpxchg): Use the above on arm. (Atomic::cmpxchg_ptr): Likewise. (arm_add_and_fetch): New function. (Atomic::add): Use the above on arm. (Atomic::add_ptr): Likewise. (arm_lock_test_and_set): New function. (Atomic::xchg): Use the above on arm. (Atomic::xchg_ptr): Likewise. diffstat: 2 files changed, 96 insertions(+), 61 deletions(-) ChangeLog | 16 + ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 141 +++++----- diffs (216 lines): diff -r c8437bd435d8 -r 4811f10b1d69 ChangeLog --- a/ChangeLog Tue Apr 08 16:11:16 2008 +0200 +++ b/ChangeLog Wed Apr 09 03:39:42 2008 -0400 @@ -1,3 +1,19 @@ 2008-04-08 Matthias Klose + Xerxes R??nby + + * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp + (__kernel_cmpxchg_t): New type. + (__kernel_cmpxchg): New macro. + (arm_compare_and_swap): New function. + (Atomic::cmpxchg): Use the above on arm. + (Atomic::cmpxchg_ptr): Likewise. + (arm_add_and_fetch): New function. + (Atomic::add): Use the above on arm. + (Atomic::add_ptr): Likewise. + (arm_lock_test_and_set): New function. + (Atomic::xchg): Use the above on arm. + (Atomic::xchg_ptr): Likewise. + 2008-04-08 Matthias Klose * patches/icedtea-text-relocations.patch: Use -fPIC on sparc/sparc64. diff -r c8437bd435d8 -r 4811f10b1d69 ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp --- a/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Tue Apr 08 16:11:16 2008 +0200 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Wed Apr 09 03:39:42 2008 -0400 @@ -25,69 +25,63 @@ // Implementation of class atomic -// inline void Atomic::store(jbyte store_value, jbyte* dest) -// { -// Unimplemented(); -// } -// inline void Atomic::store(jshort store_value, jshort* dest) -// { -// Unimplemented(); -// } -// inline void Atomic::store(jint store_value, jint* dest) -// { -// Unimplemented(); -// } -// inline void Atomic::store(jlong store_value, jlong* dest) -// { -// Unimplemented(); -// } +#ifdef ARM +typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); +#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0) + +static inline int arm_compare_and_swap(volatile int *ptr, + int oldval, + int newval) { + int old = *ptr; + __kernel_cmpxchg(oldval, newval, (volatile int*) ptr); + return old; +} + +static inline int arm_add_and_fetch(volatile int *dest, int add_value) +{ + arm_compare_and_swap(dest, *dest, *dest + add_value); + return *dest; +} + +static inline int arm_lock_test_and_set(volatile int *ptr, int newval) +{ + int old = *ptr; + arm_compare_and_swap(ptr, *ptr, newval); + return old; +} +#endif // ARM + +inline void Atomic::store(jint store_value, volatile jint* dest) +{ + *dest = store_value; +} + inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { Unimplemented(); } -// inline void Atomic::store_ptr(void* store_value, void* dest) -// { -// Unimplemented(); -// } - -// inline void Atomic::store(jbyte store_value, volatile jbyte* dest) -// { -// Unimplemented(); -// } -// inline void Atomic::store(jshort store_value, volatile jshort* dest) -// { -// Unimplemented(); -// } -inline void Atomic::store(jint store_value, volatile jint* dest) -{ - *dest = store_value; -} -// inline void Atomic::store(jlong store_value, volatile jlong* dest) -// { -// Unimplemented(); -// } -// inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) -// { -// Unimplemented(); -// } -// inline void Atomic::store_ptr(void* store_value, volatile void* dest) -// { -// Unimplemented(); -// } inline jint Atomic::add(jint add_value, volatile jint* dest) { +#ifdef ARM + return arm_add_and_fetch(dest, add_value); +#else return __sync_add_and_fetch(dest, add_value); +#endif // ARM } inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { +#ifdef ARM + return arm_add_and_fetch(dest, add_value); +#else return __sync_add_and_fetch(dest, add_value); +#endif // ARM } inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) { - return (void*)add_ptr(add_value, (volatile intptr_t*)dest); + return (void *) add_ptr(add_value, (volatile intptr_t *) dest); } inline void Atomic::inc(volatile jint* dest) @@ -122,39 +116,64 @@ inline void Atomic::dec_ptr(volatile voi inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) { +#ifdef ARM + return arm_lock_test_and_set(dest, exchange_value); +#else // __sync_lock_test_and_set is a bizarrely named atomic exchange // operation. Note that some platforms only support this with the // limitation that the only valid value to store is the immediate // constant 1. There is a test for this in JNI_CreateJavaVM(). return __sync_lock_test_and_set (dest, exchange_value); +#endif // ARM } -inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) -{ +inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, + volatile intptr_t* dest) { +#ifdef ARM + return arm_lock_test_and_set(dest, exchange_value); +#else return __sync_lock_test_and_set (dest, exchange_value); +#endif // ARM } inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) { - return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest); + return (void *) xchg_ptr((intptr_t) exchange_value, + (volatile intptr_t*) dest); } -inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value) -{ +inline jint Atomic::cmpxchg(jint exchange_value, + volatile jint* dest, + jint compare_value) { +#ifdef ARM + return arm_compare_and_swap(dest, compare_value, exchange_value); +#else + return __sync_val_compare_and_swap(dest, compare_value, exchange_value); +#endif // ARM +} + +inline jlong Atomic::cmpxchg(jlong exchange_value, + volatile jlong* dest, + jlong compare_value) { + return __sync_val_compare_and_swap(dest, compare_value, exchange_value); } -inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value) -{ +inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, + volatile intptr_t* dest, + intptr_t compare_value) { +#ifdef ARM + return arm_compare_and_swap(dest, compare_value, exchange_value); +#else return __sync_val_compare_and_swap(dest, compare_value, exchange_value); +#endif // ARM } -inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) -{ - return __sync_val_compare_and_swap(dest, compare_value, exchange_value); +inline void* Atomic::cmpxchg_ptr(void* exchange_value, + volatile void* dest, + void* compare_value) { + + return (void *) cmpxchg_ptr((intptr_t) exchange_value, + (volatile intptr_t*) dest, + (intptr_t) compare_value); } - -inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) -{ - return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value); -} From gbenson at redhat.com Wed Apr 9 00:46:46 2008 From: gbenson at redhat.com (Gary Benson) Date: Wed, 9 Apr 2008 08:46:46 +0100 Subject: icedtea zero ARM atomic patch In-Reply-To: <47F4E529.50001@zafena.se> References: <47F4E529.50001@zafena.se> Message-ID: <20080409074646.GA3685@redhat.com> Xerxes R?nby wrote: > Here is a patch for the ARM zero port to deal with missing atomic > operations in the ARM hardware, here implemented using linux- > kernelcalls. With this patch the zero hotspot and bootstrap-ecj > part of icedtea6 do compile on ARM targets. I committed a reworked version of the first part of this patch. I've left the second part out as I don't think it's used -- you'll get an "unimplemented" message if it is. FWIW I'm not entirely convinced that the arm-specific functions are doing what they ought; arm_add_and_fetch and arm_lock_test_and_set seem to be dereferencing a volatile pointer twice, which doesn't seem atomic to me. But then I'm not great at this stuff either :) Cheers, Gary -- http://gbenson.net/ From gnu_andrew at member.fsf.org Wed Apr 9 03:48:16 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 9 Apr 2008 11:48:16 +0100 Subject: IcedTea6 - Mercurial Fails on Fedora 8 64bit In-Reply-To: References: Message-ID: <17c6771e0804090348n5880fdb1v50df6c4b34e8a039@mail.gmail.com> On 09/04/2008, Michael Franz wrote: > Hi, > > I followed the instructions in the Icedtea6 release announcement and get the > following error on Fedora 8 64 bit. > > /usr/bin/ld: cannot find -ljvm > collect2: ld returned 1 exit status > make[5]: *** > [/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/build/linux-amd64/corba/lib/amd64/libioser12.so] > Error 1 > make[5]: Leaving directory > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba/core' > make[4]: *** [build] Error 1 > make[4]: Leaving directory > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba' > make[3]: *** [build] Error 1 > make[3]: Leaving directory > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun' > make[2]: *** [build] Error 1 > make[2]: Leaving directory > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make' > make[1]: *** [corba-build] Error 2 > make[1]: Leaving directory > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/make' > make: *** [stamps/icedtea-ecj.stamp] Error 2 > > > This is on a clean install with updates and the yum command: > yum install /usr/bin/ecj mercurial cups-devel lesstif-devel libXp-devel > libXtst-devel libXi-devel xalan-j2 xerces-j2 \ > libXt-devel libgcj freetype-devel gcc gcc-c++ wget java-1.5.0-gcj-devel > firefox-devel glib2-devel gtk2-devel \ > > ant libXinerama-devel libjpeg-devel libpng-devel giflib-devel zlib-devel > > You will notice that alsa-lib-devel is missing since it will not install > correctly. > > Michael > Check bootstrap/jdk1.6.0/jre/lib has a symlink to a subdirectory of /usr/lib/jvm. It should be pointing to libjvm from gcj. -- Andrew :-) 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 langel at redhat.com Wed Apr 9 06:59:05 2008 From: langel at redhat.com (Lillian Angel) Date: Wed, 09 Apr 2008 13:59:05 +0000 Subject: changeset in /hg/icedtea6: 2008-04-09 Lillian Angel changeset adf994e62613 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=adf994e62613 description: 2008-04-09 Lillian Angel * patches/icedtea-libraries.patch: Updated LDLIBS for jpeg. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ patches/icedtea-libraries.patch | 2 +- diffs (23 lines): diff -r 4811f10b1d69 -r adf994e62613 ChangeLog --- a/ChangeLog Wed Apr 09 03:39:42 2008 -0400 +++ b/ChangeLog Wed Apr 09 09:54:24 2008 -0400 @@ -1,3 +1,7 @@ 2008-04-09 Gary Benson + + * patches/icedtea-libraries.patch: Updated LDLIBS for jpeg. + 2008-04-09 Gary Benson Xerxes R??nby diff -r 4811f10b1d69 -r adf994e62613 patches/icedtea-libraries.patch --- a/patches/icedtea-libraries.patch Wed Apr 09 03:39:42 2008 -0400 +++ b/patches/icedtea-libraries.patch Wed Apr 09 09:54:24 2008 -0400 @@ -4,7 +4,7 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk -+LDLIBS += -ljpeg -ldl ++LDLIBS += -ldl + # # Add to ambient vpath to get files in a subdirectory From gnu_andrew at member.fsf.org Wed Apr 9 12:43:21 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 9 Apr 2008 20:43:21 +0100 Subject: IcedTea6 on ia64 Message-ID: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> Hi all, We've just had the following build failure from a dgilmore on IRC. This from building the IcedTea6 release on ia64. http://ia64.koji.fedoraproject.org/koji/getfile?taskID=51511&name=build.log As it seems to be failing in the second stage of the bootstrap with the just-built zero-based HotSpot, I'm guessing that might be the issue. Thanks, -- Andrew :-) 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 Wed Apr 9 13:22:59 2008 From: doko at ubuntu.com (doko at ubuntu.com) Date: Wed, 09 Apr 2008 20:22:59 +0000 Subject: changeset in /hg/icedtea6: 2008-04-09 Dan Munckton changeset 5d2b5714c8c2 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5d2b5714c8c2 description: 2008-04-09 Dan Munckton * patches/icedtea-xinerama.patch: Make Java Full Screen Exclusive Mode work again with Xorg Server 1.3 and above (Java bug 6636469). diffstat: 4 files changed, 91 insertions(+) ChangeLog | 5 ++ Makefile.am | 1 Makefile.in | 1 patches/icedtea-xinerama.patch | 84 ++++++++++++++++++++++++++++++++++++++++ diffs (122 lines): diff -r adf994e62613 -r 5d2b5714c8c2 ChangeLog --- a/ChangeLog Wed Apr 09 09:54:24 2008 -0400 +++ b/ChangeLog Wed Apr 09 22:22:44 2008 +0200 @@ -1,3 +1,8 @@ 2008-04-09 Lillian Angel + + * patches/icedtea-xinerama.patch: Make Java Full Screen Exclusive Mode + work again with Xorg Server 1.3 and above (Java bug 6636469). + 2008-04-09 Lillian Angel * patches/icedtea-libraries.patch: Updated LDLIBS for jpeg. diff -r adf994e62613 -r 5d2b5714c8c2 Makefile.am --- a/Makefile.am Wed Apr 09 09:54:24 2008 -0400 +++ b/Makefile.am Wed Apr 09 22:22:44 2008 +0200 @@ -289,6 +289,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ + patches/icedtea-xinerama.patch \ patches/icedtea-arm-uname.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ diff -r adf994e62613 -r 5d2b5714c8c2 Makefile.in --- a/Makefile.in Wed Apr 09 09:54:24 2008 -0400 +++ b/Makefile.in Wed Apr 09 22:22:44 2008 +0200 @@ -392,6 +392,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ + patches/icedtea-xinerama.patch \ patches/icedtea-arm-uname.patch $(GCC_PATCH) \ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5) diff -r adf994e62613 -r 5d2b5714c8c2 patches/icedtea-xinerama.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-xinerama.patch Wed Apr 09 22:22:44 2008 +0200 @@ -0,0 +1,84 @@ +--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c +@@ -1626,6 +1626,8 @@ Java_sun_awt_X11GraphicsEnvironment_getX + + #define BIT_DEPTH_MULTI java_awt_DisplayMode_BIT_DEPTH_MULTI + ++typedef Status ++ (*XRRQueryVersionType) (Display *dpy, int *major_versionp, int *minor_versionp); + typedef XRRScreenConfiguration* + (*XRRGetScreenInfoType)(Display *dpy, Drawable root); + typedef void +@@ -1650,6 +1652,7 @@ typedef Status + short rate, + Time timestamp); + ++static XRRQueryVersionType awt_XRRQueryVersion; + static XRRGetScreenInfoType awt_XRRGetScreenInfo; + static XRRFreeScreenConfigInfoType awt_XRRFreeScreenConfigInfo; + static XRRConfigRatesType awt_XRRConfigRates; +@@ -1672,11 +1675,48 @@ static jboolean + static jboolean + X11GD_InitXrandrFuncs(JNIEnv *env) + { ++ int rr_maj_ver = 0, rr_min_ver = 0; ++ + void *pLibRandR = dlopen("libXrandr.so.2", RTLD_LAZY | RTLD_LOCAL); + if (pLibRandR == NULL) { + J2dRlsTraceLn(J2D_TRACE_ERROR, + "X11GD_InitXrandrFuncs: Could not open libXrandr.so.2"); + return JNI_FALSE; ++ } ++ ++ LOAD_XRANDR_FUNC(XRRQueryVersion); ++ ++ if (!(*awt_XRRQueryVersion)(awt_display, &rr_maj_ver, &rr_min_ver)) { ++ J2dRlsTraceLn(J2D_TRACE_ERROR, ++ "X11GD_InitXrandrFuncs: XRRQueryVersion returned an error status"); ++ dlclose(pLibRandR); ++ return JNI_FALSE; ++ } ++ ++ if (usingXinerama) { ++ /* ++ * We can proceed as long as this is RANDR 1.2 or above. ++ * As of Xorg server 1.3 onwards the Xinerama backend may actually be ++ * a fake one provided by RANDR itself. See Java bug 6636469 for info. ++ */ ++ if (!(rr_maj_ver > 1 || (rr_maj_ver == 1 && rr_min_ver >= 2))) { ++ J2dRlsTraceLn2(J2D_TRACE_INFO, "X11GD_InitXrandrFuncs: Can't use Xrandr. " ++ "Xinerama is active and Xrandr version is %d.%d", ++ rr_maj_ver, rr_min_ver); ++ dlclose(pLibRandR); ++ return JNI_FALSE; ++ } ++ ++ /* ++ * REMIND: Fullscreen mode doesn't work quite right with multi-monitor ++ * setups and RANDR 1.2. So for now we also require a single screen. ++ */ ++ if (awt_numScreens > 1 ) { ++ J2dRlsTraceLn(J2D_TRACE_INFO, "X11GD_InitXrandrFuncs: Can't use Xrandr. " ++ "Multiple screens in use"); ++ dlclose(pLibRandR); ++ return JNI_FALSE; ++ } + } + + LOAD_XRANDR_FUNC(XRRGetScreenInfo); +@@ -1814,15 +1854,6 @@ Java_sun_awt_X11GraphicsDevice_initXrand + int opcode = 0, firstEvent = 0, firstError = 0; + jboolean ret; + +- if (usingXinerama) { +- /* +- * REMIND: we'll just punt if Xinerama is enabled; we can remove this +- * restriction in the future if we find Xinerama and XRandR playing +- * well together... +- */ +- return JNI_FALSE; +- } +- + AWT_LOCK(); + ret = (jboolean)XQueryExtension(awt_display, "RANDR", + &opcode, &firstEvent, &firstError); From mvfranz at gmail.com Wed Apr 9 17:37:09 2008 From: mvfranz at gmail.com (Michael Franz) Date: Wed, 9 Apr 2008 20:37:09 -0400 Subject: IcedTea6 - Mercurial Fails on Fedora 8 64bit In-Reply-To: <17c6771e0804090348n5880fdb1v50df6c4b34e8a039@mail.gmail.com> References: <17c6771e0804090348n5880fdb1v50df6c4b34e8a039@mail.gmail.com> Message-ID: I haven't checked the /usr/lib/jvm yet, however I did try this same process on an x86 version of Fedora 8. It also fails with the same issue. Building from the tarball on x86 seems to work - it is still running. I have not tried the tarball on x86_64. On Wed, Apr 9, 2008 at 6:48 AM, Andrew John Hughes < gnu_andrew at member.fsf.org> wrote: > On 09/04/2008, Michael Franz wrote: > > Hi, > > > > I followed the instructions in the Icedtea6 release announcement and get > the > > following error on Fedora 8 64 bit. > > > > /usr/bin/ld: cannot find -ljvm > > collect2: ld returned 1 exit status > > make[5]: *** > > > [/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/build/linux-amd64/corba/lib/amd64/libioser12.so] > > Error 1 > > make[5]: Leaving directory > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba/core' > > make[4]: *** [build] Error 1 > > make[4]: Leaving directory > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba' > > make[3]: *** [build] Error 1 > > make[3]: Leaving directory > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun' > > make[2]: *** [build] Error 1 > > make[2]: Leaving directory > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make' > > make[1]: *** [corba-build] Error 2 > > make[1]: Leaving directory > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/make' > > make: *** [stamps/icedtea-ecj.stamp] Error 2 > > > > > > This is on a clean install with updates and the yum command: > > yum install /usr/bin/ecj mercurial cups-devel lesstif-devel libXp-devel > > libXtst-devel libXi-devel xalan-j2 xerces-j2 \ > > libXt-devel libgcj freetype-devel gcc gcc-c++ wget java-1.5.0-gcj-devel > > firefox-devel glib2-devel gtk2-devel \ > > > > ant libXinerama-devel libjpeg-devel libpng-devel giflib-devel zlib-devel > > > > You will notice that alsa-lib-devel is missing since it will not install > > correctly. > > > > Michael > > > > Check bootstrap/jdk1.6.0/jre/lib has a symlink to a subdirectory of > /usr/lib/jvm. It should be pointing to libjvm from gcj. > -- > Andrew :-) > > 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 > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080409/1d35e405/attachment.html From mvfranz at gmail.com Wed Apr 9 19:01:07 2008 From: mvfranz at gmail.com (Michael Franz) Date: Wed, 9 Apr 2008 22:01:07 -0400 Subject: IcedTea6 - Mercurial Fails on Fedora 8 64bit In-Reply-To: References: <17c6771e0804090348n5880fdb1v50df6c4b34e8a039@mail.gmail.com> Message-ID: Scratch that. It seems I cannot build either on my installations. I will have to spend more time figuring out why. On Wed, Apr 9, 2008 at 8:37 PM, Michael Franz wrote: > I haven't checked the /usr/lib/jvm yet, however I did try this same > process on an x86 version of Fedora 8. It also fails with the same issue. > > Building from the tarball on x86 seems to work - it is still running. I > have not tried the tarball on x86_64. > > > > > On Wed, Apr 9, 2008 at 6:48 AM, Andrew John Hughes < > gnu_andrew at member.fsf.org> wrote: > > > On 09/04/2008, Michael Franz wrote: > > > Hi, > > > > > > I followed the instructions in the Icedtea6 release announcement and > > get the > > > following error on Fedora 8 64 bit. > > > > > > /usr/bin/ld: cannot find -ljvm > > > collect2: ld returned 1 exit status > > > make[5]: *** > > > > > [/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/build/linux-amd64/corba/lib/amd64/libioser12.so] > > > Error 1 > > > make[5]: Leaving directory > > > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba/core' > > > make[4]: *** [build] Error 1 > > > make[4]: Leaving directory > > > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun/corba' > > > make[3]: *** [build] Error 1 > > > make[3]: Leaving directory > > > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make/sun' > > > make[2]: *** [build] Error 1 > > > make[2]: Leaving directory > > > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/corba/make' > > > make[1]: *** [corba-build] Error 2 > > > make[1]: Leaving directory > > > > > `/home/mfranz/development/icedtea6-1.1-unpatched/openjdk-ecj/control/make' > > > make: *** [stamps/icedtea-ecj.stamp] Error 2 > > > > > > > > > This is on a clean install with updates and the yum command: > > > yum install /usr/bin/ecj mercurial cups-devel lesstif-devel > > libXp-devel > > > libXtst-devel libXi-devel xalan-j2 xerces-j2 \ > > > libXt-devel libgcj freetype-devel gcc gcc-c++ wget > > java-1.5.0-gcj-devel > > > firefox-devel glib2-devel gtk2-devel \ > > > > > > ant libXinerama-devel libjpeg-devel libpng-devel giflib-devel > > zlib-devel > > > > > > You will notice that alsa-lib-devel is missing since it will not > > install > > > correctly. > > > > > > Michael > > > > > > > Check bootstrap/jdk1.6.0/jre/lib has a symlink to a subdirectory of > > /usr/lib/jvm. It should be pointing to libjvm from gcj. > > -- > > Andrew :-) > > > > 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 > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080409/34f2091f/attachment.html From gbenson at redhat.com Thu Apr 10 01:05:59 2008 From: gbenson at redhat.com (Gary Benson) Date: Thu, 10 Apr 2008 09:05:59 +0100 Subject: IcedTea6 on ia64 In-Reply-To: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> References: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> Message-ID: <20080410080559.GA3770@redhat.com> Andrew John Hughes wrote: > We've just had the following build failure from a dgilmore on IRC. > This from building the IcedTea6 release on ia64. > > http://ia64.koji.fedoraproject.org/koji/getfile?taskID=51511&name=build.log > > As it seems to be failing in the second stage of the bootstrap with > the just-built zero-based HotSpot, I'm guessing that might be the > issue. Hmmm, doko had the same failure on Ubuntu a few days ago. It looks like it ran and and compiled a ton of stuff already, so it's actually quite promising, but that's me being all glass-half-full ;) Since it's in floating point code I'm suspicious it might be the bug that http://icedtea.classpath.org/hg/icedtea6/file/tip/patches/icedtea-ia64-bugfix.patch removes the fix for. I'll ask on one of the HotSpot lists. Cheers, Gary -- http://gbenson.net/ From aph at redhat.com Thu Apr 10 01:23:44 2008 From: aph at redhat.com (Andrew Haley) Date: Thu, 10 Apr 2008 09:23:44 +0100 Subject: IcedTea6 on ia64 In-Reply-To: <20080410080559.GA3770@redhat.com> References: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> <20080410080559.GA3770@redhat.com> Message-ID: <47FDCE90.7010903@redhat.com> Gary Benson wrote: > Andrew John Hughes wrote: >> We've just had the following build failure from a dgilmore on IRC. >> This from building the IcedTea6 release on ia64. >> >> http://ia64.koji.fedoraproject.org/koji/getfile?taskID=51511&name=build.log >> >> As it seems to be failing in the second stage of the bootstrap with >> the just-built zero-based HotSpot, I'm guessing that might be the >> issue. > > Hmmm, doko had the same failure on Ubuntu a few days ago. It looks > like it ran and and compiled a ton of stuff already, so it's actually > quite promising, but that's me being all glass-half-full ;) > > Since it's in floating point code I'm suspicious it might be the bug > that http://icedtea.classpath.org/hg/icedtea6/file/tip/patches/icedtea-ia64-bugfix.patch > removes the fix for. I'll ask on one of the HotSpot lists. Please let us know what you discover; I'd be interested to know what the IA-64 gcc bug was. Andrew. From gbenson at redhat.com Thu Apr 10 02:33:13 2008 From: gbenson at redhat.com (Gary Benson) Date: Thu, 10 Apr 2008 09:33:13 +0000 Subject: changeset in /hg/icedtea6: 2008-04-10 Gary Benson changeset a6ab5c3d9b22 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a6ab5c3d9b22 description: 2008-04-10 Gary Benson * ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp: Renamed as... * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: New file. Renamed JavaStack as ZeroStack, JavaFrame as ZeroFrame, and JavaStackPrinter as ZeroStackPrinter. * patches/icedtea-zero.patch: Likewise. * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Likewise. * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp: Likewise. * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise. * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp: Likewise. * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise. * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise. * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise. * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp: Likewise. * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise. * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp: Likewise. * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Likewise. * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp: Likewise. diffstat: 16 files changed, 240 insertions(+), 219 deletions(-) ChangeLog | 21 + patches/icedtea-zero.patch | 2 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 2 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 2 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 24 - ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 8 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 2 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 2 ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 8 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 2 ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp | 159 ---------- ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 20 - ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 159 ++++++++++ ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 14 ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 2 ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 32 +- diffs (truncated from 784 to 500 lines): diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ChangeLog --- a/ChangeLog Wed Apr 09 22:22:44 2008 +0200 +++ b/ChangeLog Thu Apr 10 05:33:07 2008 -0400 @@ -1,3 +1,24 @@ 2008-04-09 Dan Munckton + + * ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp: Renamed as... + * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: New file. + Renamed JavaStack as ZeroStack, JavaFrame as ZeroFrame, and + JavaStackPrinter as ZeroStackPrinter. + * patches/icedtea-zero.patch: Likewise. + * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp: Likewise. + * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Likewise. + * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp: + Likewise. + 2008-04-09 Dan Munckton * patches/icedtea-xinerama.patch: Make Java Full Screen Exclusive Mode diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 patches/icedtea-zero.patch --- a/patches/icedtea-zero.patch Wed Apr 09 22:22:44 2008 +0200 +++ b/patches/icedtea-zero.patch Thu Apr 10 05:33:07 2008 -0400 @@ -120,7 +120,7 @@ diff -ru openjdk/hotspot/src/share/vm/ut JavaThread* jt = (JavaThread*)_thread; +#ifdef ZERO + st->print_cr("Java stack:"); -+ JavaStackPrinter(st, buf, sizeof(buf)).print(jt); ++ ZeroStackPrinter(st, buf, sizeof(buf)).print(jt); +#else if (jt->has_last_Java_frame()) { st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)"); diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Thu Apr 10 05:33:07 2008 -0400 @@ -67,4 +67,4 @@ address ShouldNotReachHereStub(); // Nothing to do with the assembler (or lack of), // just a real convenient place to include these. #include -#include +#include diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Thu Apr 10 05:33:07 2008 -0400 @@ -99,7 +99,7 @@ #define SET_LAST_JAVA_FRAME() #define RESET_LAST_JAVA_FRAME() -// JavaStack Implementation +// ZeroStack Implementation #undef STACK_INT #undef STACK_FLOAT diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Apr 10 05:33:07 2008 -0400 @@ -40,7 +40,7 @@ void CppInterpreter::normal_entry(method void CppInterpreter::normal_entry(methodOop method, TRAPS) { JavaThread *thread = (JavaThread *) THREAD; - JavaStack *stack = thread->java_stack(); + ZeroStack *stack = thread->zero_stack(); // Adjust the caller's stack frame to accomodate any additional // local variables we have contiguously with our parameters. @@ -55,7 +55,7 @@ void CppInterpreter::normal_entry(method // Allocate and initialize our frame. InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread); - thread->push_Java_frame(frame); + thread->push_zero_frame(frame); interpreterState istate = frame->interpreter_state(); intptr_t *result = NULL; @@ -137,7 +137,7 @@ void CppInterpreter::normal_entry(method } // Unwind the current frame - thread->pop_Java_frame(); + thread->pop_zero_frame(); // Pop our local variables stack->set_sp(stack->sp() + method->max_locals()); @@ -150,11 +150,11 @@ void CppInterpreter::native_entry(method void CppInterpreter::native_entry(methodOop method, TRAPS) { JavaThread *thread = (JavaThread *) THREAD; - JavaStack *stack = thread->java_stack(); + ZeroStack *stack = thread->zero_stack(); // Allocate and initialize our frame InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread); - thread->push_Java_frame(frame); + thread->push_zero_frame(frame); interpreterState istate = frame->interpreter_state(); intptr_t *locals = istate->locals(); @@ -176,7 +176,7 @@ void CppInterpreter::native_entry(method else { CALL_VM_NOCHECK(InterpreterRuntime::monitorenter(thread, monitor)); if (HAS_PENDING_EXCEPTION) { - thread->pop_Java_frame(); + thread->pop_zero_frame(); return; } } @@ -188,7 +188,7 @@ void CppInterpreter::native_entry(method if (handlerAddr == NULL) { CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method)); if (HAS_PENDING_EXCEPTION) { - thread->pop_Java_frame(); + thread->pop_zero_frame(); return; } handlerAddr = method->signature_handler(); @@ -198,7 +198,7 @@ void CppInterpreter::native_entry(method CALL_VM_NOCHECK(handlerAddr = InterpreterRuntime::slow_signature_handler(thread, method, NULL, NULL)); if (HAS_PENDING_EXCEPTION) { - thread->pop_Java_frame(); + thread->pop_zero_frame(); return; } } @@ -304,7 +304,7 @@ void CppInterpreter::native_entry(method } // Unwind the current activation - thread->pop_Java_frame(); + thread->pop_zero_frame(); // Pop our parameters stack->set_sp(stack->sp() + method->size_of_parameters()); @@ -378,7 +378,7 @@ void CppInterpreter::accessor_entry(meth void CppInterpreter::accessor_entry(methodOop method, TRAPS) { JavaThread *thread = (JavaThread *) THREAD; - JavaStack *stack = thread->java_stack(); + ZeroStack *stack = thread->zero_stack(); intptr_t *locals = stack->sp(); // Drop into the slow path if we need a safepoint check @@ -509,7 +509,7 @@ void CppInterpreter::empty_entry(methodO void CppInterpreter::empty_entry(methodOop method, TRAPS) { JavaThread *thread = (JavaThread *) THREAD; - JavaStack *stack = thread->java_stack(); + ZeroStack *stack = thread->zero_stack(); // Drop into the slow path if we need a safepoint check if (SafepointSynchronize::do_call_back()) { @@ -521,7 +521,7 @@ void CppInterpreter::empty_entry(methodO stack->set_sp(stack->sp() + method->size_of_parameters()); } -InterpreterFrame *InterpreterFrame::build(JavaStack* stack, +InterpreterFrame *InterpreterFrame::build(ZeroStack* stack, const methodOop method, JavaThread* thread) { diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp Thu Apr 10 05:33:07 2008 -0400 @@ -34,11 +34,11 @@ // +--------------------+ ------------------ // | ... | -class EntryFrame : public JavaFrame { - friend class JavaStackPrinter; +class EntryFrame : public ZeroFrame { + friend class ZeroStackPrinter; private: - EntryFrame() : JavaFrame() + EntryFrame() : ZeroFrame() { ShouldNotCallThis(); } @@ -50,7 +50,7 @@ class EntryFrame : public JavaFrame { }; public: - static EntryFrame *build(JavaStack* stack, + static EntryFrame *build(ZeroStack* stack, const intptr_t* parameters, int parameter_words, JavaCallWrapper* call_wrapper); diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp --- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Thu Apr 10 05:33:07 2008 -0400 @@ -35,7 +35,7 @@ void RegisterMap::check_location_valid() bool frame::is_interpreted_frame() const { - return ((JavaFrame *) sp())->is_interpreter_frame(); + return ((ZeroFrame *) sp())->is_interpreter_frame(); } frame frame::sender_for_entry_frame(RegisterMap *map) const diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp --- a/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Thu Apr 10 05:33:07 2008 -0400 @@ -48,7 +48,7 @@ inline frame::frame(intptr_t* sp) inline intptr_t* frame::sender_sp() const { - return (intptr_t *) ((JavaFrame *) sp())->next(); + return (intptr_t *) ((ZeroFrame *) sp())->next(); } inline intptr_t* frame::link() const diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp Thu Apr 10 05:33:07 2008 -0400 @@ -38,11 +38,11 @@ // +--------------------+ ------------------ // | ... | -class InterpreterFrame : public JavaFrame { - friend class JavaStackPrinter; +class InterpreterFrame : public ZeroFrame { + friend class ZeroStackPrinter; private: - InterpreterFrame() : JavaFrame() + InterpreterFrame() : ZeroFrame() { ShouldNotCallThis(); } @@ -56,7 +56,7 @@ class InterpreterFrame : public JavaFram }; public: - static InterpreterFrame *build(JavaStack* stack, + static InterpreterFrame *build(ZeroStack* stack, const methodOop method, JavaThread* thread); public: diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp --- a/ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Thu Apr 10 05:33:07 2008 -0400 @@ -142,7 +142,7 @@ IRT_ENTRY(address, methodOop method, intptr_t* unused1, intptr_t* unused2)) - JavaStack *stack = thread->java_stack(); + ZeroStack *stack = thread->zero_stack(); int required_words = (align_size_up(sizeof(ffi_cif), wordSize) >> LogBytesPerWord) + diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp Wed Apr 09 22:22:44 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,159 +0,0 @@ -/* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008 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 - * 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. - * - * 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. - * - */ - -class JavaStack { - private: - intptr_t *_base; // the last available word - intptr_t *_top; // the word past the end of the stack - intptr_t *_sp; // the top word on the stack - - public: - JavaStack() - : _base(NULL), _top(NULL), _sp(NULL) {} - - bool needs_setup() const - { - return _base == NULL; - } - - void setup(void *mem, size_t size) - { - assert(needs_setup(), "already set up"); - assert(!(size & WordAlignmentMask), "unaligned"); - - _base = (intptr_t *) mem; - _top = _base + (size >> LogBytesPerWord); - _sp = _top; - } - - void teardown() - { - assert(!needs_setup(), "not set up"); - assert(_sp == _top, "stuff on stack at teardown"); - - _base = NULL; - _top = NULL; - _sp = NULL; - } - - intptr_t *sp() const - { - return _sp; - } - - void set_sp(intptr_t *new_sp) - { - assert(_top >= new_sp && new_sp >= _base, "bad stack pointer"); - _sp = new_sp; - } - - int available_words() const - { - return _sp - _base; - } - - void push(intptr_t value) - { - assert(_sp > _base, "stack overflow"); - *(--_sp) = value; - } - - intptr_t pop() - { - assert(_sp < _top, "stack underflow"); - return *(_sp++); - } - - void *alloc(size_t size) - { - int count = align_size_up(size, wordSize) >> LogBytesPerWord; - assert(count <= available_words(), "stack overflow"); - return _sp -= count; - } -}; - -// -// | ... | -// +--------------------+ ------------------ -// | ... | low addresses -// | frame_type | -// | next_frame | high addresses -// +--------------------+ ------------------ -// | ... | - -class JavaFrame { - friend class JavaStackPrinter; - - protected: - JavaFrame() - { - ShouldNotCallThis(); - } - - enum Layout { - next_frame_off, - frame_type_off, - jf_header_words - }; - - enum FrameType { - ENTRY_FRAME = 1, - INTERPRETER_FRAME - }; - - protected: - intptr_t *addr_of_word(int offset) const - { - return (intptr_t *) this - offset; - } - - intptr_t value_of_word(int offset) const - { - return *addr_of_word(offset); - } - - public: - JavaFrame *next() const - { - return (JavaFrame *) value_of_word(next_frame_off); - } - - protected: - FrameType type() const - { - return (FrameType) value_of_word(frame_type_off); - } - - public: - bool is_entry_frame() const - { - return type() == ENTRY_FRAME; - } - - bool is_interpreter_frame() const - { - return type() == INTERPRETER_FRAME; - } -}; diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Wed Apr 09 22:22:44 2008 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Thu Apr 10 05:33:07 2008 -0400 @@ -23,20 +23,20 @@ * */ -class JavaStackPrinter { +class ZeroStackPrinter { private: outputStream* _st; char* _buf; int _buflen; public: - JavaStackPrinter(outputStream *st, char *buf, int buflen) + ZeroStackPrinter(outputStream *st, char *buf, int buflen) : _st(st), _buf(buf), _buflen(buflen) {} void print(JavaThread *thread) { - intptr_t *lo_addr = thread->java_stack()->sp(); - intptr_t *hi_addr = (intptr_t *) thread->top_Java_frame(); + intptr_t *lo_addr = thread->zero_stack()->sp(); + intptr_t *hi_addr = (intptr_t *) thread->top_zero_frame(); assert(lo_addr, "stack not set up?"); assert(hi_addr, "no frames pushed?"); @@ -46,7 +46,7 @@ class JavaStackPrinter { while (hi_addr) { if (!top_frame) _st->cr(); - JavaFrame *frame = (JavaFrame *) hi_addr; + ZeroFrame *frame = (ZeroFrame *) hi_addr; for (intptr_t *addr = lo_addr; addr <= hi_addr; addr++) print_word(frame, addr, top_frame); lo_addr = hi_addr + 1; @@ -56,23 +56,23 @@ class JavaStackPrinter { } private: - void print_word(JavaFrame *frame, intptr_t *addr, bool top_frame) + void print_word(ZeroFrame *frame, intptr_t *addr, bool top_frame) { const char *field = NULL; const char *value = NULL; int word = (intptr_t *) frame - addr; switch (word) { - case JavaFrame::next_frame_off: + case ZeroFrame::next_frame_off: field = "next_frame"; break; - case JavaFrame::frame_type_off: + case ZeroFrame::frame_type_off: field = "frame_type"; switch (*addr) { - case JavaFrame::ENTRY_FRAME: + case ZeroFrame::ENTRY_FRAME: value = "ENTRY_FRAME"; break; - case JavaFrame::INTERPRETER_FRAME: + case ZeroFrame::INTERPRETER_FRAME: value = "INTERPRETER_FRAME"; break; } diff -r 5d2b5714c8c2 -r a6ab5c3d9b22 ports/hotspot/src/cpu/zero/vm/stack_zero.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ports/hotspot/src/cpu/zero/vm/stack_zero.hpp Thu Apr 10 05:33:07 2008 -0400 @@ -0,0 +1,159 @@ +/* + * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2008 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * From gbenson at redhat.com Thu Apr 10 02:39:59 2008 From: gbenson at redhat.com (Gary Benson) Date: Thu, 10 Apr 2008 09:39:59 +0000 Subject: changeset in /hg/icedtea6: 2008-04-10 Gary Benson changeset ec481ef8f3d8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ec481ef8f3d8 description: 2008-04-10 Gary Benson * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp (ZeroStackPrinter::print): Fail gracefully when not set up. diffstat: 2 files changed, 14 insertions(+), 3 deletions(-) ChangeLog | 5 +++++ ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 12 +++++++++--- diffs (35 lines): diff -r a6ab5c3d9b22 -r ec481ef8f3d8 ChangeLog --- a/ChangeLog Thu Apr 10 05:33:07 2008 -0400 +++ b/ChangeLog Thu Apr 10 05:39:54 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-10 Gary Benson + + * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp + (ZeroStackPrinter::print): Fail gracefully when not set up. + 2008-04-10 Gary Benson * ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp: Renamed as... diff -r a6ab5c3d9b22 -r ec481ef8f3d8 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp --- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Thu Apr 10 05:33:07 2008 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp Thu Apr 10 05:39:54 2008 -0400 @@ -36,10 +36,16 @@ class ZeroStackPrinter { void print(JavaThread *thread) { intptr_t *lo_addr = thread->zero_stack()->sp(); + if (!lo_addr) { + _st->print(" stack not set up"); + return; + } + intptr_t *hi_addr = (intptr_t *) thread->top_zero_frame(); - - assert(lo_addr, "stack not set up?"); - assert(hi_addr, "no frames pushed?"); + if (!hi_addr) { + _st->print("no frames pushed"); + return; + } assert(hi_addr >= lo_addr, "corrupted stack"); bool top_frame = true; From gbenson at redhat.com Thu Apr 10 06:36:13 2008 From: gbenson at redhat.com (Gary Benson) Date: Thu, 10 Apr 2008 14:36:13 +0100 Subject: IcedTea6 on ia64 In-Reply-To: <20080410080559.GA3770@redhat.com> References: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> <20080410080559.GA3770@redhat.com> Message-ID: <20080410133613.GE3770@redhat.com> Gary Benson wrote: > Andrew John Hughes wrote: > > We've just had the following build failure from a dgilmore on IRC. > > This from building the IcedTea6 release on ia64. > > > > http://ia64.koji.fedoraproject.org/koji/getfile?taskID=51511&name=build.log > > > > As it seems to be failing in the second stage of the bootstrap with > > the just-built zero-based HotSpot, I'm guessing that might be the > > issue. > > Hmmm, doko had the same failure on Ubuntu a few days ago. It looks > like it ran and and compiled a ton of stuff already, so it's actually > quite promising, but that's me being all glass-half-full ;) > > Since it's in floating point code I'm suspicious it might be the bug > that icedtea-ia64-bugfix.patch removes the fix for. I'll ask on one > of the HotSpot lists. Ok, could someone try a build with this icedtea-ia64-bugfix.patch instead of the one that's in the tree? Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r 114e54fc994e openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp --- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:33:18 2008 +0100 +++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:34:11 2008 +0100 @@ -382,6 +382,13 @@ CALL_VM_NOCHECK(func); \ if (THREAD->has_pending_exception()) goto label; \ } + +/* + * IA-64 workaround + */ +#ifdef IA64 +double ia64_double_zero = 0.0; +#endif /* * BytecodeInterpreter::run(interpreterState istate) From dennis at ausil.us Thu Apr 10 08:33:39 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Thu, 10 Apr 2008 10:33:39 -0500 Subject: IcedTea6 on ia64 In-Reply-To: <20080410133613.GE3770@redhat.com> References: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> <20080410080559.GA3770@redhat.com> <20080410133613.GE3770@redhat.com> Message-ID: <200804101033.41310.dennis@ausil.us> On Thursday 10 April 2008, Gary Benson wrote: > Gary Benson wrote: > > Andrew John Hughes wrote: > > > We've just had the following build failure from a dgilmore on IRC. > > > This from building the IcedTea6 release on ia64. > > > > > > http://ia64.koji.fedoraproject.org/koji/getfile?taskID=51511&name=build > > >.log > > > > > > As it seems to be failing in the second stage of the bootstrap with > > > the just-built zero-based HotSpot, I'm guessing that might be the > > > issue. > > > > Hmmm, doko had the same failure on Ubuntu a few days ago. It looks > > like it ran and and compiled a ton of stuff already, so it's actually > > quite promising, but that's me being all glass-half-full ;) > > > > Since it's in floating point code I'm suspicious it might be the bug > > that icedtea-ia64-bugfix.patch removes the fix for. I'll ask on one > > of the HotSpot lists. > > Ok, could someone try a build with this icedtea-ia64-bugfix.patch > instead of the one that's in the tree? > > Cheers, > Gary Ill get one kicked off now Dennis From dennis at ausil.us Thu Apr 10 12:51:16 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Thu, 10 Apr 2008 14:51:16 -0500 Subject: IcedTea6 on ia64 In-Reply-To: <20080410133613.GE3770@redhat.com> References: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> <20080410080559.GA3770@redhat.com> <20080410133613.GE3770@redhat.com> Message-ID: <200804101451.16942.dennis@ausil.us> On Thursday 10 April 2008, Gary Benson wrote: > Gary Benson wrote: > > Andrew John Hughes wrote: > > > We've just had the following build failure from a dgilmore on IRC. > > > This from building the IcedTea6 release on ia64. > > > > > > http://ia64.koji.fedoraproject.org/koji/getfile?taskID=51511&name=build > > >.log > > > > > > As it seems to be failing in the second stage of the bootstrap with > > > the just-built zero-based HotSpot, I'm guessing that might be the > > > issue. > > > > Hmmm, doko had the same failure on Ubuntu a few days ago. It looks > > like it ran and and compiled a ton of stuff already, so it's actually > > quite promising, but that's me being all glass-half-full ;) > > > > Since it's in floating point code I'm suspicious it might be the bug > > that icedtea-ia64-bugfix.patch removes the fix for. I'll ask on one > > of the HotSpot lists. > > Ok, could someone try a build with this icedtea-ia64-bugfix.patch > instead of the one that's in the tree? > > Cheers, > Gary http://ia64.koji.fedoraproject.org/koji/getfile?taskID=54044&name=build.log fails with Linking vm... bytecodeInterpreterWithChecks.o:/builddir/build/BUILD/icedtea6-1.1/openjdk-ecj/hotspot/src/cpu/zero/vm/bytes_zero.hpp:64: multiple definition of `ia64_double_zero' bytecodeInterpreter.o:/builddir/build/BUILD/icedtea6-1.1/openjdk-ecj/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp:2708: first defined here collect2: ld returned 1 exit status Dennis From gbenson at redhat.com Fri Apr 11 00:12:33 2008 From: gbenson at redhat.com (Gary Benson) Date: Fri, 11 Apr 2008 08:12:33 +0100 Subject: IcedTea6 on ia64 In-Reply-To: <200804101451.16942.dennis@ausil.us> References: <17c6771e0804091243j18578de7tf3a3fd0b48c9b8f2@mail.gmail.com> <20080410080559.GA3770@redhat.com> <20080410133613.GE3770@redhat.com> <200804101451.16942.dennis@ausil.us> Message-ID: <20080411071232.GA3613@redhat.com> Dennis Gilmore wrote: > On Thursday 10 April 2008, Gary Benson wrote: > > Ok, could someone try a build with this icedtea-ia64-bugfix.patch > > instead of the one that's in the tree? > > http://ia64.koji.fedoraproject.org/koji/getfile?taskID=54044&name=build.log > > fails with > Linking vm... > bytecodeInterpreterWithChecks.o:/builddir/build/BUILD/icedtea6-1.1/openjdk-ecj/hotspot/src/cpu/zero/vm/bytes_zero.hpp:64: > multiple definition of `ia64_double_zero' > bytecodeInterpreter.o:/builddir/build/BUILD/icedtea6-1.1/openjdk-ecj/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp:2708: > first defined here > collect2: ld returned 1 exit status Trust me to put it in the one file in the build that's compiled twice. Try this instead... Cheers, Gary -- http://gbenson.net/ -------------- next part -------------- diff -r 114e54fc994e openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp --- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:33:18 2008 +0100 +++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:34:11 2008 +0100 @@ -382,6 +382,13 @@ CALL_VM_NOCHECK(func); \ if (THREAD->has_pending_exception()) goto label; \ } + +/* + * IA64 workaround + */ +#if defined(IA64) && !defined(VM_JVMTI) +double ia64_double_zero = 0.0; +#endif /* * BytecodeInterpreter::run(interpreterState istate) From langel at redhat.com Fri Apr 11 11:44:36 2008 From: langel at redhat.com (Lillian Angel) Date: Fri, 11 Apr 2008 18:44:36 +0000 Subject: changeset in /hg/icedtea6: 2008-04-11 Lillian Angel changeset 83871b8a8d18 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=83871b8a8d18 description: 2008-04-11 Lillian Angel * AUTHORS: Updated. diffstat: 2 files changed, 5 insertions(+) AUTHORS | 1 + ChangeLog | 4 ++++ diffs (24 lines): diff -r ec481ef8f3d8 -r 83871b8a8d18 AUTHORS --- a/AUTHORS Thu Apr 10 05:39:54 2008 -0400 +++ b/AUTHORS Fri Apr 11 14:39:16 2008 -0400 @@ -11,6 +11,7 @@ Matthias Klose Matthias Klose Francis Kung Casey Marshall +Dan Munckton Raif Naffah Bernhard Rosenkr??nzer Keith Seitz diff -r ec481ef8f3d8 -r 83871b8a8d18 ChangeLog --- a/ChangeLog Thu Apr 10 05:39:54 2008 -0400 +++ b/ChangeLog Fri Apr 11 14:39:16 2008 -0400 @@ -1,3 +1,7 @@ 2008-04-10 Gary Benson + + * AUTHORS: Updated. + 2008-04-10 Gary Benson * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp diff -r ec481ef8f3d8 -r 83871b8a8d18 generated/sun/awt/X11/generator/sizer.32 Binary file generated/sun/awt/X11/generator/sizer.32 has changed From bugzilla-daemon at icedtea.classpath.org Fri Apr 11 22:18:05 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 12 Apr 2008 05:18:05 +0000 Subject: [Bug 135] New: OpenJDK segfaults when running a java project of mine Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=135 Summary: OpenJDK segfaults when running a java project of mine Product: IcedTea Version: unspecified Platform: Macintosh OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: konrad at tylerc.org # An unexpected error has been detected by Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:144), pid=3138, tid=1209078960 # Error: caught unhandled signal 11 The error report log will be attached attached. -- 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 Apr 11 22:19:21 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 12 Apr 2008 05:19:21 +0000 Subject: [Bug 135] OpenJDK segfaults when running a java project of mine Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=135 ------- Comment #1 from konrad at tylerc.org 2008-04-12 05:19 ------- Created an attachment (id=68) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=68&action=view) Log of error. -- 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 Apr 12 02:03:50 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 12 Apr 2008 09:03:50 +0000 Subject: [Bug 135] OpenJDK segfaults when running a java project of mine Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=135 twisti at complang.tuwien.ac.at changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |twisti at complang.tuwien.ac.at ------- Comment #2 from twisti at complang.tuwien.ac.at 2008-04-12 09:03 ------- Is this project freely available? Or could you attach a testcase? -- 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 Apr 12 02:17:26 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 12 Apr 2008 09:17:26 +0000 Subject: [Bug 135] OpenJDK segfaults when running a java project of mine Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=135 ------- Comment #3 from konrad at tylerc.org 2008-04-12 09:17 ------- Mine isn't, but it embeds JRuby (http://jruby.codehaus.org/) and the segfault happens sometime during initializing jruby. If you download, compile, and attempt to run jirb or jruby on OpenJDK on PPC, you'll get the same message. -- 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 Apr 12 02:19:34 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 12 Apr 2008 09:19:34 +0000 Subject: [Bug 135] OpenJDK segfaults when running a java project of mine Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=135 ------- Comment #4 from konrad at tylerc.org 2008-04-12 09:19 ------- Additionally: running JRuby on OpenJDK on x86 hardware does not produce this segfault. -- 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 mvfranz at gmail.com Sat Apr 12 14:50:29 2008 From: mvfranz at gmail.com (Michael Franz) Date: Sat, 12 Apr 2008 17:50:29 -0400 Subject: FreeType freetypecheck and Multiple Header Variables Message-ID: Hi, I have been trying to figure out how to get the freetypecheck to build during the icedtea6/openjdk build have found that there seems to be two different sets of variables set to indicate where the freetype library is. ALT_FREETYPE_HEADERS_PATH | DEVTOOLS_FT_DIR -> FREETYPE_HEADERS_PATH -> FT_HEADERS and FREETYPE2_CFLAGS -> FREETYPE2_HEADERS -> FREETYPE_HEADERS Why are there two 'sets' of freetype header variables? Michael -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080412/02a8404f/attachment.html From mark at klomp.org Sat Apr 12 15:47:44 2008 From: mark at klomp.org (Mark Wielaard) Date: Sat, 12 Apr 2008 22:47:44 +0000 Subject: changeset in /hg/icedtea6: Update to b09. Message-ID: changeset afb4ea482b75 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=afb4ea482b75 description: Update to b09. 2008-04-12 Mark Wielaard * Makefile.am: Updated to OpenJDK b09 release. * Makefile.in: Regenerated. diffstat: 3 files changed, 14 insertions(+), 9 deletions(-) ChangeLog | 5 +++++ Makefile.am | 6 +++--- Makefile.in | 12 ++++++------ diffs (54 lines): diff -r 83871b8a8d18 -r afb4ea482b75 ChangeLog --- a/ChangeLog Fri Apr 11 14:39:16 2008 -0400 +++ b/ChangeLog Sun Apr 13 00:46:37 2008 +0200 @@ -1,3 +1,8 @@ 2008-04-11 Lillian Angel + + * Makefile.am: Updated to OpenJDK b09 release. + * Makefile.in: Regenerated. + 2008-04-11 Lillian Angel * AUTHORS: Updated. diff -r 83871b8a8d18 -r afb4ea482b75 Makefile.am --- a/Makefile.am Fri Apr 11 14:39:16 2008 -0400 +++ b/Makefile.am Sun Apr 13 00:46:37 2008 +0200 @@ -1,6 +1,6 @@ OPENJDK_DATE = 26_mar_2008 -OPENJDK_DATE = 26_mar_2008 -OPENJDK_MD5SUM = 18f325ec51da83783c48b1fcb72c053c -OPENJDK_VERSION = b08 +OPENJDK_DATE = 11_apr_2008 +OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c +OPENJDK_VERSION = b09 if NETX_PLUGIN NETX_PATCH = patches/icedtea-netx-plugin.patch diff -r 83871b8a8d18 -r afb4ea482b75 Makefile.in --- a/Makefile.in Fri Apr 11 14:39:16 2008 -0400 +++ b/Makefile.in Sun Apr 13 00:46:37 2008 +0200 @@ -237,9 +237,9 @@ target_alias = @target_alias@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -OPENJDK_DATE = 26_mar_2008 -OPENJDK_MD5SUM = 18f325ec51da83783c48b1fcb72c053c -OPENJDK_VERSION = b08 +OPENJDK_DATE = 11_apr_2008 +OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c +OPENJDK_VERSION = b09 @NETX_PLUGIN_FALSE at NETX_PATCH = @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ @@ -392,9 +392,9 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ - patches/icedtea-xinerama.patch \ - patches/icedtea-arm-uname.patch $(GCC_PATCH) \ - $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5) + patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \ + $(GCC_PATCH) $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) \ + $(am__append_5) # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch From mark at klomp.org Sat Apr 12 15:47:52 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 13 Apr 2008 00:47:52 +0200 Subject: Upgrading icedtea6 to b09 Message-ID: <1208040472.16022.14.camel@localhost.localdomain> Hi, OpenJDK b09 is almost identical to b08, there are only 27 files changed. Most of which are the timezone resources (18 files). The only file (awt_GraphicsEnv.c) changed for which we have a patch (in icedtea-xinerama.patch) doesn't conflict. So the change is really simple: 2008-04-12 Mark Wielaard * Makefile.am: Updated to OpenJDK b09 release. * Makefile.in: Regenerated. Build on fedora 8 x86_64 and smoke tested by running eclipse. Cheers, Mark diff -r 83871b8a8d18 Makefile.am --- a/Makefile.am Fri Apr 11 14:39:16 2008 -0400 +++ b/Makefile.am Sun Apr 13 00:44:50 2008 +0200 @@ -1,6 +1,6 @@ OPENJDK_DATE = 26_mar_2008 -OPENJDK_DATE = 26_mar_2008 -OPENJDK_MD5SUM = 18f325ec51da83783c48b1fcb72c053c -OPENJDK_VERSION = b08 +OPENJDK_DATE = 11_apr_2008 +OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c +OPENJDK_VERSION = b09 if NETX_PLUGIN NETX_PATCH = patches/icedtea-netx-plugin.patch From bugzilla-daemon at icedtea.classpath.org Sun Apr 13 08:47:53 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 13 Apr 2008 15:47:53 +0000 Subject: [Bug 135] OpenJDK segfaults when running a java project of mine Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=135 ------- Comment #5 from gbenson at redhat.com 2008-04-13 15:47 ------- I can't reproduce this. Here's what I did: wget http://dist.codehaus.org/jruby/jruby-bin-1.1.tar.gz tar xfz jruby-bin-1.1.tar.gz cd jruby-1.1 echo "puts 'Hello world'" > hello-world.rb JAVA_HOME=/path/to/openjdk-ecj/control/build/linux-ppc/j2sdk-image bin/jruby hello-world.rb Does this particular testcase fail 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 mvfranz at gmail.com Sun Apr 13 12:19:11 2008 From: mvfranz at gmail.com (Michael Franz) Date: Sun, 13 Apr 2008 15:19:11 -0400 Subject: Build Identified as Windows - On OS X Message-ID: Hi, I cannot figure out why openjdk/hotspot/make/Makefile always builds the windows section. I have added darwin sections to plenty of Makefiles and *.gmk files, but this file seems to always be identified as windows. OSNAME equals windows. OSNAME is only set by OSNAME = $(shell uname -s) and I don't know how this could ever return Windows. Any idea how this is happening? Michael -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080413/2d2e8ab5/attachment.html From Kelly.Ohair at Sun.COM Sun Apr 13 14:09:01 2008 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Sun, 13 Apr 2008 14:09:01 -0700 Subject: FreeType freetypecheck and Multiple Header Variables In-Reply-To: References: Message-ID: <4802766D.2040606@sun.com> These are going away in rev: http://hg.openjdk.java.net/jdk7/build/jdk/rev/88d235789027 I tried to simplify this stuff. -kto Michael Franz wrote: > Hi, > > I have been trying to figure out how to get the freetypecheck to build > during the icedtea6/openjdk build have found that there seems to be two > different sets of variables set to indicate where the freetype library is. > > ALT_FREETYPE_HEADERS_PATH | DEVTOOLS_FT_DIR -> FREETYPE_HEADERS_PATH -> > FT_HEADERS > and > FREETYPE2_CFLAGS -> FREETYPE2_HEADERS -> FREETYPE_HEADERS > > Why are there two 'sets' of freetype header variables? > > Michael > From mvfranz at gmail.com Sun Apr 13 14:09:57 2008 From: mvfranz at gmail.com (Michael Franz) Date: Sun, 13 Apr 2008 17:09:57 -0400 Subject: Build Identified as Windows - On OS X In-Reply-To: References: Message-ID: Ok, I found my problem. It seems that we also have makefile includes that end in .make (openjdk/hotspot/make/defs.make) Is there a reason to have .gmk and .make extension for makefile includes? Are there going to be other extensions I need to look out for? On Sun, Apr 13, 2008 at 3:19 PM, Michael Franz wrote: > Hi, > > I cannot figure out why openjdk/hotspot/make/Makefile always builds the > windows section. I have added darwin sections to plenty of Makefiles and > *.gmk files, but this file seems to always be identified as windows. OSNAME > equals windows. OSNAME is only set by OSNAME = $(shell uname -s) and I > don't know how this could ever return Windows. > > Any idea how this is happening? > > Michael > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080413/ec22737a/attachment.html From Kelly.Ohair at Sun.COM Sun Apr 13 14:21:06 2008 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Sun, 13 Apr 2008 14:21:06 -0700 Subject: Build Identified as Windows - On OS X In-Reply-To: References: Message-ID: <48027942.6020005@sun.com> See http://hg.openjdk.java.net/jdk7/build/hotspot/file/7836be3e92d0/make/defs.make Around line 124. If it isn't Linux, isn't SunOS, must be windows. :^( -kto Michael Franz wrote: > Hi, > > I cannot figure out why openjdk/hotspot/make/Makefile always builds the > windows section. I have added darwin sections to plenty of Makefiles > and *.gmk files, but this file seems to always be identified as > windows. OSNAME equals windows. OSNAME is only set by OSNAME = $(shell > uname -s) and I don't know how this could ever return Windows. > > Any idea how this is happening? > > Michael From bugzilla-daemon at icedtea.classpath.org Sun Apr 13 14:36:19 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 13 Apr 2008 21:36:19 +0000 Subject: [Bug 135] OpenJDK segfaults when running a java project of mine Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=135 ------- Comment #6 from konrad at tylerc.org 2008-04-13 21:36 ------- This testcase succeeds for me. I'll work on getting you a testcase that fails :). -- 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 mvfranz at gmail.com Sun Apr 13 17:18:27 2008 From: mvfranz at gmail.com (Michael Franz) Date: Sun, 13 Apr 2008 20:18:27 -0400 Subject: FreeType freetypecheck and Multiple Header Variables In-Reply-To: <4802766D.2040606@sun.com> References: <4802766D.2040606@sun.com> Message-ID: Glad to see that it will be simpler. I was able to get the freetype check to work, I changed the make file to use the second set, since after I realized I had some env variables set incorrectly and using the one that IcedTea already figured out was easier. Michael On Sun, Apr 13, 2008 at 5:09 PM, Kelly O'Hair wrote: > These are going away in rev: > > http://hg.openjdk.java.net/jdk7/build/jdk/rev/88d235789027 > > I tried to simplify this stuff. > > -kto -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080413/0876156e/attachment.html From mvfranz at gmail.com Sun Apr 13 17:20:44 2008 From: mvfranz at gmail.com (Michael Franz) Date: Sun, 13 Apr 2008 20:20:44 -0400 Subject: Build Identified as Windows - On OS X In-Reply-To: <48027942.6020005@sun.com> References: <48027942.6020005@sun.com> Message-ID: Thanks! I eventually found that. I also found that there is a slew of .make files I needed to duplicate for hotspot. This logic is different from the other OS/Platform determination logic within the build. I hope we can eventually make this consistent. Michael On Sun, Apr 13, 2008 at 5:21 PM, Kelly O'Hair wrote: > See > http://hg.openjdk.java.net/jdk7/build/hotspot/file/7836be3e92d0/make/defs.make > Around line 124. > > If it isn't Linux, isn't SunOS, must be windows. :^( > > -kto -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080413/974d482f/attachment.html From gnu_andrew at member.fsf.org Sun Apr 13 18:12:07 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 14 Apr 2008 02:12:07 +0100 Subject: Parallel builds of IcedTea/OpenJDK Message-ID: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> The attach patch allows the ALT_PARALLEL_COMPILE_JOBS and HOTSPOT_BUILD_JOBS options to be turned on for an IcedTea build using --with-parallel-jobs=x where x is the number of jobs to use. This speeds up the build quite a bit on systems with more than one processor. I've tested a full bootstrap with this. Okay to commit? -- Andrew :-) 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 -------------- next part -------------- A non-text attachment was scrubbed... Name: parallel_jobs.diff Type: text/x-patch Size: 4871 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080414/268dfbf0/parallel_jobs.diff From bugzilla-daemon at icedtea.classpath.org Mon Apr 14 01:29:16 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 14 Apr 2008 08:29:16 +0000 Subject: [Bug 81] PrinterJob.PageDialog null pointer exception Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #7 from mark at klomp.org 2008-04-14 08:29 ------- Fixed with import of openjdk6 b09. Page Setup dialog comes up fine now. -- 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 langel at redhat.com Mon Apr 14 05:16:07 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 14 Apr 2008 08:16:07 -0400 Subject: Parallel builds of IcedTea/OpenJDK In-Reply-To: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> References: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> Message-ID: <48034B07.7060108@redhat.com> Andrew John Hughes wrote: > The attach patch allows the ALT_PARALLEL_COMPILE_JOBS and > HOTSPOT_BUILD_JOBS options to be turned on for an IcedTea build using > --with-parallel-jobs=x where x is the number of jobs to use. This > speeds up the build quite a bit on systems with more than one > processor. > > I've tested a full bootstrap with this. Okay to commit? Great! Thanks Lillian From gnu_andrew at member.fsf.org Mon Apr 14 05:53:29 2008 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 14 Apr 2008 12:53:29 +0000 Subject: changeset in /hg/icedtea6: Add support for building --with-paral... Message-ID: changeset 9cd18444aa30 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9cd18444aa30 description: Add support for building --with-parallel-jobs=x diffstat: 5 files changed, 67 insertions(+), 5 deletions(-) ChangeLog | 12 ++++++++++++ Makefile.am | 8 ++++++-- Makefile.in | 11 +++++++++-- configure | 25 ++++++++++++++++++++++++- configure.ac | 16 ++++++++++++++++ diffs (168 lines): diff -r afb4ea482b75 -r 9cd18444aa30 ChangeLog --- a/ChangeLog Sun Apr 13 00:46:37 2008 +0200 +++ b/ChangeLog Mon Apr 14 13:53:23 2008 +0100 @@ -1,3 +1,15 @@ 2008-04-12 Mark Wielaard + + * Makefile.am: + Pass ALT_PARALLEL_COMPILE_JOBS and + HOTSPOT_BUILD_JOBS to ICEDTEA_ENV + and ICEDTEA_ENV_ECJ as configured. + * Makefile.in, + * configure: + Updated. + * configure.ac: + Add --with-parallel-jobs=x option. + 2008-04-12 Mark Wielaard * Makefile.am: Updated to OpenJDK b09 release. diff -r afb4ea482b75 -r 9cd18444aa30 Makefile.am --- a/Makefile.am Sun Apr 13 00:46:37 2008 +0200 +++ b/Makefile.am Mon Apr 14 13:53:23 2008 +0100 @@ -97,7 +97,9 @@ ICEDTEA_ENV = \ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \ - "FT2_LIB=$(FREETYPE2_LIBS)" + "FT2_LIB=$(FREETYPE2_LIBS)" \ + "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \ + "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" if WITH_CACAO ICEDTEA_ENV += \ @@ -152,7 +154,9 @@ ICEDTEA_ENV_ECJ = \ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \ - "FT2_LIB=$(FREETYPE2_LIBS)" + "FT2_LIB=$(FREETYPE2_LIBS)" \ + "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \ + "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" if WITH_CACAO ICEDTEA_ENV_ECJ += \ diff -r afb4ea482b75 -r 9cd18444aa30 Makefile.in --- a/Makefile.in Sun Apr 13 00:46:37 2008 +0200 +++ b/Makefile.in Mon Apr 14 13:53:23 2008 +0100 @@ -150,6 +150,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PARALLEL_JOBS = @PARALLEL_JOBS@ PATCH = @PATCH@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -295,7 +296,10 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \ - "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1) $(am__append_2) + "FT2_LIB=$(FREETYPE2_LIBS)" \ + "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \ + "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \ + $(am__append_2) # OpenJDK ecj build environment. ICEDTEA_BUILD_DIR_ECJ = \ @@ -332,7 +336,10 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \ - "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_3) $(am__append_4) + "FT2_LIB=$(FREETYPE2_LIBS)" \ + "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \ + "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_3) \ + $(am__append_4) # OpenJDK Source Preparation Targets # ================================== diff -r afb4ea482b75 -r 9cd18444aa30 configure --- a/configure Sun Apr 13 00:46:37 2008 +0200 +++ b/configure Mon Apr 14 13:53:23 2008 +0100 @@ -728,6 +728,7 @@ WITH_ICEDTEA_FALSE WITH_ICEDTEA_FALSE WITH_OPENJDK_TRUE WITH_OPENJDK_FALSE +PARALLEL_JOBS BUILD_ARCH_DIR INSTALL_ARCH_DIR JAVA @@ -1438,6 +1439,8 @@ Optional Packages: --with-ant-home Ant home directory (default is /usr/share/ant) --with-icedtea build IcedTea with system-installed IcedTea --with-openjdk build IcedTea with system-installed OpenJDK + --with-parallel-jobs build IcedTea using the specified number of parallel + jobs --with-java specify location of the 1.5 java vm --with-ecj bytecode compilation with ecj --with-javac bytecode compilation with javac @@ -5608,6 +5611,25 @@ else WITH_OPENJDK_TRUE='#' WITH_OPENJDK_FALSE= fi + + + +# Check whether --with-parallel-jobs was given. +if test "${with_parallel_jobs+set}" = set; then + withval=$with_parallel_jobs; + if test "x${withval}" == x + then + PARALLEL_JOBS=2 + else + PARALLEL_JOBS=${withval} + fi + +else + + PARALLEL_JOBS=2 + +fi + @@ -12592,6 +12614,7 @@ WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$a WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim WITH_OPENJDK_FALSE!$WITH_OPENJDK_FALSE$ac_delim +PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim JAVA!$JAVA$ac_delim @@ -12663,7 +12686,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -r afb4ea482b75 -r 9cd18444aa30 configure.ac --- a/configure.ac Sun Apr 13 00:46:37 2008 +0200 +++ b/configure.ac Mon Apr 14 13:53:23 2008 +0100 @@ -139,6 +139,22 @@ AC_ARG_WITH([openjdk], ]) AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true) +AC_ARG_WITH([parallel-jobs], + [AS_HELP_STRING([--with-parallel-jobs], + [build IcedTea using the specified number of parallel jobs])], + [ + if test "x${withval}" == x + then + PARALLEL_JOBS=2 + else + PARALLEL_JOBS=${withval} + fi + ], + [ + PARALLEL_JOBS=2 + ]) +AC_SUBST(PARALLEL_JOBS) + SET_ARCH_DIRS if test "${with_openjdk}" == true then From gnu_andrew at member.fsf.org Mon Apr 14 05:53:58 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 14 Apr 2008 13:53:58 +0100 Subject: Parallel builds of IcedTea/OpenJDK In-Reply-To: <48034B07.7060108@redhat.com> References: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> <48034B07.7060108@redhat.com> Message-ID: <17c6771e0804140553g75cb43d0k2cc88040ef389139@mail.gmail.com> On 14/04/2008, Lillian Angel wrote: > Andrew John Hughes wrote: > > > The attach patch allows the ALT_PARALLEL_COMPILE_JOBS and > > HOTSPOT_BUILD_JOBS options to be turned on for an IcedTea build using > > --with-parallel-jobs=x where x is the number of jobs to use. This > > speeds up the build quite a bit on systems with more than one > > processor. > > > > I've tested a full bootstrap with this. Okay to commit? > > > > > > Great! Thanks > > Lillian > Thanks. Done :) -- Andrew :-) 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 xerxes at zafena.se Mon Apr 14 06:06:28 2008 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 14 Apr 2008 15:06:28 +0200 Subject: configure does not check for make Message-ID: <480356D4.4060202@zafena.se> there is no check when running configure if make is installed on the system From xerxes at zafena.se Mon Apr 14 06:28:17 2008 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 14 Apr 2008 15:28:17 +0200 Subject: icedtea6 configure missing check for gzip (tar xzf) Message-ID: <48035BF1.4040200@zafena.se> icedtea6 configure does not check for gzip The build system does not fail when tar xzf fails /bin/tar xzf openjdk-6-src-b09-11_apr_2008.tar.gz -C openjdk /bin/tar: gzip: Function "exec" faild: The File or Catalog does not exist instead it continues trying to apply all patches on a empty openjdk dir :) From aph at redhat.com Mon Apr 14 06:45:47 2008 From: aph at redhat.com (Andrew Haley) Date: Mon, 14 Apr 2008 14:45:47 +0100 Subject: icedtea6 configure missing check for gzip (tar xzf) In-Reply-To: <48035BF1.4040200@zafena.se> References: <48035BF1.4040200@zafena.se> Message-ID: <4803600B.5090405@redhat.com> Xerxes R?nby wrote: > icedtea6 configure does not check for gzip > > The build system does not fail when tar xzf fails > > /bin/tar xzf openjdk-6-src-b09-11_apr_2008.tar.gz -C openjdk > /bin/tar: gzip: Function "exec" faild: The File or Catalog does not exist > > instead it continues trying to apply all patches on a empty openjdk dir :) It doesn't check for a great many things. I suppose the question is what is reasonable to assume. What about 'mv; ? 'mkdir' ? Andrew. From xerxes at zafena.se Mon Apr 14 07:59:09 2008 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 14 Apr 2008 16:59:09 +0200 Subject: icedtea6 configure missing check for ant Message-ID: <4803713D.6030904@zafena.se> icedtea6 configure does not check for ant Im currently doing a screening to catch dependencies that are not checked for by configure and are not installed by default on fedora core 8 ARM distribution. Cheers Xerxes From langel at redhat.com Mon Apr 14 08:15:05 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 14 Apr 2008 15:15:05 +0000 Subject: changeset in /hg/icedtea6: 2008-04-14 Lillian Angel changeset c106e5ac6bf3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c106e5ac6bf3 description: 2008-04-14 Lillian Angel * Makefile.in: Regenerated. * configure: Regenerated. * configure.ac: Added checks for make, gzip and ant. diffstat: 4 files changed, 350 insertions(+), 5 deletions(-) ChangeLog | 8 + Makefile.in | 3 configure | 341 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 3 diffs (439 lines): diff -r 9cd18444aa30 -r c106e5ac6bf3 ChangeLog --- a/ChangeLog Mon Apr 14 13:53:23 2008 +0100 +++ b/ChangeLog Mon Apr 14 11:08:37 2008 -0400 @@ -1,4 +1,10 @@ 2008-04-08 Andrew John Hughes +2008-04-14 Lillian Angel + + * Makefile.in: Regenerated. + * configure: Regenerated. + * configure.ac: Added checks for make, gzip and ant. + +2008-04-14 Andrew John Hughes * Makefile.am: Pass ALT_PARALLEL_COMPILE_JOBS and diff -r 9cd18444aa30 -r c106e5ac6bf3 Makefile.in --- a/Makefile.in Mon Apr 14 13:53:23 2008 +0100 +++ b/Makefile.in Mon Apr 14 11:08:37 2008 -0400 @@ -80,6 +80,7 @@ ALSA_LIBS = @ALSA_LIBS@ ALSA_LIBS = @ALSA_LIBS@ ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@ AMTAR = @AMTAR@ +ANT = @ANT@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -118,6 +119,7 @@ GREP = @GREP@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GZIP = @GZIP@ INSTALL = @INSTALL@ INSTALL_ARCH_DIR = @INSTALL_ARCH_DIR@ INSTALL_DATA = @INSTALL_DATA@ @@ -137,6 +139,7 @@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ +MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ diff -r 9cd18444aa30 -r c106e5ac6bf3 configure --- a/configure Mon Apr 14 13:53:23 2008 +0100 +++ b/configure Mon Apr 14 11:08:37 2008 -0400 @@ -704,6 +704,9 @@ CXXDEPMODE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE +MAKE +GZIP +ANT FIND PATCH TAR @@ -4151,6 +4154,333 @@ fi if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}make", so it can be a program name with args. +set dummy ${ac_tool_prefix}make; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_MAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAKE in + [\\/]* | ?:[\\/]*) + ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +MAKE=$ac_cv_path_MAKE +if test -n "$MAKE"; then + { echo "$as_me:$LINENO: result: $MAKE" >&5 +echo "${ECHO_T}$MAKE" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_MAKE"; then + ac_pt_MAKE=$MAKE + # Extract the first word of "make", so it can be a program name with args. +set dummy make; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_MAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_MAKE in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_MAKE="$ac_pt_MAKE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_MAKE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_MAKE=$ac_cv_path_ac_pt_MAKE +if test -n "$ac_pt_MAKE"; then + { echo "$as_me:$LINENO: result: $ac_pt_MAKE" >&5 +echo "${ECHO_T}$ac_pt_MAKE" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_MAKE" = x; then + MAKE="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + MAKE=$ac_pt_MAKE + fi +else + MAKE="$ac_cv_path_MAKE" +fi + + if test x"$MAKE" = x ; then + { { echo "$as_me:$LINENO: error: make program not found in PATH" >&5 +echo "$as_me: error: make program not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gzip", so it can be a program name with args. +set dummy ${ac_tool_prefix}gzip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GZIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GZIP in + [\\/]* | ?:[\\/]*) + ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +GZIP=$ac_cv_path_GZIP +if test -n "$GZIP"; then + { echo "$as_me:$LINENO: result: $GZIP" >&5 +echo "${ECHO_T}$GZIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_GZIP"; then + ac_pt_GZIP=$GZIP + # Extract the first word of "gzip", so it can be a program name with args. +set dummy gzip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_GZIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_GZIP in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_GZIP="$ac_pt_GZIP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_GZIP="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_GZIP=$ac_cv_path_ac_pt_GZIP +if test -n "$ac_pt_GZIP"; then + { echo "$as_me:$LINENO: result: $ac_pt_GZIP" >&5 +echo "${ECHO_T}$ac_pt_GZIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_GZIP" = x; then + GZIP="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + GZIP=$ac_pt_GZIP + fi +else + GZIP="$ac_cv_path_GZIP" +fi + + if test x"$GZIP" = x ; then + { { echo "$as_me:$LINENO: error: gzip program not found in PATH" >&5 +echo "$as_me: error: gzip program not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ant", so it can be a program name with args. +set dummy ${ac_tool_prefix}ant; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ANT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ANT in + [\\/]* | ?:[\\/]*) + ac_cv_path_ANT="$ANT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ANT=$ac_cv_path_ANT +if test -n "$ANT"; then + { echo "$as_me:$LINENO: result: $ANT" >&5 +echo "${ECHO_T}$ANT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_ANT"; then + ac_pt_ANT=$ANT + # Extract the first word of "ant", so it can be a program name with args. +set dummy ant; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_ANT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_ANT in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_ANT="$ac_pt_ANT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_ANT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_ANT=$ac_cv_path_ac_pt_ANT +if test -n "$ac_pt_ANT"; then + { echo "$as_me:$LINENO: result: $ac_pt_ANT" >&5 +echo "${ECHO_T}$ac_pt_ANT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_ANT" = x; then + ANT="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + ANT=$ac_pt_ANT + fi +else + ANT="$ac_cv_path_ANT" +fi + + if test x"$ANT" = x ; then + { { echo "$as_me:$LINENO: error: ant program not found in PATH" >&5 +echo "$as_me: error: ant program not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + + +if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}find", so it can be a program name with args. set dummy ${ac_tool_prefix}find; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -12549,14 +12879,14 @@ CXXDEPMODE!$CXXDEPMODE$ac_delim CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +MAKE!$MAKE$ac_delim +GZIP!$GZIP$ac_delim +ANT!$ANT$ac_delim FIND!$FIND$ac_delim PATCH!$PATCH$ac_delim TAR!$TAR$ac_delim CHMOD!$CHMOD$ac_delim MD5SUM!$MD5SUM$ac_delim -WGET!$WGET$ac_delim -ZIP!$ZIP$ac_delim -UNZIP!$UNZIP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -12598,6 +12928,9 @@ ac_delim='%!_!# ' ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +WGET!$WGET$ac_delim +ZIP!$ZIP$ac_delim +UNZIP!$UNZIP$ac_delim CPIO!$CPIO$ac_delim FILE!$FILE$ac_delim FASTJAR!$FASTJAR$ac_delim @@ -12686,7 +13019,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -r 9cd18444aa30 -r c106e5ac6bf3 configure.ac --- a/configure.ac Mon Apr 14 13:53:23 2008 +0100 +++ b/configure.ac Mon Apr 14 11:08:37 2008 -0400 @@ -9,6 +9,9 @@ AC_PROG_CC AC_PROG_CC AC_PROG_CXX +FIND_TOOL([MAKE], [make]) +FIND_TOOL([GZIP], [gzip]) +FIND_TOOL([ANT], [ant]) FIND_TOOL([FIND], [find]) FIND_TOOL([PATCH], [patch]) FIND_TOOL([TAR], [tar]) From jsumali at redhat.com Mon Apr 14 08:23:08 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Mon, 14 Apr 2008 11:23:08 -0400 Subject: Parallel builds of IcedTea/OpenJDK In-Reply-To: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> References: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> Message-ID: <480376DC.4010800@redhat.com> Andrew John Hughes wrote: > The attach patch allows the ALT_PARALLEL_COMPILE_JOBS and > HOTSPOT_BUILD_JOBS options to be turned on for an IcedTea build using > --with-parallel-jobs=x where x is the number of jobs to use. This > speeds up the build quite a bit on systems with more than one > processor. > > I've tested a full bootstrap with this. Okay to commit? > > Out of curiosity, what's a good number to use for x? I have a dual core machine at home, if that helps. Josh From aph at redhat.com Mon Apr 14 08:27:00 2008 From: aph at redhat.com (Andrew Haley) Date: Mon, 14 Apr 2008 16:27:00 +0100 Subject: Parallel builds of IcedTea/OpenJDK In-Reply-To: <480376DC.4010800@redhat.com> References: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> <480376DC.4010800@redhat.com> Message-ID: <480377C4.3070003@redhat.com> Joshua Sumali wrote: > Andrew John Hughes wrote: >> The attach patch allows the ALT_PARALLEL_COMPILE_JOBS and >> HOTSPOT_BUILD_JOBS options to be turned on for an IcedTea build using >> --with-parallel-jobs=x where x is the number of jobs to use. This >> speeds up the build quite a bit on systems with more than one >> processor. >> >> I've tested a full bootstrap with this. Okay to commit? >> >> > Out of curiosity, what's a good number to use for x? I have a dual core > machine at home, if that helps. Rule of thumb: If running over NFS, cores *2. If running locally, cores +1. Andrew. From gnu_andrew at member.fsf.org Mon Apr 14 08:37:46 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 14 Apr 2008 16:37:46 +0100 Subject: icedtea6 configure missing check for gzip (tar xzf) In-Reply-To: <4803600B.5090405@redhat.com> References: <48035BF1.4040200@zafena.se> <4803600B.5090405@redhat.com> Message-ID: <17c6771e0804140837s28f10068n57c47ddc294ffe76@mail.gmail.com> On 14/04/2008, Andrew Haley wrote: > Xerxes R?nby wrote: > > icedtea6 configure does not check for gzip > > > > The build system does not fail when tar xzf fails > > > > /bin/tar xzf openjdk-6-src-b09-11_apr_2008.tar.gz -C openjdk > > /bin/tar: gzip: Function "exec" faild: The File or Catalog does not exist > > > > instead it continues trying to apply all patches on a empty openjdk dir :) > > > It doesn't check for a great many things. I suppose the question > is what is reasonable to assume. What about 'mv; ? 'mkdir' ? > > > Andrew. > > > There's a standard set of tools that it is usually safe to rely on, as documented in the autoconf manual. Without many of these, like mv, cp and gzip, the configure script and generated Makefiles wouldn't work either. As to make, I've never seen that specified by any autoconf system. I think it's pretty much assumed. As Andrew says, there has to be a limit somewhere. -- Andrew :-) 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 dennis at ausil.us Mon Apr 14 08:39:04 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Mon, 14 Apr 2008 10:39:04 -0500 Subject: Parallel builds of IcedTea/OpenJDK In-Reply-To: <480377C4.3070003@redhat.com> References: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> <480376DC.4010800@redhat.com> <480377C4.3070003@redhat.com> Message-ID: <200804141039.05024.dennis@ausil.us> On Monday 14 April 2008, Andrew Haley wrote: > Joshua Sumali wrote: > > Andrew John Hughes wrote: > >> The attach patch allows the ALT_PARALLEL_COMPILE_JOBS and > >> HOTSPOT_BUILD_JOBS options to be turned on for an IcedTea build using > >> --with-parallel-jobs=x where x is the number of jobs to use. This > >> speeds up the build quite a bit on systems with more than one > >> processor. > >> > >> I've tested a full bootstrap with this. Okay to commit? > > > > Out of curiosity, what's a good number to use for x? I have a dual core > > machine at home, if that helps. > > Rule of thumb: > > If running over NFS, cores *2. > If running locally, cores +1. > > Andrew. how well will it work at 32 threads? Dennis From Kelly.Ohair at Sun.COM Mon Apr 14 08:49:09 2008 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Mon, 14 Apr 2008 08:49:09 -0700 Subject: Parallel builds of IcedTea/OpenJDK In-Reply-To: <200804141039.05024.dennis@ausil.us> References: <17c6771e0804131812u3343d71bjeb5649db41988a6f@mail.gmail.com> <480376DC.4010800@redhat.com> <480377C4.3070003@redhat.com> <200804141039.05024.dennis@ausil.us> Message-ID: <48037CF5.1010808@sun.com> It depends on the machine and how much your action your disk can handle. With hotspot this is a 'make -p N all' from the top. With the jdk, it's a per library thing, 'make -p N *.o' so small libraries will not benefit on higher numbers. -kto Dennis Gilmore wrote: > On Monday 14 April 2008, Andrew Haley wrote: >> Joshua Sumali wrote: >>> Andrew John Hughes wrote: >>>> The attach patch allows the ALT_PARALLEL_COMPILE_JOBS and >>>> HOTSPOT_BUILD_JOBS options to be turned on for an IcedTea build using >>>> --with-parallel-jobs=x where x is the number of jobs to use. This >>>> speeds up the build quite a bit on systems with more than one >>>> processor. >>>> >>>> I've tested a full bootstrap with this. Okay to commit? >>> Out of curiosity, what's a good number to use for x? I have a dual core >>> machine at home, if that helps. >> Rule of thumb: >> >> If running over NFS, cores *2. >> If running locally, cores +1. >> >> Andrew. > how well will it work at 32 threads? > > > Dennis > From aph at redhat.com Mon Apr 14 09:53:29 2008 From: aph at redhat.com (Andrew Haley) Date: Mon, 14 Apr 2008 17:53:29 +0100 Subject: icedtea zero ARM atomic patch In-Reply-To: <47F4E529.50001@zafena.se> References: <47F4E529.50001@zafena.se> Message-ID: <48038C09.8030300@redhat.com> Xerxes R?nby wrote: > Greetings! > > Here is a patch for the ARM zero port to deal with missing atomic > operations in the ARM hardware, here implemented using linux-kernelcalls. > With this patch the zero hotspot and bootstrap-ecj part of icedtea6 do > compile on ARM targets. Thanks. It wasn't quite right: here are some corrections. Andrew. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: pp Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080414/9c223596/pp.ksh From aph at redhat.com Mon Apr 14 10:09:15 2008 From: aph at redhat.com (Andrew Haley) Date: Mon, 14 Apr 2008 18:09:15 +0100 Subject: icedtea zero ARM atomic patch In-Reply-To: <48038C09.8030300@redhat.com> References: <47F4E529.50001@zafena.se> <48038C09.8030300@redhat.com> Message-ID: <48038FBB.5060702@redhat.com> Andrew Haley wrote: > Xerxes R?nby wrote: >> Greetings! >> >> Here is a patch for the ARM zero port to deal with missing atomic >> operations in the ARM hardware, here implemented using linux-kernelcalls. >> With this patch the zero hotspot and bootstrap-ecj part of icedtea6 do >> compile on ARM targets. > > Thanks. > > It wasn't quite right: here are some corrections. I'm still getting an IllegalMonitorState. I'll have to debug it. Andrew. From jsumali at redhat.com Mon Apr 14 11:10:26 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Mon, 14 Apr 2008 18:10:26 +0000 Subject: changeset in /hg/icedtea6: 2008-04-14 Joshua Sumali changeset 43f18ddc7c1c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=43f18ddc7c1c description: 2008-04-14 Joshua Sumali * rt/net/sourceforge/jnlp/services/XFileContents.java: Add support for JNLPRandomAccessFile. * rt/net/sourceforge/jnlp/services/XServiceManagerStub.java: Add PrintService and JNLPRandomAccessFile services. * rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java: New file. * rt/net/sourceforge/jnlp/services/XPrintService.java: Likewise. diffstat: 5 files changed, 345 insertions(+), 2 deletions(-) ChangeLog | 9 rt/net/sourceforge/jnlp/services/XFileContents.java | 3 rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java | 208 +++++++++++ rt/net/sourceforge/jnlp/services/XPrintService.java | 123 ++++++ rt/net/sourceforge/jnlp/services/XServiceManagerStub.java | 4 diffs (396 lines): diff -r c106e5ac6bf3 -r 43f18ddc7c1c ChangeLog --- a/ChangeLog Mon Apr 14 11:08:37 2008 -0400 +++ b/ChangeLog Mon Apr 14 14:09:53 2008 -0400 @@ -1,3 +1,12 @@ 2008-04-14 Lillian Angel + + * rt/net/sourceforge/jnlp/services/XFileContents.java: Add support for + JNLPRandomAccessFile. + * rt/net/sourceforge/jnlp/services/XServiceManagerStub.java: Add + PrintService and JNLPRandomAccessFile services. + * rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java: New file. + * rt/net/sourceforge/jnlp/services/XPrintService.java: Likewise. + 2008-04-14 Lillian Angel * Makefile.in: Regenerated. diff -r c106e5ac6bf3 -r 43f18ddc7c1c rt/net/sourceforge/jnlp/services/XFileContents.java --- a/rt/net/sourceforge/jnlp/services/XFileContents.java Mon Apr 14 11:08:37 2008 -0400 +++ b/rt/net/sourceforge/jnlp/services/XFileContents.java Mon Apr 14 14:09:53 2008 -0400 @@ -24,6 +24,7 @@ import javax.jnlp.*; import javax.jnlp.*; import net.sourceforge.jnlp.*; +import net.sourceforge.jnlp.runtime.JNLPRuntime; /** * File contents. @@ -105,7 +106,7 @@ class XFileContents implements FileConte * @throws IOException if an I/O exception occurs. */ public JNLPRandomAccessFile getRandomAccessFile(String mode) throws IOException { - return null; + return new XJNLPRandomAccessFile(file, mode); } /** diff -r c106e5ac6bf3 -r 43f18ddc7c1c rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java Mon Apr 14 14:09:53 2008 -0400 @@ -0,0 +1,208 @@ +/* XJNLPRandomAccessFile.java + Copyright (C) 2008 Red Hat, Inc. + +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, version 2. + +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. + */ +package net.sourceforge.jnlp.services; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; + +import javax.jnlp.JNLPRandomAccessFile; + +public class XJNLPRandomAccessFile implements JNLPRandomAccessFile { + + private RandomAccessFile raf; + + public XJNLPRandomAccessFile(File file, String mode) { + try { + raf = new RandomAccessFile(file, mode); + } catch (FileNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public void close() throws IOException { + raf.close(); + } + + public long getFilePointer() throws IOException { + return raf.getFilePointer(); + } + + public long length() throws IOException { + return raf.length(); + } + + public int read() throws IOException { + return raf.read(); + } + + public int read(byte[] b, int off, int len) throws IOException { + return raf.read(b, off, len); + } + + public int read(byte[] b) throws IOException { + return raf.read(b); + } + + public boolean readBoolean() throws IOException { + return raf.readBoolean(); + } + + public byte readByte() throws IOException { + return raf.readByte(); + } + + public char readChar() throws IOException { + return raf.readChar(); + } + + public double readDouble() throws IOException { + return raf.readDouble(); + } + + public float readFloat() throws IOException { + return raf.readFloat(); + } + + public void readFully(byte[] b) throws IOException { + raf.readFully(b); + } + + public void readFully(byte[] b, int off, int len) throws IOException { + raf.readFully(b, off, len); + } + + public int readInt() throws IOException { + return raf.readInt(); + } + + public String readLine() throws IOException { + return raf.readLine(); + } + + public long readLong() throws IOException { + return raf.readLong(); + } + + public short readShort() throws IOException { + return raf.readShort(); + } + + public String readUTF() throws IOException { + return raf.readUTF(); + } + + public int readUnsignedByte() throws IOException { + return raf.readUnsignedByte(); + } + + public int readUnsignedShort() throws IOException { + return raf.readUnsignedShort(); + } + + public void seek(long pos) throws IOException { + raf.seek(pos); + } + + public void setLength(long newLength) throws IOException { + raf.setLength(newLength); + } + + public int skipBytes(int n) throws IOException { + return raf.skipBytes(n); + } + + public void write(int b) throws IOException { + raf.write(b); + + } + + public void write(byte[] b) throws IOException { + raf.write(b); + } + + public void write(byte[] b, int off, int len) throws IOException { + raf.write(b, off, len); + } + + public void writeBoolean(boolean v) throws IOException { + raf.writeBoolean(v); + } + + public void writeByte(int v) throws IOException { + raf.writeByte(v); + } + + public void writeBytes(String s) throws IOException { + raf.writeBytes(s); + } + + public void writeChar(int v) throws IOException { + raf.writeChar(v); + } + + public void writeChars(String s) throws IOException { + raf.writeChars(s); + } + + public void writeDouble(double v) throws IOException { + raf.writeDouble(v); + } + + public void writeFloat(float v) throws IOException { + raf.writeFloat(v); + } + + public void writeInt(int v) throws IOException { + raf.writeInt(v); + } + + public void writeLong(long v) throws IOException { + raf.writeLong(v); + } + + public void writeShort(int v) throws IOException { + raf.writeShort(v); + } + + public void writeUTF(String str) throws IOException { + raf.writeUTF(str); + } + +} diff -r c106e5ac6bf3 -r 43f18ddc7c1c rt/net/sourceforge/jnlp/services/XPrintService.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/net/sourceforge/jnlp/services/XPrintService.java Mon Apr 14 14:09:53 2008 -0400 @@ -0,0 +1,123 @@ +/* XPrintService.java + Copyright (C) 2008 Red Hat, Inc. + +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, version 2. + +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. + */ + +package net.sourceforge.jnlp.services; + +import java.awt.print.PageFormat; +import java.awt.print.Pageable; +import java.awt.print.Printable; +import java.awt.print.PrinterException; +import java.awt.print.PrinterJob; + +import javax.jnlp.*; +import javax.swing.JOptionPane; + +import net.sourceforge.jnlp.runtime.JNLPRuntime; + +public class XPrintService implements PrintService { + + // If pj is null, then we do not have a printer to use. + private PrinterJob pj; + + public XPrintService() { + pj = PrinterJob.getPrinterJob(); + } + + public PageFormat getDefaultPage() { + if (pj != null) + return pj.defaultPage(); + else { + showWarning(); + return new PageFormat(); // might not have default settings. + } + } + + public PageFormat showPageFormatDialog(PageFormat page) { + if (pj != null) + return pj.pageDialog(page); + else { + showWarning(); + return page; + } + + } + + public boolean print(Pageable document) { + if (pj != null) { + pj.setPageable(document); + if (pj.printDialog()) { + try { + pj.print(); + return true; + } catch(PrinterException pe) { + System.err.println("Could not print: " + pe); + return false; + } + } + } else + showWarning(); + + return false; + } + + public boolean print(Printable painter) { + if (pj != null) { + pj.setPrintable(painter); + if (pj.printDialog()) { + try { + pj.print(); + return true; + } catch(PrinterException pe) { + System.err.println("Could not print: " + pe); + return false; + } + + } + } else + showWarning(); + + return false; + } + + private void showWarning() { + JOptionPane.showMessageDialog(null, + "Unable to find a default printer.", + "Warning", + JOptionPane.WARNING_MESSAGE); + System.err.println("Unable to print: Unable to find default printer."); + } +} diff -r c106e5ac6bf3 -r 43f18ddc7c1c rt/net/sourceforge/jnlp/services/XServiceManagerStub.java --- a/rt/net/sourceforge/jnlp/services/XServiceManagerStub.java Mon Apr 14 11:08:37 2008 -0400 +++ b/rt/net/sourceforge/jnlp/services/XServiceManagerStub.java Mon Apr 14 14:09:53 2008 -0400 @@ -49,7 +49,8 @@ public class XServiceManagerStub impleme "javax.jnlp.PersistenceService", "javax.jnlp.FileOpenService", "javax.jnlp.FileSaveService", - "javax.jnlp.ClipboardService" + "javax.jnlp.ClipboardService", + "javax.jnlp.PrintService" }; private static Object services[] = { @@ -60,6 +61,7 @@ public class XServiceManagerStub impleme ServiceUtil.createPrivilegedProxy(FileOpenService.class, new XFileOpenService()), ServiceUtil.createPrivilegedProxy(FileSaveService.class, new XFileSaveService()), ServiceUtil.createPrivilegedProxy(ClipboardService.class, new XClipboardService()), + ServiceUtil.createPrivilegedProxy(PrintService.class, new XPrintService()) }; From twisti at complang.tuwien.ac.at Tue Apr 15 00:38:29 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Tue, 15 Apr 2008 07:38:29 +0000 Subject: changeset in /hg/icedtea6: 2008-04-15 Christan Thalinger changeset edf310873bf7 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=edf310873bf7 description: 2008-04-15 Christan Thalinger * acinclude.m4 (ENABLE_ZERO_BUILD): Make --disable-zero work and don't build zero by default when compiling --with-cacao. * aclocal.m4, configure, Makefile.in: Regenerated. diffstat: 5 files changed, 83 insertions(+), 41 deletions(-) ChangeLog | 6 ++++++ Makefile.in | 32 +++++++++++++++++++------------- acinclude.m4 | 18 +++++++++++++++--- aclocal.m4 | 48 +++++++++++++++++++++++++++--------------------- configure | 20 ++++++++++++++++---- diffs (289 lines): diff -r 43f18ddc7c1c -r edf310873bf7 ChangeLog --- a/ChangeLog Mon Apr 14 14:09:53 2008 -0400 +++ b/ChangeLog Tue Apr 15 09:36:40 2008 +0200 @@ -1,3 +1,9 @@ 2008-04-14 Joshua Sumali + + * acinclude.m4 (ENABLE_ZERO_BUILD): Make --disable-zero work and + don't build zero by default when compiling --with-cacao. + * aclocal.m4, configure, Makefile.in: Regenerated. + 2008-04-14 Joshua Sumali * rt/net/sourceforge/jnlp/services/XFileContents.java: Add support for diff -r 43f18ddc7c1c -r edf310873bf7 Makefile.in --- a/Makefile.in Mon Apr 14 14:09:53 2008 -0400 +++ b/Makefile.in Tue Apr 15 09:36:40 2008 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -549,6 +549,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -575,6 +579,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -718,17 +724,17 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am all-local am--refresh check check-am clean \ - clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-local distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am + clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-local distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Top-Level Targets diff -r 43f18ddc7c1c -r edf310873bf7 acinclude.m4 --- a/acinclude.m4 Mon Apr 14 14:09:53 2008 -0400 +++ b/acinclude.m4 Tue Apr 15 09:36:40 2008 +0200 @@ -521,14 +521,26 @@ AC_DEFUN([ENABLE_ZERO_BUILD], [AS_HELP_STRING(--enable-zero, use zero-assembler port on non-zero platforms)], [ - use_zero=yes + case "${enableval}" in + no) + use_zero=no + ;; + *) + use_zero=yes + ;; + esac ], [ case "${host}" in i?86-*-*) ;; x86_64-*-*) ;; *) - use_zero=yes + if test "x${CACAO}" != xno; then + use_zero=no + else + use_zero=yes + fi + ;; esac ]) AC_MSG_RESULT($use_zero) @@ -626,7 +638,7 @@ AC_DEFUN([AC_CHECK_WITH_CACAO], CACAO=no ;; *) - CACAO=${withval} + CACAO=${withval} ;; esac ], diff -r 43f18ddc7c1c -r edf310873bf7 aclocal.m4 --- a/aclocal.m4 Mon Apr 14 14:09:53 2008 -0400 +++ b/aclocal.m4 Tue Apr 15 09:36:40 2008 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -174,7 +177,7 @@ fi[]dnl fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -205,8 +208,10 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -478,7 +483,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -526,13 +531,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 +# 2005, 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -637,16 +642,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -935,7 +941,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -r 43f18ddc7c1c -r edf310873bf7 configure --- a/configure Mon Apr 14 14:09:53 2008 -0400 +++ b/configure Tue Apr 15 09:36:40 2008 +0200 @@ -7946,7 +7946,7 @@ if test "${with_cacao+set}" = set; then CACAO=no ;; *) - CACAO=${withval} + CACAO=${withval} ;; esac @@ -8644,7 +8644,14 @@ echo $ECHO_N "checking whether to use th # Check whether --enable-zero was given. if test "${enable_zero+set}" = set; then enableval=$enable_zero; - use_zero=yes + case "${enableval}" in + no) + use_zero=no + ;; + *) + use_zero=yes + ;; + esac else @@ -8652,7 +8659,12 @@ else i?86-*-*) ;; x86_64-*-*) ;; *) - use_zero=yes + if test "x${CACAO}" != xno; then + use_zero=no + else + use_zero=yes + fi + ;; esac fi @@ -13341,7 +13353,7 @@ echo "$as_me: executing $ac_file command # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ From gbenson at redhat.com Tue Apr 15 07:44:51 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 15 Apr 2008 14:44:51 +0000 Subject: changeset in /hg/icedtea6: 2008-04-15 Gary Benson changeset fb0a7535db1f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fb0a7535db1f description: 2008-04-15 Gary Benson Yi Zhan * patches/icedtea-ia64-fdlibm.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Added the above. * aclocal.m4, Makefile.in: Regenerated. diffstat: 5 files changed, 56 insertions(+), 48 deletions(-) ChangeLog | 7 +++++ Makefile.am | 1 Makefile.in | 36 +++++++++++---------------- aclocal.m4 | 48 ++++++++++++++++--------------------- patches/icedtea-ia64-fdlibm.patch | 12 +++++++++ diffs (236 lines): diff -r edf310873bf7 -r fb0a7535db1f ChangeLog --- a/ChangeLog Tue Apr 15 09:36:40 2008 +0200 +++ b/ChangeLog Tue Apr 15 10:44:43 2008 -0400 @@ -1,3 +1,10 @@ 2008-04-15 Christan Thalinger + Yi Zhan + + * patches/icedtea-ia64-fdlibm.patch: New file. + * Makefile.am (ICEDTEA_PATCHES): Added the above. + * aclocal.m4, Makefile.in: Regenerated. + 2008-04-15 Christan Thalinger * acinclude.m4 (ENABLE_ZERO_BUILD): Make --disable-zero work and diff -r edf310873bf7 -r fb0a7535db1f Makefile.am --- a/Makefile.am Tue Apr 15 09:36:40 2008 +0200 +++ b/Makefile.am Tue Apr 15 10:44:43 2008 -0400 @@ -295,6 +295,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-jpegclasses.patch \ patches/icedtea-xinerama.patch \ patches/icedtea-arm-uname.patch \ + patches/icedtea-ia64-fdlibm.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r edf310873bf7 -r fb0a7535db1f Makefile.in --- a/Makefile.in Tue Apr 15 09:36:40 2008 +0200 +++ b/Makefile.in Tue Apr 15 10:44:43 2008 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -403,8 +403,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \ - $(GCC_PATCH) $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) \ - $(am__append_5) + patches/icedtea-ia64-fdlibm.patch $(GCC_PATCH) \ + $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5) # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch @@ -549,10 +549,6 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -579,8 +575,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -724,17 +718,17 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am all-local am--refresh check check-am clean \ - clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-local distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-generic \ + distclean-local distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am # Top-Level Targets diff -r edf310873bf7 -r fb0a7535db1f aclocal.m4 --- a/aclocal.m4 Tue Apr 15 09:36:40 2008 +0200 +++ b/aclocal.m4 Tue Apr 15 10:44:43 2008 -0400 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -177,7 +174,7 @@ fi[]dnl fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -192,7 +189,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -208,10 +205,8 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -483,7 +478,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -531,13 +526,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 13 +# 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -642,17 +637,16 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -941,7 +935,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -r edf310873bf7 -r fb0a7535db1f patches/icedtea-ia64-fdlibm.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-ia64-fdlibm.patch Tue Apr 15 10:44:43 2008 -0400 @@ -0,0 +1,12 @@ +diff -r 8c25a5a32f56 openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h +--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sun Apr 13 16:00:28 2008 +0100 ++++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Tue Apr 15 15:30:59 2008 +0100 +@@ -30,7 +30,7 @@ + #ifdef __NEWVALID /* special setup for Sun test regime */ + #if defined(i386) || defined(i486) || \ + defined(intel) || defined(x86) || \ +- defined(i86pc) || defined(_M_IA64) ++ defined(i86pc) || defined(ia64) + #define _LITTLE_ENDIAN + #endif + #endif From mvfranz at gmail.com Tue Apr 15 16:24:07 2008 From: mvfranz at gmail.com (Michael Franz) Date: Tue, 15 Apr 2008 19:24:07 -0400 Subject: Hotspot generated AD files Message-ID: Hi, I have been trying to figure out how to get past my latest build issue (OS X). hotspot/src/os_cpu/darwin_i486/vm/darwin_i486.ad', needed by `../generated/adfiles/darwin_i486.ad'. Stop. Anyone have any pointers? I have search the make files and have not been able to figure this one out. Thanks Michael -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080415/21481646/attachment.html From gbenson at redhat.com Tue Apr 15 23:46:29 2008 From: gbenson at redhat.com (Gary Benson) Date: Wed, 16 Apr 2008 07:46:29 +0100 Subject: Hotspot generated AD files In-Reply-To: References: Message-ID: <20080416064628.GA3499@redhat.com> Michael Franz wrote: > I have been trying to figure out how to get past my latest build > issue (OS X). > hotspot/src/os_cpu/darwin_i486/vm/darwin_i486.ad', needed by > `../generated/adfiles/darwin_i486.ad'. Stop. > > Anyone have any pointers? I have search the make files and have not > been able to figure this one out. It's not a generated file, it's something you have to write yourself if you want to port the server JIT. Cheers, Gary -- http://gbenson.net/ From twisti at complang.tuwien.ac.at Wed Apr 16 00:17:15 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 16 Apr 2008 09:17:15 +0200 Subject: Hotspot generated AD files In-Reply-To: References: Message-ID: <1208330235.3848.0.camel@imac523d.theobroma-systems.com> On Tue, 2008-04-15 at 19:24 -0400, Michael Franz wrote: > Hi, > > I have been trying to figure out how to get past my latest build issue > (OS X). Are there still any issues when building the JDK on Darwin? I'd like to give it a try with CACAO as VM. - twisti From mvfranz at gmail.com Wed Apr 16 04:30:45 2008 From: mvfranz at gmail.com (Michael Franz) Date: Wed, 16 Apr 2008 07:30:45 -0400 Subject: Hotspot generated AD files In-Reply-To: <1208330235.3848.0.camel@imac523d.theobroma-systems.com> References: <1208330235.3848.0.camel@imac523d.theobroma-systems.com> Message-ID: Twisti, Define issue. I have not been able to get OpenJDK to build on Darwin/OS X. However the version of the JDK that is based off of the research license does (I have not used that version). Details on Soylatte can be found here http://landonf.bikemonkey.org/static/soylatte/ My understanding is that Soylatte will eventually be merged into OpenJDK. The changes that I have made this far have been to build files (Makefile/*.gmk/*.make). Using CACAO will not work out of the box on OS X. Michael On Wed, Apr 16, 2008 at 3:17 AM, Christian Thalinger < twisti at complang.tuwien.ac.at> wrote: > On Tue, 2008-04-15 at 19:24 -0400, Michael Franz wrote: > > Hi, > > > > I have been trying to figure out how to get past my latest build issue > > (OS X). > > Are there still any issues when building the JDK on Darwin? I'd like to > give it a try with CACAO as VM. > > - twisti > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080416/e42a9ed1/attachment.html From mvfranz at gmail.com Wed Apr 16 04:32:05 2008 From: mvfranz at gmail.com (Michael Franz) Date: Wed, 16 Apr 2008 07:32:05 -0400 Subject: Hotspot generated AD files In-Reply-To: <20080416064628.GA3499@redhat.com> References: <20080416064628.GA3499@redhat.com> Message-ID: Gary, Does that mean I can somehow skip this part of the build? If I can I would like too. Then come back later. Michael On Wed, Apr 16, 2008 at 2:46 AM, Gary Benson wrote: > Michael Franz wrote: > > I have been trying to figure out how to get past my latest build > > issue (OS X). > > hotspot/src/os_cpu/darwin_i486/vm/darwin_i486.ad', needed by > > `../generated/adfiles/darwin_i486.ad'. Stop. > > > > Anyone have any pointers? I have search the make files and have not > > been able to figure this one out. > > It's not a generated file, it's something you have to write yourself > if you want to port the server JIT. > > Cheers, > Gary > > -- > http://gbenson.net/ > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080416/0947591f/attachment.html From twisti at complang.tuwien.ac.at Wed Apr 16 04:37:22 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 16 Apr 2008 13:37:22 +0200 Subject: Hotspot generated AD files In-Reply-To: References: <1208330235.3848.0.camel@imac523d.theobroma-systems.com> Message-ID: <1208345842.3848.25.camel@imac523d.theobroma-systems.com> On Wed, 2008-04-16 at 07:30 -0400, Michael Franz wrote: > Twisti, > > Define issue. I have not been able to get OpenJDK to build on > Darwin/OS X. However the version of the JDK that is based off of the > research license does (I have not used that version). Details on > Soylatte can be found here > http://landonf.bikemonkey.org/static/soylatte/ > > My understanding is that Soylatte will eventually be merged into > OpenJDK. That would be nice. > > The changes that I have made this far have been to build files > (Makefile/*.gmk/*.make). I see. > > Using CACAO will not work out of the box on OS X. Crap. - twisti From gbenson at redhat.com Wed Apr 16 04:46:20 2008 From: gbenson at redhat.com (Gary Benson) Date: Wed, 16 Apr 2008 12:46:20 +0100 Subject: Hotspot generated AD files In-Reply-To: References: <20080416064628.GA3499@redhat.com> Message-ID: <20080416114620.GA6857@redhat.com> Michael Franz wrote: > On Wed, Apr 16, 2008 at 2:46 AM, Gary Benson wrote: > > Michael Franz wrote: > > > I have been trying to figure out how to get past my latest build > > > issue (OS X). > > > hotspot/src/os_cpu/darwin_i486/vm/darwin_i486.ad', needed by > > > `../generated/adfiles/darwin_i486.ad'. Stop. > > > > > > Anyone have any pointers? I have search the make files and have > > > not been able to figure this one out. > > > > It's not a generated file, it's something you have to write > > yourself if you want to port the server JIT. > > Does that mean I can somehow skip this part of the build? If I can > I would like too. Then come back later. The icedtea-core-build.patch (http://tinyurl.com/6hsqns) alters the build such that if ICEDTEA_CORE_BUILD is set then an interpreter-only JVM will be built. If you wait a couple of hours I'm hopefully about to commit an update to it, so if you're not in a rush then that one will be better for you. Cheers, Gary -- http://gbenson.net/ From gbenson at redhat.com Wed Apr 16 07:35:08 2008 From: gbenson at redhat.com (Gary Benson) Date: Wed, 16 Apr 2008 14:35:08 +0000 Subject: changeset in /hg/icedtea6: 2008-04-16 Gary Benson changeset 3f3dd2815005 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3f3dd2815005 description: 2008-04-16 Gary Benson * patches/icedtea-core-build.patch: Install libjvm.so in server rather than in core. * jvm.cfg.in: Updated with new libjvm.so location. diffstat: 3 files changed, 56 insertions(+), 192 deletions(-) ChangeLog | 6 jvm.cfg.in | 5 patches/icedtea-core-build.patch | 237 +++++++------------------------------- diffs (353 lines): diff -r fb0a7535db1f -r 3f3dd2815005 ChangeLog --- a/ChangeLog Tue Apr 15 10:44:43 2008 -0400 +++ b/ChangeLog Wed Apr 16 10:34:20 2008 -0400 @@ -1,3 +1,9 @@ 2008-04-15 Gary Benson + + * patches/icedtea-core-build.patch: Install libjvm.so in server + rather than in core. + * jvm.cfg.in: Updated with new libjvm.so location. + 2008-04-15 Gary Benson Yi Zhan diff -r fb0a7535db1f -r 3f3dd2815005 jvm.cfg.in --- a/jvm.cfg.in Tue Apr 15 10:44:43 2008 -0400 +++ b/jvm.cfg.in Wed Apr 16 10:34:20 2008 -0400 @@ -36,10 +36,9 @@ # "-XXaltjvm=" option, but that too is unsupported # and may not be available in a future release. # --core KNOWN --client IGNORE --server IGNORE +-server KNOWN -hotspot ERROR -classic WARN +-client IGNORE -native ERROR -green ERROR diff -r fb0a7535db1f -r 3f3dd2815005 patches/icedtea-core-build.patch --- a/patches/icedtea-core-build.patch Tue Apr 15 10:44:43 2008 -0400 +++ b/patches/icedtea-core-build.patch Wed Apr 16 10:34:20 2008 -0400 @@ -15,185 +15,51 @@ diff -u openjdk.orig/hotspot/build/linux diff -u openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make --- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2008-01-31 14:19:00.000000000 +0000 +++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-02-01 15:57:40.000000000 +0000 -@@ -93,6 +93,12 @@ - VM_DEBUG=jvmg - - EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html -+ifdef ICEDTEA_CORE_BUILD -+EXPORT_CORE_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/core -+EXPORT_LIST += $(EXPORT_CORE_DIR)/Xusage.txt -+EXPORT_LIST += $(EXPORT_CORE_DIR)/libjsig.so -+EXPORT_LIST += $(EXPORT_CORE_DIR)/libjvm.so -+else - EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server +@@ -97,6 +97,7 @@ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusa EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so -@@ -111,3 +117,4 @@ + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so ++ifndef ICEDTEA_CORE_BUILD + ifeq ($(ARCH_DATA_MODEL), 32) + EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt +@@ -111,3 +112,4 @@ else EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar endif endif +endif -diff -ru openjdk.orig/jdk/make/common/shared/Defs-linux.gmk openjdk/jdk/make/common/shared/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/shared/Defs-linux.gmk 2008-01-31 14:20:37.000000000 +0000 -+++ openjdk/jdk/make/common/shared/Defs-linux.gmk 2008-02-04 10:06:07.000000000 +0000 -@@ -202,3 +202,13 @@ - endif - HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH) - -+# HOTSPOT_CORE_PATH: location of core jvm library file. -+ifdef ICEDTEA_CORE_BUILD -+ ifdef ALT_HOTSPOT_CORE_PATH -+ HOTSPOT_CORE_PATH :=$(call FullPath,$(ALT_HOTSPOT_CORE_PATH)) -+ else -+ HOTSPOT_CORE_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/core -+ endif -+ HOTSPOT_CORE_PATH:=$(call AltCheckValue,HOTSPOT_CORE_PATH) -+endif -+ diff -ru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile --- openjdk.orig/jdk/make/java/redist/Makefile 2008-01-31 14:20:37.000000000 +0000 +++ openjdk/jdk/make/java/redist/Makefile 2008-02-04 10:11:04.000000000 +0000 -@@ -40,6 +40,7 @@ - - SERVER_LOCATION = server - CLIENT_LOCATION = client -+CORE_LOCATION = core - - DB_SUFFIX = _db - -@@ -67,8 +68,7 @@ - INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist - - # List of files coming from outside this workspace --IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \ -- $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt -+IMPORT_LIST = - - # INCLUDE_SA is false on platforms where SA is not supported. - # On platforms where it is supported, we want to allow it to -@@ -94,12 +94,42 @@ - endif +@@ -95,9 +95,11 @@ endif # INCLUDE_SA endif # INCLUDE_SA --# Hotspot client is only available on 32-bit builds --ifeq ($(ARCH_DATA_MODEL), 32) -+# Include the client VM on platforms where it is supported. -+INCLUDE_CLIENT := $(shell if [ -r $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME) ]; then \ -+ $(ECHO) true; \ -+ else \ -+ $(ECHO) false; \ -+ fi) -+ -+ifeq ($(INCLUDE_CLIENT), true) + # Hotspot client is only available on 32-bit builds ++ifndef ICEDTEA_CORE_BUILD + ifeq ($(ARCH_DATA_MODEL), 32) IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt ++endif endif -+# Include the server VM on platforms where it is supported. -+INCLUDE_SERVER := $(shell if [ -r $(HOTSPOT_SERVER_PATH)/$(JVM_NAME) ]; then \ -+ $(ECHO) true; \ -+ else \ -+ $(ECHO) false; \ -+ fi) -+ -+ifeq ($(INCLUDE_SERVER), true) -+ IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \ -+ $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt -+endif -+ -+# Include the core VM on platforms where it is supported. -+INCLUDE_CORE := $(shell if [ -r $(HOTSPOT_CORE_PATH)/$(JVM_NAME) ]; then \ -+ $(ECHO) true; \ -+ else \ -+ $(ECHO) false; \ -+ fi) -+ -+ifeq ($(INCLUDE_CORE), true) -+ IMPORT_LIST += $(LIB_LOCATION)/$(CORE_LOCATION)/$(JVM_NAME) \ -+ $(LIB_LOCATION)/$(CORE_LOCATION)/Xusage.txt -+endif -+ ifeq ($(PLATFORM), windows) - # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows - -@@ -122,8 +152,7 @@ - $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \ - $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME) - --# Hotspot client is only available on 32-bit builds --ifeq ($(ARCH_DATA_MODEL), 32) -+ifeq ($(INCLUDE_CLIENT), true) - IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \ - $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME) - endif -@@ -154,17 +183,25 @@ - # NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv NOT Windows - - IMPORT_LIST += \ -- $(LIB_LOCATION)/$(LIBJSIG_NAME) \ -- $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) -+ $(LIB_LOCATION)/$(LIBJSIG_NAME) - - ifeq ($(PLATFORM), solaris) +@@ -161,6 +163,7 @@ ifeq ($(PLATFORM), solaris) IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME) endif --ifeq ($(ARCH_DATA_MODEL), 32) -+ifeq ($(INCLUDE_CLIENT), true) -+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) -+endif ++ifndef ICEDTEA_CORE_BUILD + ifeq ($(ARCH_DATA_MODEL), 32) --IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) -+ifeq ($(INCLUDE_SERVER), true) -+ IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) -+endif + IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) +@@ -190,6 +193,8 @@ endif # 32bit solaris + endif # 32bit solaris + + endif # 32bit + -+ifeq ($(INCLUDE_CORE), true) -+ IMPORT_LIST += $(LIB_LOCATION)/$(CORE_LOCATION)/$(LIBJSIG_NAME) -+endif ++endif # ICEDTEA_CORE_BUILD -+ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), solaris) - # solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris + # NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows -@@ -198,11 +235,25 @@ - $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME) - $(install-import-file) - --$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_SERVER_PATH)/$(LIBJSIG_NAME) -+$(LIB_LOCATION)/$(CORE_LOCATION)/$(JVM_NAME): $(HOTSPOT_CORE_PATH)/$(JVM_NAME) -+ $(install-import-file) -+ -+ifeq ($(INCLUDE_SERVER), true) -+ LIBJSIG_IMPORT_PATH = $(HOTSPOT_SERVER_PATH) -+else -+ifeq ($(INCLUDE_CLIENT), true) -+ LIBJSIG_IMPORT_PATH = $(HOTSPOT_CLIENT_PATH) -+else -+ LIBJSIG_IMPORT_PATH = $(HOTSPOT_CORE_PATH) -+endif -+endif -+ -+$(LIB_LOCATION)/$(LIBJSIG_NAME): $(LIBJSIG_IMPORT_PATH)/$(LIBJSIG_NAME) - $(install-import-file) - - $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \ --$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME): -+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) \ -+$(LIB_LOCATION)/$(CORE_LOCATION)/$(LIBJSIG_NAME): - @$(prep-target) - $(LN) -s ../$(LIBJSIG_NAME) $@ - -@@ -227,6 +278,9 @@ - $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.txt - $(install-import-file) - -+$(LIB_LOCATION)/$(CORE_LOCATION)/Xusage.txt : $(HOTSPOT_CORE_PATH)/Xusage.txt -+ $(install-import-file) -+ - ifeq ($(INCLUDE_SA), true) - # The Serviceability Agent is built in the Hotspot workspace. - # It contains two files: diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk --- openjdk.orig/jdk/make/common/Defs-linux.gmk 2007-11-08 11:35:35.000000000 +0000 +++ openjdk/jdk/make/common/Defs-linux.gmk 2007-11-08 11:36:15.000000000 +0000 @@ -228,9 +94,10 @@ diff -ru openjdk.orig/corba/make/common/ JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) ---- penjdk6//hotspot/make/Makefile 2008-02-12 04:14:16.000000000 -0500 -+++ openjdk/hotspot/make/Makefile 2008-02-14 17:37:48.000000000 -0500 -@@ -90,6 +90,15 @@ +diff -r 79d639c8a75f openjdk/hotspot/make/Makefile +--- openjdk/hotspot/make/Makefile Wed Apr 16 08:42:01 2008 +0100 ++++ openjdk/hotspot/make/Makefile Wed Apr 16 08:49:31 2008 +0100 +@@ -90,6 +90,15 @@ all_debug: jvmg jvmg1 docs export_de all_debug: jvmg jvmg1 docs export_debug all_optimized: optimized optimized1 docs export_optimized @@ -246,49 +113,51 @@ diff -ru openjdk.orig/corba/make/common/ # Do everything world: all create_jdk -@@ -112,6 +121,10 @@ +@@ -111,6 +120,10 @@ endif + $(C2_VM_TARGETS): $(CD) $(GAMMADIR)/make; \ $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT) - ++ +$(CORE_VM_TARGETS): + $(CD) $(GAMMADIR)/make; \ + $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT) -+ + # Build compiler1 (client) rule, different for platforms generic_build1: - $(MKDIR) -p $(OUTPUTDIR) -@@ -154,6 +167,12 @@ +@@ -153,6 +166,12 @@ else + $(MAKE) -f $(ABS_OS_MAKEFILE) \ $(MAKE_ARGS) $(VM_TARGET) endif - ++ +generic_buildcore: + $(MKDIR) -p $(OUTPUTDIR) + $(CD) $(OUTPUTDIR); \ + $(MAKE) -f $(ABS_OS_MAKEFILE) \ + $(MAKE_ARGS) $(VM_TARGET) -+ + # Export file rule generic_export: $(EXPORT_LIST) - export_product: -@@ -183,10 +202,16 @@ +@@ -182,11 +201,19 @@ XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt + XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 ++ifdef ICEDTEA_CORE_BUILD ++C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core ++else C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 -+CORE_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core ++endif C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) -+CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR) --# Misc files and generated files need to come from C1 or C2 area -+# Misc files and generated files need to come from the correct area + # Misc files and generated files need to come from C1 or C2 area +ifdef ICEDTEA_CORE_BUILD -+ MISC_DIR=$(CORE_DIR) -+ GEN_DIR=$(CORE_BASE_DIR)/generated ++ MISC_DIR=$(C2_DIR) ++ GEN_DIR=$(C2_BASE_DIR)/generated +else ifeq ($(ARCH_DATA_MODEL), 32) MISC_DIR=$(C1_DIR) GEN_DIR=$(C1_BASE_DIR)/generated -@@ -194,6 +219,7 @@ +@@ -194,6 +221,7 @@ else MISC_DIR=$(C2_DIR) GEN_DIR=$(C2_BASE_DIR)/generated endif @@ -296,26 +165,16 @@ diff -ru openjdk.orig/corba/make/common/ # Bin files (windows) ifeq ($(OSNAME),windows) -@@ -231,6 +257,10 @@ - ifneq ($(OSNAME),windows) - $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so - $(install-file) -+$(EXPORT_CORE_DIR)/%.so: $(CORE_DIR)/%.so -+ $(install-file) -+$(EXPORT_CORE_DIR)/64/%.so: $(CORE_DIR)/%.so -+ $(install-file) - $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so - $(install-file) - $(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so -@@ -264,6 +294,7 @@ +@@ -264,6 +292,7 @@ endif # Xusage file $(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt: $(XUSAGE) -+$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt $(EXPORT_CORE_DIR)/Xusage.txt: $(XUSAGE) ++$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE) $(prep-target) $(RM) $@.temp $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp ---- penjdk6/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-12 04:14:24.000000000 -0500 +diff -r 79d639c8a75f openjdk/hotspot/src/share/vm/runtime/vm_version.cpp +--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-12 04:14:24.000000000 -0500 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-14 17:39:45.000000000 -0500 @@ -92,8 +92,12 @@ #ifdef TIERED From aph at redhat.com Wed Apr 16 08:46:41 2008 From: aph at redhat.com (Andrew Haley) Date: Wed, 16 Apr 2008 15:46:41 +0000 Subject: changeset in /hg/icedtea6: ARM atomic primitives. Message-ID: changeset 82d528d417a5 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=82d528d417a5 description: ARM atomic primitives. diffstat: 1 file changed, 56 insertions(+), 15 deletions(-) ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 71 +++++++--- diffs (88 lines): diff -r 3f3dd2815005 -r 82d528d417a5 ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp --- a/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Wed Apr 16 10:34:20 2008 -0400 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Wed Apr 16 16:46:37 2008 +0100 @@ -26,28 +26,69 @@ // Implementation of class atomic #ifdef ARM + +/* + * __kernel_cmpxchg + * + * Atomically store newval in *ptr if *ptr is equal to oldval for user space. + * Return zero if *ptr was changed or non-zero if no exchange happened. + * The C flag is also set if *ptr was changed to allow for assembly + * optimization in the calling code. + * + */ + typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); #define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0) + + +/* Perform an atomic compare and swap: if the current value of `*PTR' + is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of + `*PTR' before the operation.*/ static inline int arm_compare_and_swap(volatile int *ptr, int oldval, - int newval) { - int old = *ptr; - __kernel_cmpxchg(oldval, newval, (volatile int*) ptr); - return old; -} - -static inline int arm_add_and_fetch(volatile int *dest, int add_value) -{ - arm_compare_and_swap(dest, *dest, *dest + add_value); - return *dest; -} - + int newval) +{ + for (;;) + { + int prev = *ptr; + if (prev != oldval) + return prev; + + if (__kernel_cmpxchg (prev, newval, ptr) == 0) + // Success. + return prev; + + // We failed even though prev == oldval. Try again. + } +} + +/* Atomically add an int to memory. */ +static inline int arm_add_and_fetch(volatile int *ptr, int add_value) +{ + for (;;) + { + // Loop until a __kernel_cmpxchg succeeds. + + int prev = *ptr; + + if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0) + return prev + add_value; + } +} + +/* Atomically write VALUE into `*PTR' and returns the previous + contents of `*PTR'. */ static inline int arm_lock_test_and_set(volatile int *ptr, int newval) { - int old = *ptr; - arm_compare_and_swap(ptr, *ptr, newval); - return old; + for (;;) + { + // Loop until a __kernel_cmpxchg succeeds. + int prev = *ptr; + + if (__kernel_cmpxchg (prev, newval, ptr) == 0) + return prev; + } } #endif // ARM From aph at redhat.com Wed Apr 16 09:36:02 2008 From: aph at redhat.com (Andrew Haley) Date: Wed, 16 Apr 2008 16:36:02 +0000 Subject: changeset in /hg/icedtea6: 2008-04-16 Andrew Haley changeset 698de8663419 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=698de8663419 description: 2008-04-16 Andrew Haley * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp (arm_add_and_fetch, arm_lock_test_and_set, arm_compare_and_swap): Rewrite. diffstat: 1 file changed, 6 insertions(+) ChangeLog | 6 ++++++ diffs (13 lines): diff -r 82d528d417a5 -r 698de8663419 ChangeLog --- a/ChangeLog Wed Apr 16 16:46:37 2008 +0100 +++ b/ChangeLog Wed Apr 16 17:35:57 2008 +0100 @@ -1,3 +1,9 @@ 2008-04-16 Gary Benson + + * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp + (arm_add_and_fetch, arm_lock_test_and_set, arm_compare_and_swap): + Rewrite. + 2008-04-16 Gary Benson * patches/icedtea-core-build.patch: Install libjvm.so in server From keiths at redhat.com Wed Apr 16 13:29:59 2008 From: keiths at redhat.com (Keith Seitz) Date: Wed, 16 Apr 2008 20:29:59 +0000 Subject: changeset in /hg/icedtea6: * patches/icedtea-LCMS-setTagData.pat... Message-ID: changeset 7e52c573125f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7e52c573125f description: * patches/icedtea-LCMS-setTagData.patch: New file. * patches/icedtea-color-createcontext.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Add above patches. * Makefile.in: Regenerated. diffstat: 4 files changed, 337 insertions(+), 1 deletion(-) Makefile.am | 2 Makefile.in | 4 patches/icedtea-LCMS-setTagData.patch | 296 +++++++++++++++++++++++++++++ patches/icedtea-color-createcontext.patch | 36 +++ diffs (366 lines): diff -r 698de8663419 -r 7e52c573125f Makefile.am --- a/Makefile.am Wed Apr 16 17:35:57 2008 +0100 +++ b/Makefile.am Wed Apr 16 11:55:40 2008 -0700 @@ -296,6 +296,8 @@ ICEDTEA_PATCHES = \ patches/icedtea-xinerama.patch \ patches/icedtea-arm-uname.patch \ patches/icedtea-ia64-fdlibm.patch \ + patches/icedtea-LCMS-setTagData.patch \ + patches/icedtea-color-createcontext.patch \ $(GCC_PATCH) \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r 698de8663419 -r 7e52c573125f Makefile.in --- a/Makefile.in Wed Apr 16 17:35:57 2008 +0100 +++ b/Makefile.in Wed Apr 16 11:55:40 2008 -0700 @@ -403,7 +403,9 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \ - patches/icedtea-ia64-fdlibm.patch $(GCC_PATCH) \ + patches/icedtea-ia64-fdlibm.patch \ + patches/icedtea-LCMS-setTagData.patch \ + patches/icedtea-color-createcontext.patch $(GCC_PATCH) \ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5) # Patch OpenJDK for plug replacements and ecj. diff -r 698de8663419 -r 7e52c573125f patches/icedtea-LCMS-setTagData.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-LCMS-setTagData.patch Wed Apr 16 11:55:40 2008 -0700 @@ -0,0 +1,296 @@ +*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h.orig 2008-04-11 19:17:54.000000000 -0700 +--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h 2008-04-11 19:19:48.000000000 -0700 +*************** LCMSAPI BOOL LCMSEXPORT _cmsSaveProfile( +*** 1244,1250 **** + LCMSAPI BOOL LCMSEXPORT _cmsSaveProfileToMem(cmsHPROFILE hProfile, void *MemPtr, + size_t* BytesNeeded); + +! + + // PostScript ColorRenderingDictionary and ColorSpaceArray + +--- 1244,1251 ---- + LCMSAPI BOOL LCMSEXPORT _cmsSaveProfileToMem(cmsHPROFILE hProfile, void *MemPtr, + size_t* BytesNeeded); + +! // Modify data for a tag in a profile +! LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size); + + // PostScript ColorRenderingDictionary and ColorSpaceArray + +*************** typedef struct _lcms_iccprofile_struct { +*** 1838,1843 **** +--- 1839,1845 ---- + BOOL (* Seek)(struct _lcms_iccprofile_struct* Icc, size_t offset); + BOOL (* Close)(struct _lcms_iccprofile_struct* Icc); + size_t (* Tell)(struct _lcms_iccprofile_struct* Icc); ++ BOOL (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount); + + // Writting + +*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c.orig 2008-04-11 19:18:43.000000000 -0700 +--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c 2008-04-11 19:19:48.000000000 -0700 +*************** JNIEXPORT void JNICALL Java_sun_java2d_c +*** 347,353 **** + JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagData + (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data) + { +! fprintf(stderr, "setTagData operation is not implemented"); + } + + void* getILData (JNIEnv *env, jobject img, jint* pDataType, +--- 347,368 ---- + JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagData + (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data) + { +! cmsHPROFILE profile; +! storeID_t sProf; +! jbyte* dataArray; +! int tagSize; +! +! if (tagSig == SigHead) { +! fprintf(stderr, "setTagData on icSigHead not permitted"); +! return; +! } +! +! sProf.j = id; +! profile = (cmsHPROFILE) sProf.pf; +! dataArray = (*env)->GetByteArrayElements(env, data, 0); +! tagSize =(*env)->GetArrayLength(env, data); +! _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize); +! (*env)->ReleaseByteArrayElements(env, data, dataArray, 0); + } + + void* getILData (JNIEnv *env, jobject img, jint* pDataType, +*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c.orig 2008-04-11 19:17:54.000000000 -0700 +--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2008-04-11 19:19:48.000000000 -0700 +*************** BOOL MemoryWrite(struct _lcms_iccprofile +*** 157,164 **** + if (size == 0) return TRUE; + + if (ResData != NULL) +! CopyMemory(ResData ->Block + Icc ->UsedSpace, Ptr, size); + + Icc->UsedSpace += size; + + return TRUE; +--- 157,165 ---- + if (size == 0) return TRUE; + + if (ResData != NULL) +! CopyMemory(ResData ->Block + ResData ->Pointer, Ptr, size); + ++ ResData->Pointer += size; + Icc->UsedSpace += size; + + return TRUE; +*************** BOOL MemoryWrite(struct _lcms_iccprofile +*** 166,171 **** +--- 167,184 ---- + + + static ++ BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size) ++ { ++ FILEMEM* ResData = (FILEMEM*) Icc->stream; ++ ResData->Size += size; ++ ResData->Block = realloc(ResData->Block, ResData->Size); ++ if (!ResData->Block) ++ return FALSE; ++ return TRUE; ++ } ++ ++ ++ static + BOOL MemoryClose(struct _lcms_iccprofile_struct* Icc) + { + FILEMEM* ResData = (FILEMEM*) Icc ->stream; +*************** BOOL FileWrite(struct _lcms_iccprofile_s +*** 239,244 **** +--- 252,264 ---- + + + static ++ BOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size) ++ { ++ return TRUE; ++ } ++ ++ ++ static + BOOL FileClose(struct _lcms_iccprofile_struct* Icc) + { + return fclose((FILE*) Icc ->stream); +*************** LPLCMSICCPROFILE _cmsCreateProfileFromFi +*** 382,387 **** +--- 402,408 ---- + NewIcc ->Seek = FileSeek; + NewIcc ->Tell = FileTell; + NewIcc ->Close = FileClose; ++ NewIcc ->Grow = FileGrow; + NewIcc ->Write = NULL; + + NewIcc ->IsWrite = FALSE; +*************** LPLCMSICCPROFILE _cmsCreateProfileFromMe +*** 419,425 **** + NewIcc ->Seek = MemorySeek; + NewIcc ->Tell = MemoryTell; + NewIcc ->Close = MemoryClose; +! NewIcc ->Write = NULL; + + NewIcc ->IsWrite = FALSE; + +--- 440,447 ---- + NewIcc ->Seek = MemorySeek; + NewIcc ->Tell = MemoryTell; + NewIcc ->Close = MemoryClose; +! NewIcc ->Grow = MemoryGrow; +! NewIcc ->Write = MemoryWrite; + + NewIcc ->IsWrite = FALSE; + +*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c.orig 2008-04-11 19:17:54.000000000 -0700 +--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2008-04-11 19:19:48.000000000 -0700 +*************** CleanUp: +*** 3661,3663 **** +--- 3661,3800 ---- + CopyMemory(Icc, &Keep, sizeof(LCMSICCPROFILE)); + return FALSE; + } ++ ++ BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, ++ void *data, size_t size) ++ { ++ BOOL isNew; ++ int i, idx, delta, count; ++ LPBYTE padChars[3] = {0, 0, 0}; ++ LPBYTE beforeBuf, afterBuf, ptr; ++ size_t beforeSize, afterSize; ++ icUInt32Number profileSize, temp; ++ LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile; ++ ++ isNew = FALSE; ++ idx = _cmsSearchTag(Icc, sig, FALSE); ++ if (idx < 0) ++ { ++ isNew = TRUE; ++ idx = Icc->TagCount++; ++ if (Icc->TagCount >= MAX_TABLE_TAG) ++ { ++ fprintf(stderr, "Too many tags (%d)\n", Icc->TagCount); ++ Icc->TagCount = MAX_TABLE_TAG-1; ++ return FALSE; ++ } ++ } ++ ++ /* Read in size from header */ ++ Icc->Seek(Icc, 0); ++ Icc->Read(&profileSize, sizeof(icUInt32Number), 1, Icc); ++ AdjustEndianess32((LPBYTE) &profileSize); ++ ++ /* Compute the change in profile size */ ++ if (isNew) ++ delta = sizeof(icTag) + ALIGNLONG(size); ++ else ++ delta = ALIGNLONG(size) - ALIGNLONG(Icc->TagSizes[idx]); ++ ++ /* Add tag to internal structures */ ++ ptr = malloc(size); ++ CopyMemory(ptr, data, size); ++ Icc->TagSizes[idx] = size; ++ Icc->TagNames[idx] = sig; ++ if (Icc->TagPtrs[idx]) ++ free(Icc->TagPtrs[idx]); ++ Icc->TagPtrs[idx] = ptr; ++ if (isNew) ++ Icc->TagOffsets[idx] = profileSize; ++ ++ /* Compute size of tag data before/after the modified tag */ ++ beforeSize = Icc->TagOffsets[idx] - Icc->TagOffsets[0]; ++ if (Icc->TagCount == (idx + 1)) ++ afterSize = 0; ++ else ++ afterSize = profileSize - Icc->TagOffsets[idx+1]; ++ ++ /* Make copies of the data before/after the modified tag */ ++ if (beforeSize > 0) ++ { ++ beforeBuf = malloc(beforeSize); ++ Icc->Seek(Icc, Icc->TagOffsets[0]); ++ Icc->Read(beforeBuf, beforeSize, 1, Icc); ++ } ++ ++ if (afterSize > 0) ++ { ++ afterBuf = malloc(afterSize); ++ Icc->Seek(Icc, Icc->TagOffsets[idx+1]); ++ Icc->Read(afterBuf, afterSize, 1, Icc); ++ } ++ ++ /* Update the profile size in the header */ ++ profileSize += delta; ++ Icc->Seek(Icc, 0); ++ temp = TransportValue32(profileSize); ++ Icc->Write(Icc, sizeof(icUInt32Number), &temp); ++ ++ Icc->Grow(Icc, delta); ++ ++ /* Adjust tag offsets: if the tag is new, we must account ++ for the new tag table entry; otherwise, only those tags after ++ the modified tag are changed (by delta) */ ++ if (isNew) ++ { ++ for (i = 0; i < Icc->TagCount; ++i) ++ Icc->TagOffsets[i] += sizeof(icTag); ++ } ++ else ++ { ++ for (i = idx+1; i < Icc->TagCount; ++i) ++ Icc->TagOffsets[i] += delta; ++ } ++ ++ /* Write out a new tag table */ ++ count = 0; ++ for (i = 0; i < Icc->TagCount; ++i) ++ { ++ if (Icc->TagNames[i] != 0) ++ ++count; ++ } ++ Icc->Seek(Icc, sizeof(icHeader)); ++ temp = TransportValue32(count); ++ Icc->Write(Icc, sizeof(icUInt32Number), &temp); ++ ++ for (i = 0; i < Icc->TagCount; ++i) ++ { ++ if (Icc->TagNames[i] != 0) ++ { ++ icTag tag; ++ tag.sig = TransportValue32(Icc->TagNames[i]); ++ tag.offset = TransportValue32((icInt32Number) Icc->TagOffsets[i]); ++ tag.size = TransportValue32((icInt32Number) Icc->TagSizes[i]); ++ Icc->Write(Icc, sizeof(icTag), &tag); ++ } ++ } ++ ++ /* Write unchanged data before the modified tag */ ++ if (beforeSize > 0) ++ { ++ Icc->Write(Icc, beforeSize, beforeBuf); ++ free(beforeBuf); ++ } ++ ++ /* Write modified tag data */ ++ Icc->Write(Icc, size, data); ++ if (size % 4) ++ Icc->Write(Icc, 4 - (size % 4), padChars); ++ ++ /* Write unchanged data after the modified tag */ ++ if (afterSize > 0) ++ { ++ Icc->Write(Icc, afterSize, afterBuf); ++ free(afterBuf); ++ } ++ ++ return TRUE; ++ } ++ diff -r 698de8663419 -r 7e52c573125f patches/icedtea-color-createcontext.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-color-createcontext.patch Wed Apr 16 11:55:40 2008 -0700 @@ -0,0 +1,36 @@ +*** openjdk/jdk/src/share/classes/java/awt/Color.java.orig 2008-04-02 17:12:00.000000000 -0700 +--- openjdk/jdk/src/share/classes/java/awt/Color.java 2008-04-02 17:29:29.000000000 -0700 +*************** public class Color implements Paint, jav +*** 251,256 **** +--- 251,262 ---- + */ + private ColorSpace cs = null; + ++ /** ++ * The PaintContext for this solid color. ++ * @see #createContext ++ */ ++ private transient PaintContext context; ++ + /* + * JDK 1.1 serialVersionUID + */ +*************** public class Color implements Paint, jav +*** 1205,1211 **** + Rectangle2D r2d, + AffineTransform xform, + RenderingHints hints) { +! return new ColorPaintContext(getRGB(), cm); + } + + /** +--- 1211,1219 ---- + Rectangle2D r2d, + AffineTransform xform, + RenderingHints hints) { +! if (context == null || !context.getColorModel().equals(cm)) +! context = new ColorPaintContext(getRGB(), cm); +! return context; + } + + /** From keiths at redhat.com Wed Apr 16 13:30:02 2008 From: keiths at redhat.com (Keith Seitz) Date: Wed, 16 Apr 2008 20:30:02 +0000 Subject: changeset in /hg/icedtea6: * patches/icedtea-LCMS-setTagData.pat... Message-ID: changeset c8221da6f9eb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c8221da6f9eb description: * patches/icedtea-LCMS-setTagData.patch: New file. * patches/icedtea-color-createcontext.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Add above patches. * Makefile.in: Regenerated. diffstat: 1 file changed, 7 insertions(+) ChangeLog | 7 +++++++ diffs (14 lines): diff -r 7e52c573125f -r c8221da6f9eb ChangeLog --- a/ChangeLog Wed Apr 16 11:55:40 2008 -0700 +++ b/ChangeLog Wed Apr 16 12:08:12 2008 -0700 @@ -1,3 +1,10 @@ 2008-04-16 Andrew Haley + + * patches/icedtea-LCMS-setTagData.patch: New file. + * patches/icedtea-color-createcontext.patch: New file. + * Makefile.am (ICEDTEA_PATCHES): Add above patches. + * Makefile.in: Regenerated. + 2008-04-16 Andrew Haley * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp From David.Herron at Sun.COM Wed Apr 16 13:34:57 2008 From: David.Herron at Sun.COM (David Herron) Date: Wed, 16 Apr 2008 13:34:57 -0700 Subject: [Fwd: DLJ bundles fur 6u6] Message-ID: <480662F1.9020400@sun.com> -------------- next part -------------- An embedded message was scrubbed... From: David Herron Subject: DLJ bundles fur 6u6 Date: Wed, 16 Apr 2008 10:49:35 -0700 Size: 6019 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080416/4f9e7b31/attachment.nws From mvfranz at gmail.com Wed Apr 16 18:51:18 2008 From: mvfranz at gmail.com (Michael Franz) Date: Wed, 16 Apr 2008 21:51:18 -0400 Subject: Hotspot generated AD files In-Reply-To: <20080416114620.GA6857@redhat.com> References: <20080416064628.GA3499@redhat.com> <20080416114620.GA6857@redhat.com> Message-ID: > The icedtea-core-build.patch (http://tinyurl.com/6hsqns) alters the > build such that if ICEDTEA_CORE_BUILD is set then an interpreter-only > JVM will be built. If you wait a couple of hours I'm hopefully about > to commit an update to it, so if you're not in a rush then that one > will be better for you. > > Cheers, > Gary > > -- > http://gbenson.net/ > I think I can wait. :) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080416/d0c8fc82/attachment.html From aph at redhat.com Thu Apr 17 01:24:03 2008 From: aph at redhat.com (Andrew Haley) Date: Thu, 17 Apr 2008 09:24:03 +0100 Subject: icedtea zero ARM atomic patch In-Reply-To: <20080409074646.GA3685@redhat.com> References: <47F4E529.50001@zafena.se> <20080409074646.GA3685@redhat.com> Message-ID: <48070923.8010305@redhat.com> Gary Benson wrote: > Xerxes R?nby wrote: >> Here is a patch for the ARM zero port to deal with missing atomic >> operations in the ARM hardware, here implemented using linux- >> kernelcalls. With this patch the zero hotspot and bootstrap-ecj >> part of icedtea6 do compile on ARM targets. > > I committed a reworked version of the first part of this patch. > I've left the second part out as I don't think it's used -- you'll > get an "unimplemented" message if it is. > > FWIW I'm not entirely convinced that the arm-specific functions > are doing what they ought; arm_add_and_fetch and arm_lock_test_and_set > seem to be dereferencing a volatile pointer twice, which doesn't seem > atomic to me. But then I'm not great at this stuff either :) I committed my versions of these functions. I'm convinced they're correct, but the ARM zero port still isn't stable. I think the problem must lie elsewhere, but I'm not sure what it might be. Andrew. From gnu_andrew at member.fsf.org Thu Apr 17 01:31:53 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 17 Apr 2008 09:31:53 +0100 Subject: Hotspot generated AD files In-Reply-To: <1208345842.3848.25.camel@imac523d.theobroma-systems.com> References: <1208330235.3848.0.camel@imac523d.theobroma-systems.com> <1208345842.3848.25.camel@imac523d.theobroma-systems.com> Message-ID: <17c6771e0804170131s559dd16ao7c16282576663d88@mail.gmail.com> On 16/04/2008, Christian Thalinger wrote: > On Wed, 2008-04-16 at 07:30 -0400, Michael Franz wrote: > > Twisti, > > > > Define issue. I have not been able to get OpenJDK to build on > > Darwin/OS X. However the version of the JDK that is based off of the > > research license does (I have not used that version). Details on > > Soylatte can be found here > > http://landonf.bikemonkey.org/static/soylatte/ > > > > My understanding is that Soylatte will eventually be merged into > > OpenJDK. > > > That would be nice. > > It will. Soylatte is not just the straight JRL JDK, as I understand it, but with a number of BSD patches that have been developed over time (the BSD port on which it's based goes back years). The work required is basically to relicense these patches and apply them to the OpenJDK. > > > > Using CACAO will not work out of the box on OS X. > > > Crap. > > - twisti > > Is there an explicit reason for this? I think twisti suggested it because it would avoid having to build HotSpot, which was the source of your problems. -- Andrew :-) 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 twisti at complang.tuwien.ac.at Thu Apr 17 06:08:25 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Thu, 17 Apr 2008 15:08:25 +0200 Subject: Hotspot generated AD files In-Reply-To: <17c6771e0804170131s559dd16ao7c16282576663d88@mail.gmail.com> References: <1208330235.3848.0.camel@imac523d.theobroma-systems.com> <1208345842.3848.25.camel@imac523d.theobroma-systems.com> <17c6771e0804170131s559dd16ao7c16282576663d88@mail.gmail.com> Message-ID: <1208437705.5264.8.camel@imac523d.theobroma-systems.com> On Thu, 2008-04-17 at 09:31 +0100, Andrew John Hughes wrote: > Is there an explicit reason for this? I think twisti suggested it > because it would avoid having to build HotSpot, which was the source > of your problems. Andrew got the point. Does a JDK-only build work? - twisti From jsumali at redhat.com Thu Apr 17 10:22:37 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Thu, 17 Apr 2008 17:22:37 +0000 Subject: changeset in /hg/icedtea6: 2008-04-17 Joshua Sumali changeset 3afc6a459636 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3afc6a459636 description: 2008-04-17 Joshua Sumali * rt/net/sourceforge/jnlp/Launcher.java: Fix applet focusing bug. diffstat: 2 files changed, 6 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ rt/net/sourceforge/jnlp/Launcher.java | 3 ++- diffs (24 lines): diff -r c8221da6f9eb -r 3afc6a459636 ChangeLog --- a/ChangeLog Wed Apr 16 12:08:12 2008 -0700 +++ b/ChangeLog Thu Apr 17 13:22:10 2008 -0400 @@ -1,3 +1,7 @@ 2008-04-16 Keith Seitz + + * rt/net/sourceforge/jnlp/Launcher.java: Fix applet focusing bug. + 2008-04-16 Keith Seitz * patches/icedtea-LCMS-setTagData.patch: New file. diff -r c8221da6f9eb -r 3afc6a459636 rt/net/sourceforge/jnlp/Launcher.java --- a/rt/net/sourceforge/jnlp/Launcher.java Wed Apr 16 12:08:12 2008 -0700 +++ b/rt/net/sourceforge/jnlp/Launcher.java Thu Apr 17 13:22:10 2008 -0400 @@ -551,7 +551,8 @@ public class Launcher { public void run() { try { - if (context) + // Do not create new AppContext if we're using NetX and gcjwebplugin. + if (context && !isPlugin) new Reflect().invokeStatic("sun.awt.SunToolkit", "createNewAppContext"); if (isPlugin) { From jsumali at redhat.com Thu Apr 17 14:04:23 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Thu, 17 Apr 2008 21:04:23 +0000 Subject: changeset in /hg/icedtea6: 2008-04-17 Joshua Sumali changeset 7a015d5c9cb1 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7a015d5c9cb1 description: 2008-04-17 Joshua Sumali * configure: Regenerated. * configure.ac: Bump version number to 1.2. diffstat: 3 files changed, 17 insertions(+), 12 deletions(-) ChangeLog | 5 +++++ configure | 22 +++++++++++----------- configure.ac | 2 +- diffs (116 lines): diff -r 3afc6a459636 -r 7a015d5c9cb1 ChangeLog --- a/ChangeLog Thu Apr 17 13:22:10 2008 -0400 +++ b/ChangeLog Thu Apr 17 17:04:16 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-17 Joshua Sumali + + * configure: Regenerated. + * configure.ac: Bump version number to 1.2. + 2008-04-17 Joshua Sumali * rt/net/sourceforge/jnlp/Launcher.java: Fix applet focusing bug. diff -r 3afc6a459636 -r 7a015d5c9cb1 configure --- a/configure Thu Apr 17 13:22:10 2008 -0400 +++ b/configure Thu Apr 17 17:04:16 2008 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for icedtea6 1.1. +# Generated by GNU Autoconf 2.61 for icedtea6 1.2. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='icedtea6' PACKAGE_TARNAME='icedtea6' -PACKAGE_VERSION='1.1' -PACKAGE_STRING='icedtea6 1.1' +PACKAGE_VERSION='1.2' +PACKAGE_STRING='icedtea6 1.2' PACKAGE_BUGREPORT='fitzsim at redhat.com' ac_default_prefix=bootstrap @@ -1343,7 +1343,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea6 1.1 to adapt to many kinds of systems. +\`configure' configures icedtea6 1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1413,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea6 1.1:";; + short | recursive ) echo "Configuration of icedtea6 1.2:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea6 configure 1.1 +icedtea6 configure 1.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1586,7 +1586,7 @@ This file contains any messages produced This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea6 $as_me 1.1, which was +It was created by icedtea6 $as_me 1.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2276,7 +2276,7 @@ fi # Define the identity of the package. PACKAGE='icedtea6' - VERSION='1.1' + VERSION='1.2' cat >>confdefs.h <<_ACEOF @@ -12582,7 +12582,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea6 $as_me 1.1, which was +This file was extended by icedtea6 $as_me 1.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12629,7 +12629,7 @@ _ACEOF _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -icedtea6 config.status 1.1 +icedtea6 config.status 1.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -13353,7 +13353,7 @@ echo "$as_me: executing $ac_file command # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ diff -r 3afc6a459636 -r 7a015d5c9cb1 configure.ac --- a/configure.ac Thu Apr 17 13:22:10 2008 -0400 +++ b/configure.ac Thu Apr 17 17:04:16 2008 -0400 @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) AC_PREREQ([2.61]) -AC_INIT([icedtea6], [1.1], [fitzsim at redhat.com]) +AC_INIT([icedtea6], [1.2], [fitzsim at redhat.com]) AM_INIT_AUTOMAKE([tar-pax]) AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST From doko at ubuntu.com Fri Apr 18 15:20:28 2008 From: doko at ubuntu.com (Matthias Klose) Date: Sat, 19 Apr 2008 00:20:28 +0200 Subject: openjdk-6_6b08-1_i386.changes REJECTED In-Reply-To: References: Message-ID: <48091EAC.3050104@ubuntu.com> Thomas Viehmann schrieb: > Hi, > > I'm afraid that openjdk-6 still needs some work: thanks for looking into this. after the second try to upload and 10 days in the NEW queue the review is a bit terse. > Up to now I found: > - The debian/copyright file seems to miss a lot of > copyright notices (e.g. of Red Hat, Maxwell, ASF, > I stopped after finding four). This is the main > reject reason. it would be helpful if you could mention those. it would be appreciated if you could act proactively. > - There are some files in the generated subdir that > I'm not sure I found the source of. Could you > clarify this a bit for me? which files? Sorry, I really dislike rejecting a package for clarification reasons. You can ask if you are unsure. > - usr-share-doc-symlink-without-dependency > is an explicit policy violation and not allowed. please be specific. or this lintian not detecting indirect dependencies? > While you're doing stuff, you could also get rid of > - substvar-source-version-is-deprecated thanks for the hint, but this doesn't belong into a reject message. Matthias From joerg at debian.org Fri Apr 18 16:32:56 2008 From: joerg at debian.org (Joerg Jaspert) Date: Sat, 19 Apr 2008 01:32:56 +0200 Subject: openjdk-6_6b08-1_i386.changes REJECTED In-Reply-To: <48091EAC.3050104@ubuntu.com> (Matthias Klose's message of "Sat\, 19 Apr 2008 00\:20\:28 +0200") References: <48091EAC.3050104@ubuntu.com> Message-ID: <87hcdy20yf.fsf@vorlon.ganneff.de> On 11360 March 1977, Matthias Klose wrote: >> While you're doing stuff, you could also get rid of >> - substvar-source-version-is-deprecated > thanks for the hint, but this doesn't belong into a reject message. It sure does not warrant an own mail and fits perfectly well if one is writing anyways. It is a nice and added reminder. If you read the text you see that its written "while you are doing stuff" and sure not the reject reason. Take it as added service/value... -- bye, Joerg Yeah, patching debian/rules sounds like changing shoes while running the 100 meters track. -- Michael Koch From doko at ubuntu.com Sat Apr 19 03:38:10 2008 From: doko at ubuntu.com (Matthias Klose) Date: Sat, 19 Apr 2008 12:38:10 +0200 Subject: openjdk-6_6b08-1_i386.changes REJECTED In-Reply-To: <4809AF43.6030407@beamnet.de> References: <48091EAC.3050104@ubuntu.com> (sfid-20080419_002037_846378_260EF41D65031224) <4809AF43.6030407@beamnet.de> Message-ID: <4809CB92.2020409@ubuntu.com> Thomas Viehmann schrieb: > Hi, > > Matthias Klose wrote: >> thanks for looking into this. after the second try to upload and 10 >> days in the >> NEW queue the review is a bit terse. >> >>> Up to now I found: >>> - The debian/copyright file seems to miss a lot of >>> copyright notices (e.g. of Red Hat, Maxwell, ASF, >>> I stopped after finding four). This is the main >>> reject reason. > >> it would be helpful if you could mention those. it would be >> appreciated if you >> could act proactively. > > Quite frankly, all of those that I found can be found by > find -type f | xargs -d '\n' grep -i copyright > (of course, be sure to untar at least the tar-archive before that, for > bonus points check that you don't have other archives that want unpacking). > Yes, there are a lot of false positives with that grep and you can do > all sorts of post-processing, but it is not rocket science to find the > notes, either. > > Seriously, checking copyright and license information is one of the > crucial things that happens during the NEW queue processing. It should > be no surprise that it is something to get right on the first attempt, > particularly if they are easily found with a bit of grep or just looking > at the files. Doing this a second time after looking at a hundred or so > source files to assess the quality of omissions is just as annoying to > me as having another upload going to NEW is to you. so apparently four people didn't notice this. why not share your findings? >>> - There are some files in the generated subdir that >>> I'm not sure I found the source of. Could you >>> clarify this a bit for me? >> which files? Sorry, I really dislike rejecting a package for >> clarification >> reasons. You can ask if you are unsure. > > Indeed, and it would have been that if you did not miss a whole bunch of > copyright notes. again, please could you share your findings? >>> - usr-share-doc-symlink-without-dependency >>> is an explicit policy violation and not allowed. >> please be specific. or this lintian not detecting indirect dependencies? > > I read policy 12.5 to require a direct dependency, but if all of these > are indirect dependencies, I will not reject the package again just for > that. I filed #476810 for this. From my point of view interpretation of policy doesn't belong to NEW processing. Matthias From twisti at complang.tuwien.ac.at Mon Apr 21 07:41:20 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 21 Apr 2008 14:41:20 +0000 Subject: changeset in /hg/icedtea6: 2008-04-21 Christan Thalinger changeset 580c9ff79417 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=580c9ff79417 description: 2008-04-21 Christan Thalinger * patches/icedtea-cacao.patch: Set the ARCH_DATA_MODEL correct for almost all architectures (I missed that when merging in the cacao-branch). diffstat: 2 files changed, 82 insertions(+) ChangeLog | 6 +++ patches/icedtea-cacao.patch | 76 +++++++++++++++++++++++++++++++++++++++++++ diffs (96 lines): diff -r 7a015d5c9cb1 -r 580c9ff79417 ChangeLog --- a/ChangeLog Thu Apr 17 17:04:16 2008 -0400 +++ b/ChangeLog Mon Apr 21 16:41:07 2008 +0200 @@ -1,3 +1,9 @@ 2008-04-17 Joshua Sumali + + * patches/icedtea-cacao.patch: Set the ARCH_DATA_MODEL correct for + almost all architectures (I missed that when merging in the + cacao-branch). + 2008-04-17 Joshua Sumali * configure: Regenerated. diff -r 7a015d5c9cb1 -r 580c9ff79417 patches/icedtea-cacao.patch --- a/patches/icedtea-cacao.patch Thu Apr 17 17:04:16 2008 -0400 +++ b/patches/icedtea-cacao.patch Mon Apr 21 16:41:07 2008 +0200 @@ -165,3 +165,79 @@ diff -r 63b67d07d5e9 openjdk/jdk/src/sha // ********************************** // Make sure you set X_PLATFORM and X_ARCH defines correctly. +--- openjdk/corba/make/common/shared/Platform.gmk~ 2008-04-21 09:54:27.000000000 +0200 ++++ openjdk/corba/make/common/shared/Platform.gmk 2008-04-21 16:14:54.000000000 +0200 +@@ -224,9 +224,34 @@ + else + # i586 is 32-bit, amd64 is 64-bit + ifndef ARCH_DATA_MODEL ++ ifeq ($(ARCH), alpha) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), amd64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), arm) ++ ARCH_DATA_MODEL=32 ++ endif + ifeq ($(ARCH), i586) + ARCH_DATA_MODEL=32 +- else ++ endif ++ ifeq ($(ARCH), ia64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), mips) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), s390) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), s390x) + ARCH_DATA_MODEL=64 + endif + endif +--- openjdk/jdk/make/common/shared/Platform.gmk~ 2008-04-21 09:54:27.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2008-04-21 16:15:00.000000000 +0200 +@@ -235,9 +235,34 @@ + else + # i586 is 32-bit, amd64 is 64-bit + ifndef ARCH_DATA_MODEL ++ ifeq ($(ARCH), alpha) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), amd64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), arm) ++ ARCH_DATA_MODEL=32 ++ endif + ifeq ($(ARCH), i586) + ARCH_DATA_MODEL=32 +- else ++ endif ++ ifeq ($(ARCH), ia64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), mips) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), s390) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), s390x) + ARCH_DATA_MODEL=64 + endif + endif From twisti at complang.tuwien.ac.at Mon Apr 21 07:44:47 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 21 Apr 2008 14:44:47 +0000 Subject: changeset in /hg/icedtea6: 2008-04-21 Christan Thalinger changeset 46671a3d6f13 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=46671a3d6f13 description: 2008-04-21 Christan Thalinger * acinclude.m4 (SET_CORE_BUILD): Always set to true when building --with-cacao. * Makefile.in, aclocal.m4, configure: Regenerated. diffstat: 5 files changed, 77 insertions(+), 37 deletions(-) ChangeLog | 6 ++++++ Makefile.in | 32 +++++++++++++++++++------------- acinclude.m4 | 6 +++++- aclocal.m4 | 48 +++++++++++++++++++++++++++--------------------- configure | 22 ++++++++++++++++++++-- diffs (266 lines): diff -r 580c9ff79417 -r 46671a3d6f13 ChangeLog --- a/ChangeLog Mon Apr 21 16:41:07 2008 +0200 +++ b/ChangeLog Mon Apr 21 16:45:07 2008 +0200 @@ -1,3 +1,9 @@ 2008-04-21 Christan Thalinger + + * acinclude.m4 (SET_CORE_BUILD): Always set to true when building + --with-cacao. + * Makefile.in, aclocal.m4, configure: Regenerated. + 2008-04-21 Christan Thalinger * patches/icedtea-cacao.patch: Set the ARCH_DATA_MODEL correct for diff -r 580c9ff79417 -r 46671a3d6f13 Makefile.in --- a/Makefile.in Mon Apr 21 16:41:07 2008 +0200 +++ b/Makefile.in Mon Apr 21 16:45:07 2008 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -551,6 +551,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -577,6 +581,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -720,17 +726,17 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am all-local am--refresh check check-am clean \ - clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-local distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am + clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-local distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am # Top-Level Targets diff -r 580c9ff79417 -r 46671a3d6f13 acinclude.m4 --- a/acinclude.m4 Mon Apr 21 16:41:07 2008 +0200 +++ b/acinclude.m4 Mon Apr 21 16:45:07 2008 +0200 @@ -607,7 +607,11 @@ AC_DEFUN([ENABLE_ZERO_BUILD], AC_DEFUN([SET_CORE_BUILD], [ - AM_CONDITIONAL(CORE_BUILD, test "x${ZERO_BUILD_TRUE}" = x) + if test "x${CACAO}" != "xno"; then + AM_CONDITIONAL(CORE_BUILD, true) + else + AM_CONDITIONAL(CORE_BUILD, test "x${ZERO_BUILD_TRUE}" = x) + fi ]) AC_DEFUN([ENABLE_NETX_PLUGIN], diff -r 580c9ff79417 -r 46671a3d6f13 aclocal.m4 --- a/aclocal.m4 Mon Apr 21 16:41:07 2008 +0200 +++ b/aclocal.m4 Mon Apr 21 16:45:07 2008 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,10 +11,13 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # @@ -174,7 +177,7 @@ fi[]dnl fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -205,8 +208,10 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -478,7 +483,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -526,13 +531,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 +# 2005, 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -637,16 +642,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -935,7 +941,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -r 580c9ff79417 -r 46671a3d6f13 configure --- a/configure Mon Apr 21 16:41:07 2008 +0200 +++ b/configure Mon Apr 21 16:45:07 2008 +0200 @@ -9406,7 +9406,8 @@ fi - if test "x${ZERO_BUILD_TRUE}" = x; then + if test "x${CACAO}" != "xno"; then + if true; then CORE_BUILD_TRUE= CORE_BUILD_FALSE='#' else @@ -9414,6 +9415,16 @@ else CORE_BUILD_FALSE= fi + else + if test "x${ZERO_BUILD_TRUE}" = x; then + CORE_BUILD_TRUE= + CORE_BUILD_FALSE='#' +else + CORE_BUILD_TRUE='#' + CORE_BUILD_FALSE= +fi + + fi @@ -12272,6 +12283,13 @@ if test -z "${NETX_PLUGIN_TRUE}" && test { { echo "$as_me:$LINENO: error: conditional \"NETX_PLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." >&5 echo "$as_me: error: conditional \"NETX_PLUGIN\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${CORE_BUILD_TRUE}" && test -z "${CORE_BUILD_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"CORE_BUILD\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"CORE_BUILD\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -13353,7 +13371,7 @@ echo "$as_me: executing $ac_file command # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ From bugzilla-daemon at icedtea.classpath.org Mon Apr 21 08:04:23 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Apr 2008 15:04:23 +0000 Subject: [Bug 136] New: compilation of 6-1.1 crashes on jar option error [invalid option -- J] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=136 Summary: compilation of 6-1.1 crashes on jar option error [invalid option -- J] Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: Gerard.Vidal at ens-lyon.fr Hi, I am compiling on debian lenny x86_64 I get this error which stops the process .../icedtea6-1.1/bootstrap/jdk1.6.0/bin/jar: invalid option -- J Last instruction has options : -J-Xmx896m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m If the instruction is corrected (by removing -J options) and executed by hand, compilation progresses to the next jar identical problem. Finally compilation gets stuck on >>>Recursively making crypto because of : rm -f icedtea6-1.1/openjdk-ecj/control/build/linux-amd64/tmp/sun/javax.crypto/unsigned/jce.jar that removes previous compilation by hand. I have not found the bug on bugzilla.. 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 jsumali at redhat.com Mon Apr 21 08:06:52 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Mon, 21 Apr 2008 15:06:52 +0000 Subject: changeset in /hg/icedtea6: 2008-04-21 Joshua Sumali changeset 8a71b80ecbac in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8a71b80ecbac description: 2008-04-21 Joshua Sumali * rt/net/sourceforge/jnlp/resources/about.jnlp: Use online signed about.jar. diffstat: 2 files changed, 6 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ rt/net/sourceforge/jnlp/resources/about.jnlp | 2 +- diffs (22 lines): diff -r 46671a3d6f13 -r 8a71b80ecbac ChangeLog --- a/ChangeLog Mon Apr 21 16:45:07 2008 +0200 +++ b/ChangeLog Mon Apr 21 11:06:46 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-21 Christan Thalinger + + * rt/net/sourceforge/jnlp/resources/about.jnlp: Use online signed + about.jar. + 2008-04-21 Christan Thalinger * acinclude.m4 (SET_CORE_BUILD): Always set to true when building diff -r 46671a3d6f13 -r 8a71b80ecbac rt/net/sourceforge/jnlp/resources/about.jnlp --- a/rt/net/sourceforge/jnlp/resources/about.jnlp Mon Apr 21 16:45:07 2008 +0200 +++ b/rt/net/sourceforge/jnlp/resources/about.jnlp Mon Apr 21 11:06:46 2008 -0400 @@ -1,5 +1,5 @@ - + About window for NetX NetX From twisti at complang.tuwien.ac.at Mon Apr 21 08:10:43 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 21 Apr 2008 15:10:43 +0000 Subject: changeset in /hg/icedtea6: 2008-04-21 Christian Thalinger changeset 486e616133f4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=486e616133f4 description: 2008-04-21 Christian Thalinger * ChangeLog: Fixed a typo in my name. diffstat: 1 file changed, 10 insertions(+), 6 deletions(-) ChangeLog | 16 ++++++++++------ diffs (59 lines): diff -r 8a71b80ecbac -r 486e616133f4 ChangeLog --- a/ChangeLog Mon Apr 21 11:06:46 2008 -0400 +++ b/ChangeLog Mon Apr 21 17:10:37 2008 +0200 @@ -1,9 +1,13 @@ 2008-04-21 Joshua Sumali + + * ChangeLog: Fixed a typo in my name. + 2008-04-21 Joshua Sumali * rt/net/sourceforge/jnlp/resources/about.jnlp: Use online signed about.jar. -2008-04-21 Christan Thalinger +2008-04-21 Christian Thalinger * acinclude.m4 (SET_CORE_BUILD): Always set to true when building --with-cacao. @@ -50,7 +54,7 @@ 2008-04-15 Gary Benson +2008-04-15 Christian Thalinger * acinclude.m4 (ENABLE_ZERO_BUILD): Make --disable-zero work and don't build zero by default when compiling --with-cacao. @@ -2805,13 +2809,13 @@ 2007-09-13 Lillian Angel +2007-09-12 Christian Thalinger * Makefile.am (icedtea-debug): Added -debug to target directory, as found today by Andrew Haley. * Makefile.in: Likewise. -2007-09-12 Christan Thalinger +2007-09-12 Christian Thalinger * .hgignore: Added *~. @@ -6434,13 +6438,13 @@ 2007-09-13 Lillian Angel +2007-09-12 Christian Thalinger * Makefile.am (icedtea-debug): Added -debug to target directory, as found today by Andrew Haley. * Makefile.in: Likewise. -2007-09-12 Christan Thalinger +2007-09-12 Christian Thalinger * .hgignore: Added *~. From twisti at complang.tuwien.ac.at Mon Apr 21 08:13:05 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 21 Apr 2008 15:13:05 +0000 Subject: changeset in /hg/icedtea6: 2008-04-21 Christan Thalinger changeset 354b5ff4f988 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=354b5ff4f988 description: 2008-04-21 Christan Thalinger * acinclude.m4 (ENABLE_FAST_BUILD): Removed. (ENABLE_OPTIMIZATIONS): New function. * configure.ac (ENABLE_FAST_BUILD): Removed call. (ENABLE_OPTIMIZATIONS): Added call. * Makefile.am [!ENABLE_OPTIMIZATIONS] (ICEDTEA_ENV): Set NO_OPTIMIZATIONS and CC_NO_OPT. (FAST_BUILD_PATCH): Removed. (ICEDTEA_PATCHES): Removed FAST_BUILD_PATCH. * Makefile.in, configure: Regenerated. * patches/icedtea-speed.patch: Removed. diffstat: 7 files changed, 103 insertions(+), 117 deletions(-) ChangeLog | 13 ++++++ Makefile.am | 22 ++++++----- Makefile.in | 30 +++++++++------ acinclude.m4 | 33 +++++++++++------ configure | 81 ++++++++++++++++++++----------------------- configure.ac | 2 - patches/icedtea-speed.patch | 39 -------------------- diffs (379 lines): diff -r 46671a3d6f13 -r 354b5ff4f988 ChangeLog --- a/ChangeLog Mon Apr 21 16:45:07 2008 +0200 +++ b/ChangeLog Mon Apr 21 17:03:11 2008 +0200 @@ -1,3 +1,16 @@ 2008-04-21 Christan Thalinger + + * acinclude.m4 (ENABLE_FAST_BUILD): Removed. + (ENABLE_OPTIMIZATIONS): New function. + * configure.ac (ENABLE_FAST_BUILD): Removed call. + (ENABLE_OPTIMIZATIONS): Added call. + * Makefile.am [!ENABLE_OPTIMIZATIONS] (ICEDTEA_ENV): Set + NO_OPTIMIZATIONS and CC_NO_OPT. + (FAST_BUILD_PATCH): Removed. + (ICEDTEA_PATCHES): Removed FAST_BUILD_PATCH. + * Makefile.in, configure: Regenerated. + * patches/icedtea-speed.patch: Removed. + 2008-04-21 Christan Thalinger * acinclude.m4 (SET_CORE_BUILD): Always set to true when building diff -r 46671a3d6f13 -r 354b5ff4f988 Makefile.am --- a/Makefile.am Mon Apr 21 16:45:07 2008 +0200 +++ b/Makefile.am Mon Apr 21 17:03:11 2008 +0200 @@ -39,7 +39,7 @@ install: hotspot hotspot-helper clean-extra EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ - gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \ + gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ patches/icedtea-cacao.patch @@ -104,6 +104,12 @@ if WITH_CACAO if WITH_CACAO ICEDTEA_ENV += \ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" +endif + +if !ENABLE_OPTIMIZATIONS +ICEDTEA_ENV += \ + "NO_OPTIMIZATIONS=true" \ + "CC_NO_OPT=-O0 -g" endif if !ENABLE_DOCS @@ -163,6 +169,12 @@ ICEDTEA_ENV_ECJ += \ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" endif +if !ENABLE_OPTIMIZATIONS +ICEDTEA_ENV_ECJ += \ + "NO_OPTIMIZATIONS=true" \ + "CC_NO_OPT=-O0 -g" +endif + if !ENABLE_DOCS ICEDTEA_ENV_ECJ += \ "NO_DOCS=true" @@ -222,13 +234,6 @@ stamps/ports.stamp: stamps/extract.stamp fi mkdir -p stamps touch stamps/ports.stamp - -# Patch OpenJDK sources for plug replacements. -if FAST_BUILD - FAST_BUILD_PATCH = patches/icedtea-speed.patch -else - FAST_BUILD_PATCH = -endif # If new gcc is installed, apply 4.3 patch if GCC_OLD @@ -299,7 +304,6 @@ ICEDTEA_PATCHES = \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ $(GCC_PATCH) \ - $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) if WITH_CACAO diff -r 46671a3d6f13 -r 354b5ff4f988 Makefile.in --- a/Makefile.in Mon Apr 21 16:45:07 2008 +0200 +++ b/Makefile.in Mon Apr 21 17:03:11 2008 +0200 @@ -34,16 +34,24 @@ host_triplet = @host@ @WITH_CACAO_TRUE at am__append_1 = \ @WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" - at ENABLE_DOCS_FALSE@am__append_2 = \ + at ENABLE_OPTIMIZATIONS_FALSE@am__append_2 = \ + at ENABLE_OPTIMIZATIONS_FALSE@ "NO_OPTIMIZATIONS=true" \ + at ENABLE_OPTIMIZATIONS_FALSE@ "CC_NO_OPT=-O0 -g" + + at ENABLE_DOCS_FALSE@am__append_3 = \ @ENABLE_DOCS_FALSE@ "NO_DOCS=true" - at WITH_CACAO_TRUE@am__append_3 = \ + at WITH_CACAO_TRUE@am__append_4 = \ @WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" - at ENABLE_DOCS_FALSE@am__append_4 = \ + at ENABLE_OPTIMIZATIONS_FALSE@am__append_5 = \ + at ENABLE_OPTIMIZATIONS_FALSE@ "NO_OPTIMIZATIONS=true" \ + at ENABLE_OPTIMIZATIONS_FALSE@ "CC_NO_OPT=-O0 -g" + + at ENABLE_DOCS_FALSE@am__append_6 = \ @ENABLE_DOCS_FALSE@ "NO_DOCS=true" - at WITH_CACAO_TRUE@am__append_5 = \ + at WITH_CACAO_TRUE@am__append_7 = \ @WITH_CACAO_TRUE@ patches/icedtea-cacao.patch subdir = . @@ -247,7 +255,7 @@ OPENJDK_VERSION = b09 @NETX_PLUGIN_FALSE at NETX_PATCH = @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ - gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \ + gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ patches/icedtea-cacao.patch @@ -302,7 +310,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE "FT2_LIB=$(FREETYPE2_LIBS)" \ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \ - $(am__append_2) + $(am__append_2) $(am__append_3) # OpenJDK ecj build environment. ICEDTEA_BUILD_DIR_ECJ = \ @@ -341,8 +349,8 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \ "FT2_LIB=$(FREETYPE2_LIBS)" \ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \ - "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_3) \ - $(am__append_4) + "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \ + $(am__append_5) $(am__append_6) # OpenJDK Source Preparation Targets # ================================== @@ -351,10 +359,6 @@ OPENJDK_URL = http://download.java.net/o OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ @USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) - at FAST_BUILD_FALSE@FAST_BUILD_PATCH = - -# Patch OpenJDK sources for plug replacements. - at FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch # If new gcc is installed, apply 4.3 patch @@ -406,7 +410,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch $(GCC_PATCH) \ - $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5) + $(DISTRIBUTION_PATCHES) $(am__append_7) # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch diff -r 46671a3d6f13 -r 354b5ff4f988 acinclude.m4 --- a/acinclude.m4 Mon Apr 21 16:45:07 2008 +0200 +++ b/acinclude.m4 Mon Apr 21 17:03:11 2008 +0200 @@ -491,18 +491,27 @@ AC_DEFUN([FIND_XERCES2_JAR], AC_SUBST(XERCES2_JAR) ]) -AC_DEFUN([ENABLE_FAST_BUILD], -[ - AC_ARG_ENABLE([fast-build], - [AS_HELP_STRING(--enable-fast-build,optimize for quick building: use -O0 and do not build documentation)], - [ - AC_MSG_CHECKING(fast build) - AC_MSG_RESULT(will apply patches/icedtea-speed.patch) - AM_CONDITIONAL(FAST_BUILD, test x = x) - ], - [ - AM_CONDITIONAL(FAST_BUILD, test x != x) - ]) +AC_DEFUN([ENABLE_OPTIMIZATIONS], +[ + AC_MSG_CHECKING(whether to disable optimizations) + AC_ARG_ENABLE([optimizations], + [AS_HELP_STRING(--disable-optimizations,build with -O0 -g [[default=no]])], + [ + case "${enableval}" in + no) + AC_MSG_RESULT([yes, building with -O0 -g]) + enable_optimizations=no + ;; + *) + AC_MSG_RESULT([no]) + enable_optimizations=yes + ;; + esac + ], + [ + enable_optimizations=yes + ]) + AM_CONDITIONAL([ENABLE_OPTIMIZATIONS], test x"${enable_optimizations}" = "xyes") ]) AC_DEFUN([FIND_TOOL], diff -r 46671a3d6f13 -r 354b5ff4f988 configure --- a/configure Mon Apr 21 16:45:07 2008 +0200 +++ b/configure Mon Apr 21 17:03:11 2008 +0200 @@ -756,8 +756,8 @@ WITH_CACAO_TRUE WITH_CACAO_TRUE WITH_CACAO_FALSE CACAO -FAST_BUILD_TRUE -FAST_BUILD_FALSE +ENABLE_OPTIMIZATIONS_TRUE +ENABLE_OPTIMIZATIONS_FALSE ZERO_BUILD_TRUE ZERO_BUILD_FALSE CPP @@ -1424,8 +1424,7 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-gcjwebplugin Disable compilation of browser plugin --disable-docs Disable generation of documentation - --enable-fast-build optimize for quick building: use -O0 and do not - build documentation + --disable-optimizations build with -O0 -g [default=no] --enable-zero use zero-assembler port on non-zero platforms --enable-netx-plugin enable experimental caching and security support in applet plugin @@ -7970,33 +7969,36 @@ fi - # Check whether --enable-fast-build was given. -if test "${enable_fast_build+set}" = set; then - enableval=$enable_fast_build; - { echo "$as_me:$LINENO: checking fast build" >&5 -echo $ECHO_N "checking fast build... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: will apply patches/icedtea-speed.patch" >&5 -echo "${ECHO_T}will apply patches/icedtea-speed.patch" >&6; } - if test x = x; then - FAST_BUILD_TRUE= - FAST_BUILD_FALSE='#' -else - FAST_BUILD_TRUE='#' - FAST_BUILD_FALSE= -fi - - -else - - if test x != x; then - FAST_BUILD_TRUE= - FAST_BUILD_FALSE='#' -else - FAST_BUILD_TRUE='#' - FAST_BUILD_FALSE= -fi - - + { echo "$as_me:$LINENO: checking whether to disable optimizations" >&5 +echo $ECHO_N "checking whether to disable optimizations... $ECHO_C" >&6; } + # Check whether --enable-optimizations was given. +if test "${enable_optimizations+set}" = set; then + enableval=$enable_optimizations; + case "${enableval}" in + no) + { echo "$as_me:$LINENO: result: yes, building with -O0 -g" >&5 +echo "${ECHO_T}yes, building with -O0 -g" >&6; } + enable_optimizations=no + ;; + *) + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + enable_optimizations=yes + ;; + esac + +else + + enable_optimizations=yes + +fi + + if test x"${enable_optimizations}" = "xyes"; then + ENABLE_OPTIMIZATIONS_TRUE= + ENABLE_OPTIMIZATIONS_FALSE='#' +else + ENABLE_OPTIMIZATIONS_TRUE='#' + ENABLE_OPTIMIZATIONS_FALSE= fi @@ -12251,17 +12253,10 @@ Usually this means the macro was only in Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${FAST_BUILD_TRUE}" && test -z "${FAST_BUILD_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FAST_BUILD\" was never defined. +if test -z "${ENABLE_OPTIMIZATIONS_TRUE}" && test -z "${ENABLE_OPTIMIZATIONS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_OPTIMIZATIONS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FAST_BUILD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FAST_BUILD_TRUE}" && test -z "${FAST_BUILD_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FAST_BUILD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FAST_BUILD\" was never defined. +echo "$as_me: error: conditional \"ENABLE_OPTIMIZATIONS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -13002,8 +12997,8 @@ WITH_CACAO_TRUE!$WITH_CACAO_TRUE$ac_deli WITH_CACAO_TRUE!$WITH_CACAO_TRUE$ac_delim WITH_CACAO_FALSE!$WITH_CACAO_FALSE$ac_delim CACAO!$CACAO$ac_delim -FAST_BUILD_TRUE!$FAST_BUILD_TRUE$ac_delim -FAST_BUILD_FALSE!$FAST_BUILD_FALSE$ac_delim +ENABLE_OPTIMIZATIONS_TRUE!$ENABLE_OPTIMIZATIONS_TRUE$ac_delim +ENABLE_OPTIMIZATIONS_FALSE!$ENABLE_OPTIMIZATIONS_FALSE$ac_delim ZERO_BUILD_TRUE!$ZERO_BUILD_TRUE$ac_delim ZERO_BUILD_FALSE!$ZERO_BUILD_FALSE$ac_delim CPP!$CPP$ac_delim diff -r 46671a3d6f13 -r 354b5ff4f988 configure.ac --- a/configure.ac Mon Apr 21 16:45:07 2008 +0200 +++ b/configure.ac Mon Apr 21 17:03:11 2008 +0200 @@ -204,7 +204,7 @@ WITH_OPENJDK_SRC_ZIP WITH_OPENJDK_SRC_ZIP WITH_OPENJDK_SRC_DIR AC_CHECK_WITH_CACAO -ENABLE_FAST_BUILD +ENABLE_OPTIMIZATIONS ENABLE_ZERO_BUILD ENABLE_NETX_PLUGIN SET_CORE_BUILD diff -r 46671a3d6f13 -r 354b5ff4f988 patches/icedtea-speed.patch --- a/patches/icedtea-speed.patch Mon Apr 21 16:45:07 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make ---- openjdk.orig/hotspot/build/linux/makefiles/gcc.make 2007-10-12 03:46:25.000000000 -0400 -+++ openjdk/hotspot/build/linux/makefiles/gcc.make 2007-10-12 17:41:02.000000000 -0400 -@@ -98,7 +98,7 @@ - CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) - - # The flags to use for an Optimized g++ build --OPT_CFLAGS += -O3 -+OPT_CFLAGS += -O0 -g - - # Hotspot uses very unstrict aliasing turn this optimization off - OPT_CFLAGS += -fno-strict-aliasing -diff -urN openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2007-10-12 03:54:05.000000000 -0400 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2007-10-12 17:41:02.000000000 -0400 -@@ -97,6 +97,7 @@ - _OPT = $(CC_LOWER_OPT) - CPPFLAGS_DBG += -DLOGGING - endif -+_OPT = -O0 -g - - # For all platforms, do not omit the frame pointer register usage. - # We need this frame pointer to make it easy to walk the stacks. -diff -urN openjdk.orig/jdk/make/Makefile openjdk/jdk/make/Makefile ---- openjdk.orig/jdk/make/Makefile 2007-10-12 03:54:03.000000000 -0400 -+++ openjdk/jdk/make/Makefile 2007-10-12 17:41:02.000000000 -0400 -@@ -249,9 +249,9 @@ - # - # Docs - # --OTHERSUBDIRS = docs --docs:: sanity-docs post-sanity-docs -- $(OTHERSUBDIRS-loop) -+#OTHERSUBDIRS = docs -+#docs:: sanity-docs post-sanity-docs -+# $(OTHERSUBDIRS-loop) - - # - # Release engineering targets. From twisti at complang.tuwien.ac.at Mon Apr 21 08:13:06 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 21 Apr 2008 15:13:06 +0000 Subject: changeset in /hg/icedtea6: * Merged with tip. Message-ID: changeset db72f04f6dd5 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=db72f04f6dd5 description: * Merged with tip. diffstat: 2 files changed, 16 insertions(+), 7 deletions(-) ChangeLog | 21 +++++++++++++++------ rt/net/sourceforge/jnlp/resources/about.jnlp | 2 +- diffs (69 lines): diff -r 354b5ff4f988 -r db72f04f6dd5 ChangeLog --- a/ChangeLog Mon Apr 21 17:03:11 2008 +0200 +++ b/ChangeLog Mon Apr 21 17:12:05 2008 +0200 @@ -1,4 +1,13 @@ 2008-04-21 Christan Thalinger +2008-04-21 Christian Thalinger + + * ChangeLog: Fixed a typo in my name. + +2008-04-21 Joshua Sumali + + * rt/net/sourceforge/jnlp/resources/about.jnlp: Use online signed + about.jar. + +2008-04-21 Christian Thalinger * acinclude.m4 (ENABLE_FAST_BUILD): Removed. (ENABLE_OPTIMIZATIONS): New function. @@ -58,7 +67,7 @@ 2008-04-15 Gary Benson +2008-04-15 Christian Thalinger * acinclude.m4 (ENABLE_ZERO_BUILD): Make --disable-zero work and don't build zero by default when compiling --with-cacao. @@ -2813,13 +2822,13 @@ 2007-09-13 Lillian Angel +2007-09-12 Christian Thalinger * Makefile.am (icedtea-debug): Added -debug to target directory, as found today by Andrew Haley. * Makefile.in: Likewise. -2007-09-12 Christan Thalinger +2007-09-12 Christian Thalinger * .hgignore: Added *~. @@ -6442,13 +6451,13 @@ 2007-09-13 Lillian Angel +2007-09-12 Christian Thalinger * Makefile.am (icedtea-debug): Added -debug to target directory, as found today by Andrew Haley. * Makefile.in: Likewise. -2007-09-12 Christan Thalinger +2007-09-12 Christian Thalinger * .hgignore: Added *~. diff -r 354b5ff4f988 -r db72f04f6dd5 rt/net/sourceforge/jnlp/resources/about.jnlp --- a/rt/net/sourceforge/jnlp/resources/about.jnlp Mon Apr 21 17:03:11 2008 +0200 +++ b/rt/net/sourceforge/jnlp/resources/about.jnlp Mon Apr 21 17:12:05 2008 +0200 @@ -1,5 +1,5 @@ - + About window for NetX NetX From twisti at complang.tuwien.ac.at Mon Apr 21 08:16:23 2008 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Mon, 21 Apr 2008 17:16:23 +0200 Subject: changeset in /hg/icedtea6: 2008-04-21 Christan Thalinger References: Message-ID: <1208790983.11279.37.camel@imac523d.theobroma-systems.com> On Mon, 2008-04-21 at 15:13 +0000, Christian Thalinger wrote: > changeset 354b5ff4f988 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=354b5ff4f988 > description: > 2008-04-21 Christan Thalinger > > * acinclude.m4 (ENABLE_FAST_BUILD): Removed. > (ENABLE_OPTIMIZATIONS): New function. > * configure.ac (ENABLE_FAST_BUILD): Removed call. > (ENABLE_OPTIMIZATIONS): Added call. > * Makefile.am [!ENABLE_OPTIMIZATIONS] (ICEDTEA_ENV): Set > NO_OPTIMIZATIONS and CC_NO_OPT. > (FAST_BUILD_PATCH): Removed. > (ICEDTEA_PATCHES): Removed FAST_BUILD_PATCH. > * Makefile.in, configure: Regenerated. > * patches/icedtea-speed.patch: Removed. This changeset adds an option: --disable-optimizations which turns on "-O0 -g" for all libraries that are built. And the good thing about this is, it only uses OpenJDK variables, so we don't have to patch the code. And it works. - twisti From langel at redhat.com Mon Apr 21 11:14:25 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 21 Apr 2008 18:14:25 +0000 Subject: changeset in /hg/icedtea6: 2008-04-21 Lillian Angel changeset d72c26939d8a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d72c26939d8a description: 2008-04-21 Lillian Angel * patches/icedtea-lib64.patch: Fixed order of library paths on 64-bit. * generated/*: Regenerated. diffstat: 4 files changed, 16 insertions(+), 10 deletions(-) ChangeLog | 5 +++++ generated/sun/misc/Version.java | 2 +- generated/sun/tools/jconsole/Version.java | 2 +- patches/icedtea-lib64.patch | 17 +++++++++-------- diffs (64 lines): diff -r db72f04f6dd5 -r d72c26939d8a ChangeLog --- a/ChangeLog Mon Apr 21 17:12:05 2008 +0200 +++ b/ChangeLog Mon Apr 21 14:06:06 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-21 Christian Thalinger + + * patches/icedtea-lib64.patch: Fixed order of library paths on 64-bit. + * generated/*: Regenerated. + 2008-04-21 Christian Thalinger * ChangeLog: Fixed a typo in my name. diff -r db72f04f6dd5 -r d72c26939d8a generated/sun/misc/Version.java --- a/generated/sun/misc/Version.java Mon Apr 21 17:12:05 2008 +0200 +++ b/generated/sun/misc/Version.java Mon Apr 21 14:06:06 2008 -0400 @@ -39,7 +39,7 @@ public class Version { "IcedTea Runtime Environment"; private static final String java_runtime_version = - "1.6.0-b06"; + "1.6.0-b09"; static { init(); diff -r db72f04f6dd5 -r d72c26939d8a generated/sun/tools/jconsole/Version.java --- a/generated/sun/tools/jconsole/Version.java Mon Apr 21 17:12:05 2008 +0200 +++ b/generated/sun/tools/jconsole/Version.java Mon Apr 21 14:06:06 2008 -0400 @@ -29,7 +29,7 @@ import java.io.PrintStream; public class Version { private static final String jconsole_version = - "1.6.0-b06"; + "1.6.0-b09"; public static void print(PrintStream ps) { printFullVersion(ps); diff -r db72f04f6dd5 -r d72c26939d8a patches/icedtea-lib64.patch --- a/patches/icedtea-lib64.patch Mon Apr 21 17:12:05 2008 +0200 +++ b/patches/icedtea-lib64.patch Mon Apr 21 14:06:06 2008 -0400 @@ -1,15 +1,16 @@ --- origopenjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-01-04 18:11:53.000000000 -0500 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-01-11 11:15:24.000000000 -0500 -@@ -271,7 +271,12 @@ - * ... - * 7: The default directories, normally /lib and /usr/lib. ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-04-21 14:00:59.000000000 -0400 +@@ -265,7 +265,12 @@ + * ... + * 7: The default directories, normally /lib and /usr/lib. */ +-#define DEFAULT_LIBPATH "/lib:/usr/lib" + +#if defined(AMD64) || defined(_LP64) && (defined(PPC) || defined(S390)) -+#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib64:/lib64" ++#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/usr/local/lib64:/lib:/usr/lib:/usr/local/lib" +#else - #define DEFAULT_LIBPATH "/lib:/usr/lib" ++#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib" +#endif - #define EXTENSIONS_DIR "/lib/ext" - #define ENDORSED_DIR "/lib/endorsed" + #define EXTENSIONS_DIR "/lib/ext" + #define ENDORSED_DIR "/lib/endorsed" From langel at redhat.com Mon Apr 21 11:34:42 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 21 Apr 2008 18:34:42 +0000 Subject: changeset in /hg/icedtea6: 2008-04-21 Lillian Angel changeset c75ccb890160 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c75ccb890160 description: 2008-04-21 Lillian Angel Parag Nemade Fixes #443360 * patches/icedtea-fonts.patch: New patch to fix font paths. * Makefile.am: Added new patch to the list. * Makefile.in: Regenerated. diffstat: 4 files changed, 68 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++ Makefile.am | 1 Makefile.in | 3 +- patches/icedtea-fonts.patch | 57 +++++++++++++++++++++++++++++++++++++++++++ diffs (100 lines): diff -r d72c26939d8a -r c75ccb890160 ChangeLog --- a/ChangeLog Mon Apr 21 14:06:06 2008 -0400 +++ b/ChangeLog Mon Apr 21 14:26:22 2008 -0400 @@ -1,3 +1,11 @@ 2008-04-21 Lillian Angel + Parag Nemade + + Fixes #443360 + * patches/icedtea-fonts.patch: New patch to fix font paths. + * Makefile.am: Added new patch to the list. + * Makefile.in: Regenerated. + 2008-04-21 Lillian Angel * patches/icedtea-lib64.patch: Fixed order of library paths on 64-bit. diff -r d72c26939d8a -r c75ccb890160 Makefile.am --- a/Makefile.am Mon Apr 21 14:06:06 2008 -0400 +++ b/Makefile.am Mon Apr 21 14:26:22 2008 -0400 @@ -303,6 +303,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ + patches/icedtea-fonts.patch \ $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r d72c26939d8a -r c75ccb890160 Makefile.in --- a/Makefile.in Mon Apr 21 14:06:06 2008 -0400 +++ b/Makefile.in Mon Apr 21 14:26:22 2008 -0400 @@ -409,7 +409,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ - patches/icedtea-color-createcontext.patch $(GCC_PATCH) \ + patches/icedtea-color-createcontext.patch \ + patches/icedtea-fonts.patch $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) $(am__append_7) # Patch OpenJDK for plug replacements and ecj. diff -r d72c26939d8a -r c75ccb890160 patches/icedtea-fonts.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-fonts.patch Mon Apr 21 14:26:22 2008 -0400 @@ -0,0 +1,57 @@ +--- openjdkold/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-03-26 14:30:01.000000000 +0530 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-04-21 11:21:49.000000000 +0530 +@@ -25,7 +25,7 @@ + + # Version + +-# Uses Fedora Core 6 fonts and file paths. ++# Uses Fedora 9 fonts and file paths. + version=1 + + # Component Font Mappings +@@ -165,24 +165,24 @@ + + # Font File Names + +-filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf +-filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf +-filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf +-filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf +- +-filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf +-filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf +-filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf +-filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf +- +-filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf +-filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf +-filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf +-filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf +- +-filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf ++filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu/DejaVuLGCSans.ttf ++filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf ++filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-Oblique.ttf ++filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-BoldOblique.ttf ++ ++filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu/DejaVuLGCSansMono.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Bold.ttf ++filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Oblique.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-BoldOblique.ttf ++ ++filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu/DejaVuLGCSerif.ttf ++filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu/DejaVuLGCSerif-Bold.ttf ++filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-Oblique.ttf ++filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-BoldOblique.ttf ++ ++filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttf ++filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf From langel at redhat.com Mon Apr 21 11:34:49 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 21 Apr 2008 14:34:49 -0400 Subject: changeset in /hg/icedtea6: 2008-04-21 Lillian Angel References: Message-ID: <480CDE49.7060309@redhat.com> Because of the dejavu font changes in Fedora 9, for fonts to properly work you will need to update to the dejavu-lgc-fonts package available in the F9 development repo (dejavu-lgc-fonts-2.24-3.fc9). Lillian Lillian Angel wrote: > changeset c75ccb890160 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c75ccb890160 > description: > 2008-04-21 Lillian Angel > Parag Nemade > > Fixes #443360 > * patches/icedtea-fonts.patch: New patch to fix font paths. > * Makefile.am: Added new patch to the list. > * Makefile.in: Regenerated. > > diffstat: > > 4 files changed, 68 insertions(+), 1 deletion(-) > ChangeLog | 8 ++++++ > Makefile.am | 1 > Makefile.in | 3 +- > patches/icedtea-fonts.patch | 57 +++++++++++++++++++++++++++++++++++++++++++ > > diffs (100 lines): > > diff -r d72c26939d8a -r c75ccb890160 ChangeLog > --- a/ChangeLog Mon Apr 21 14:06:06 2008 -0400 > +++ b/ChangeLog Mon Apr 21 14:26:22 2008 -0400 > @@ -1,3 +1,11 @@ 2008-04-21 Lillian Angel +2008-04-21 Lillian Angel > + Parag Nemade > + > + Fixes #443360 > + * patches/icedtea-fonts.patch: New patch to fix font paths. > + * Makefile.am: Added new patch to the list. > + * Makefile.in: Regenerated. > + > 2008-04-21 Lillian Angel > > * patches/icedtea-lib64.patch: Fixed order of library paths on 64-bit. > diff -r d72c26939d8a -r c75ccb890160 Makefile.am > --- a/Makefile.am Mon Apr 21 14:06:06 2008 -0400 > +++ b/Makefile.am Mon Apr 21 14:26:22 2008 -0400 > @@ -303,6 +303,7 @@ ICEDTEA_PATCHES = \ > patches/icedtea-ia64-fdlibm.patch \ > patches/icedtea-LCMS-setTagData.patch \ > patches/icedtea-color-createcontext.patch \ > + patches/icedtea-fonts.patch \ > $(GCC_PATCH) \ > $(DISTRIBUTION_PATCHES) > > diff -r d72c26939d8a -r c75ccb890160 Makefile.in > --- a/Makefile.in Mon Apr 21 14:06:06 2008 -0400 > +++ b/Makefile.in Mon Apr 21 14:26:22 2008 -0400 > @@ -409,7 +409,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ > patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \ > patches/icedtea-ia64-fdlibm.patch \ > patches/icedtea-LCMS-setTagData.patch \ > - patches/icedtea-color-createcontext.patch $(GCC_PATCH) \ > + patches/icedtea-color-createcontext.patch \ > + patches/icedtea-fonts.patch $(GCC_PATCH) \ > $(DISTRIBUTION_PATCHES) $(am__append_7) > > # Patch OpenJDK for plug replacements and ecj. > diff -r d72c26939d8a -r c75ccb890160 patches/icedtea-fonts.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/icedtea-fonts.patch Mon Apr 21 14:26:22 2008 -0400 > @@ -0,0 +1,57 @@ > +--- openjdkold/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-03-26 14:30:01.000000000 +0530 > ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-04-21 11:21:49.000000000 +0530 > +@@ -25,7 +25,7 @@ > + > + # Version > + > +-# Uses Fedora Core 6 fonts and file paths. > ++# Uses Fedora 9 fonts and file paths. > + version=1 > + > + # Component Font Mappings > +@@ -165,24 +165,24 @@ > + > + # Font File Names > + > +-filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf > +-filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf > +-filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf > +-filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf > +- > +-filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf > +-filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf > +-filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf > +-filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf > +- > +-filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf > +-filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf > +-filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf > +-filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf > +- > +-filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf > +-filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf > +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf > +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf > +-filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf > +-filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf > ++filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu/DejaVuLGCSans.ttf > ++filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf > ++filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-Oblique.ttf > ++filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-BoldOblique.ttf > ++ > ++filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu/DejaVuLGCSansMono.ttf > ++filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Bold.ttf > ++filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Oblique.ttf > ++filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-BoldOblique.ttf > ++ > ++filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu/DejaVuLGCSerif.ttf > ++filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu/DejaVuLGCSerif-Bold.ttf > ++filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-Oblique.ttf > ++filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-BoldOblique.ttf > ++ > ++filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf > ++filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf > ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttf > ++filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttf > ++filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf > ++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf From langel at redhat.com Wed Apr 23 06:01:34 2008 From: langel at redhat.com (Lillian Angel) Date: Wed, 23 Apr 2008 13:01:34 +0000 Subject: changeset in /hg/icedtea6: 2008-04-23 Lillian Angel changeset 87ee93ad7e38 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=87ee93ad7e38 description: 2008-04-23 Lillian Angel * patches/icedtea-fonts.patch: Updated to include Indic languages. * patches/icedtea-lib64.patch: Removed /usr/lib/local and /usr/lib64/local from default library path. diffstat: 3 files changed, 368 insertions(+), 18 deletions(-) ChangeLog | 6 patches/icedtea-fonts.patch | 376 +++++++++++++++++++++++++++++++++++++++++-- patches/icedtea-lib64.patch | 4 diffs (431 lines): diff -r c75ccb890160 -r 87ee93ad7e38 ChangeLog --- a/ChangeLog Mon Apr 21 14:26:22 2008 -0400 +++ b/ChangeLog Wed Apr 23 09:01:27 2008 -0400 @@ -1,3 +1,9 @@ 2008-04-21 Lillian Angel + + * patches/icedtea-fonts.patch: Updated to include Indic languages. + * patches/icedtea-lib64.patch: Removed /usr/lib/local and + /usr/lib64/local from default library path. + 2008-04-21 Lillian Angel Parag Nemade diff -r c75ccb890160 -r 87ee93ad7e38 patches/icedtea-fonts.patch --- a/patches/icedtea-fonts.patch Mon Apr 21 14:26:22 2008 -0400 +++ b/patches/icedtea-fonts.patch Wed Apr 23 09:01:27 2008 -0400 @@ -1,6 +1,6 @@ --- openjdkold/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-03-26 14:30:01.000000000 +0530 +++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties 2008-04-21 11:21:49.000000000 +0530 -@@ -25,7 +25,7 @@ +@@ -25,134 +25,310 @@ # Version @@ -9,7 +9,339 @@ version=1 # Component Font Mappings -@@ -165,24 +165,24 @@ + +-dialog.plain.latin-1=DejaVu LGC Sans ++dialog.plain.latin-1=DejaVu Sans + dialog.plain.japanese-x0208=Sazanami Gothic + dialog.plain.korean=Baekmuk Gulim + dialog.plain.chinese-big5=AR PL ShanHeiSun Uni + dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.plain.bengali=Lohit Bengali ++dialog.plain.gujarati=Lohit Gujarati ++dialog.plain.hindi=Lohit Hindi ++dialog.plain.malayalam=Lohit Malayalam ++dialog.plain.oriya=Lohit Oriya ++dialog.plain.punjabi=Lohit Punjabi ++dialog.plain.tamil=Lohit Tamil ++dialog.plain.telugu=Lohit Telugu ++dialog.plain.sinhala=LKLUG + +-dialog.bold.latin-1=DejaVu LGC Sans Bold ++dialog.bold.latin-1=DejaVu Sans Bold + dialog.bold.japanese-x0208=Sazanami Gothic + dialog.bold.korean=Baekmuk Gulim + dialog.bold.chinese-big5=AR PL ShanHeiSun Uni + dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bold.bengali=Lohit Bengali ++dialog.bold.gujarati=Lohit Gujarati ++dialog.bold.hindi=Lohit Hindi ++dialog.bold.malayalam=Lohit Malayalam ++dialog.bold.oriya=Lohit Oriya ++dialog.bold.punjabi=Lohit Punjabi ++dialog.bold.tamil=Lohit Tamil ++dialog.bold.telugu=Lohit Telugu ++dialog.bold.sinhala=LKLUG + +-dialog.italic.latin-1=DejaVu LGC Sans Oblique ++dialog.italic.latin-1=DejaVu Sans Oblique + dialog.italic.japanese-x0208=Sazanami Gothic + dialog.italic.korean=Baekmuk Gulim + dialog.italic.chinese-big5=AR PL ShanHeiSun Uni + dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.italic.bengali=Lohit Bengali ++dialog.italic.gujarati=Lohit Gujarati ++dialog.italic.hindi=Lohit Hindi ++dialog.italic.malayalam=Lohit Malayalam ++dialog.italic.oriya=Lohit Oriya ++dialog.italic.punjabi=Lohit Punjabi ++dialog.italic.tamil=Lohit Tamil ++dialog.italic.telugu=Lohit Telugu ++dialog.italic.sinhala=LKLUG + +-dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique ++dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique + dialog.bolditalic.japanese-x0208=Sazanami Gothic + dialog.bolditalic.korean=Baekmuk Gulim + dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bolditalic.bengali=Lohit Bengali ++dialog.bolditalic.gujarati=Lohit Gujarati ++dialog.bolditalic.hindi=Lohit Hindi ++dialog.bolditalic.malayalam=Lohit Malayalam ++dialog.bolditalic.oriya=Lohit Oriya ++dialog.bolditalic.punjabi=Lohit Punjabi ++dialog.bolditalic.tamil=Lohit Tamil ++dialog.bolditalic.telugu=Lohit Telugu ++dialog.bolditalic.sinhala=LKLUG + +- +-sansserif.plain.latin-1=DejaVu LGC Sans ++sansserif.plain.latin-1=DejaVu Sans + sansserif.plain.japanese-x0208=Sazanami Gothic + sansserif.plain.korean=Baekmuk Gulim + sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni + sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.plain.bengali=Lohit Bengali ++sansserif.plain.gujarati=Lohit Gujarati ++sansserif.plain.hindi=Lohit Hindi ++sansserif.plain.malayalam=Lohit Malayalam ++sansserif.plain.oriya=Lohit Oriya ++sansserif.plain.punjabi=Lohit Punjabi ++sansserif.plain.tamil=Lohit Tamil ++sansserif.plain.telugu=Lohit Telugu ++sansserif.plain.sinhala=LKLUG + +-sansserif.bold.latin-1=DejaVu LGC Sans Bold ++sansserif.bold.latin-1=DejaVu Sans Bold + sansserif.bold.japanese-x0208=Sazanami Gothic + sansserif.bold.korean=Baekmuk Gulim + sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bold.bengali=Lohit Bengali ++sansserif.bold.gujarati=Lohit Gujarati ++sansserif.bold.hindi=Lohit Hindi ++sansserif.bold.malayalam=Lohit Malayalam ++sansserif.bold.oriya=Lohit Oriya ++sansserif.bold.punjabi=Lohit Punjabi ++sansserif.bold.tamil=Lohit Tamil ++sansserif.bold.telugu=Lohit Telugu ++sansserif.bold.sinhala=LKLUG + +-sansserif.italic.latin-1=DejaVu LGC Sans Oblique ++sansserif.italic.latin-1=DejaVu Sans Oblique + sansserif.italic.japanese-x0208=Sazanami Gothic + sansserif.italic.korean=Baekmuk Gulim + sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.italic.bengali=Lohit Bengali ++sansserif.italic.gujarati=Lohit Gujarati ++sansserif.italic.hindi=Lohit Hindi ++sansserif.italic.malayalam=Lohit Malayalam ++sansserif.italic.oriya=Lohit Oriya ++sansserif.italic.punjabi=Lohit Punjabi ++sansserif.italic.tamil=Lohit Tamil ++sansserif.italic.telugu=Lohit Telugu ++sansserif.italic.sinhala=LKLUG + +-sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique ++sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique + sansserif.bolditalic.japanese-x0208=Sazanami Gothic + sansserif.bolditalic.korean=Baekmuk Gulim + sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bolditalic.bengali=Lohit Bengali ++sansserif.bolditalic.gujarati=Lohit Gujarati ++sansserif.bolditalic.hindi=Lohit Hindi ++sansserif.bolditalic.malayalam=Lohit Malayalam ++sansserif.bolditalic.oriya=Lohit Oriya ++sansserif.bolditalic.punjabi=Lohit Punjabi ++sansserif.bolditalic.tamil=Lohit Tamil ++sansserif.bolditalic.telugu=Lohit Telugu ++sansserif.bolditalic.sinhala=LKLUG + +- +-serif.plain.latin-1=DejaVu LGC Serif ++serif.plain.latin-1=DejaVu Serif + serif.plain.japanese-x0208=Sazanami Mincho + serif.plain.korean=Baekmuk Batang + serif.plain.chinese-big5=AR PL ZenKai Uni + serif.plain.chinese-gb18030=AR PL ZenKai Uni ++serif.plain.bengali=Lohit Bengali ++serif.plain.gujarati=Lohit Gujarati ++serif.plain.hindi=Lohit Hindi ++serif.plain.malayalam=Lohit Malayalam ++serif.plain.oriya=Lohit Oriya ++serif.plain.punjabi=Lohit Punjabi ++serif.plain.tamil=Lohit Tamil ++serif.plain.telugu=Lohit Telugu ++serif.plain.sinhala=LKLUG + +-serif.bold.latin-1=DejaVu LGC Serif Bold ++serif.bold.latin-1=DejaVu Serif Bold + serif.bold.japanese-x0208=Sazanami Mincho + serif.bold.korean=Baekmuk Batang + serif.bold.chinese-big5=AR PL ZenKai Uni + serif.bold.chinese-gb18030=AR PL ZenKai Uni ++serif.bold.bengali=Lohit Bengali ++serif.bold.gujarati=Lohit Gujarati ++serif.bold.hindi=Lohit Hindi ++serif.bold.malayalam=Lohit Malayalam ++serif.bold.oriya=Lohit Oriya ++serif.bold.punjabi=Lohit Punjabi ++serif.bold.tamil=Lohit Tamil ++serif.bold.telugu=Lohit Telugu ++serif.bold.sinhala=LKLUG + +-serif.italic.latin-1=DejaVu LGC Serif Oblique ++serif.italic.latin-1=DejaVu Serif Oblique + serif.italic.japanese-x0208=Sazanami Mincho + serif.italic.korean=Baekmuk Batang + serif.italic.chinese-big5=AR PL ZenKai Uni + serif.italic.chinese-gb18030=AR PL ZenKai Uni ++serif.italic.bengali=Lohit Bengali ++serif.italic.gujarati=Lohit Gujarati ++serif.italic.hindi=Lohit Hindi ++serif.italic.malayalam=Lohit Malayalam ++serif.italic.oriya=Lohit Oriya ++serif.italic.punjabi=Lohit Punjabi ++serif.italic.tamil=Lohit Tamil ++serif.italic.telugu=Lohit Telugu ++serif.italic.sinhala=LKLUG + +-serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique ++serif.bolditalic.latin-1=DejaVu Serif Bold Oblique + serif.bolditalic.japanese-x0208=Sazanami Mincho + serif.bolditalic.korean=Baekmuk Batang + serif.bolditalic.chinese-big5=AR PL ZenKai Uni + serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni ++serif.bolditalic.bengali=Lohit Bengali ++serif.bolditalic.gujarati=Lohit Gujarati ++serif.bolditalic.hindi=Lohit Hindi ++serif.bolditalic.malayalam=Lohit Malayalam ++serif.bolditalic.oriya=Lohit Oriya ++serif.bolditalic.punjabi=Lohit Punjabi ++serif.bolditalic.tamil=Lohit Tamil ++serif.bolditalic.telugu=Lohit Telugu ++serif.bolditalic.sinhala=LKLUG + +- +-monospaced.plain.latin-1=DejaVu LGC Sans Mono ++monospaced.plain.latin-1=DejaVu Sans Mono + monospaced.plain.japanese-x0208=Sazanami Gothic + monospaced.plain.korean=Baekmuk Gulim + monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni + monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.plain.bengali=Lohit Bengali ++monospaced.plain.gujarati=Lohit Gujarati ++monospaced.plain.hindi=Lohit Hindi ++monospaced.plain.malayalam=Lohit Malayalam ++monospaced.plain.oriya=Lohit Oriya ++monospaced.plain.punjabi=Lohit Punjabi ++monospaced.plain.tamil=Lohit Tamil ++monospaced.plain.telugu=Lohit Telugu ++monospaced.plain.sinhala=LKLUG + +-monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold ++monospaced.bold.latin-1=DejaVu Sans Mono Bold + monospaced.bold.japanese-x0208=Sazanami Gothic + monospaced.bold.korean=Baekmuk Gulim + monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bold.bengali=Lohit Bengali ++monospaced.bold.gujarati=Lohit Gujarati ++monospaced.bold.hindi=Lohit Hindi ++monospaced.bold.malayalam=Lohit Malayalam ++monospaced.bold.oriya=Lohit Oriya ++monospaced.bold.punjabi=Lohit Punjabi ++monospaced.bold.tamil=Lohit Tamil ++monospaced.bold.telugu=Lohit Telugu ++monospaced.bold.sinhala=LKLUG + +-monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique ++monospaced.italic.latin-1=DejaVu Sans Mono Oblique + monospaced.italic.japanese-x0208=Sazanami Gothic + monospaced.italic.korean=Baekmuk Gulim + monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.italic.bengali=Lohit Bengali ++monospaced.italic.gujarati=Lohit Gujarati ++monospaced.italic.hindi=Lohit Hindi ++monospaced.italic.malayalam=Lohit Malayalam ++monospaced.italic.oriya=Lohit Oriya ++monospaced.italic.punjabi=Lohit Punjabi ++monospaced.italic.tamil=Lohit Tamil ++monospaced.italic.telugu=Lohit Telugu ++monospaced.italic.sinhala=LKLUG + +-monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique ++monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique + monospaced.bolditalic.japanese-x0208=Sazanami Gothic + monospaced.bolditalic.korean=Baekmuk Gulim + monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bolditalic.bengali=Lohit Bengali ++monospaced.bolditalic.gujarati=Lohit Gujarati ++monospaced.bolditalic.hindi=Lohit Hindi ++monospaced.bolditalic.malayalam=Lohit Malayalam ++monospaced.bolditalic.oriya=Lohit Oriya ++monospaced.bolditalic.punjabi=Lohit Punjabi ++monospaced.bolditalic.tamil=Lohit Tamil ++monospaced.bolditalic.telugu=Lohit Telugu ++monospaced.bolditalic.sinhala=LKLUG + +- +-dialoginput.plain.latin-1=DejaVu LGC Sans Mono ++dialoginput.plain.latin-1=DejaVu Sans Mono + dialoginput.plain.japanese-x0208=Sazanami Gothic + dialoginput.plain.korean=Baekmuk Gulim + dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.plain.bengali=Lohit Bengali ++dialoginput.plain.gujarati=Lohit Gujarati ++dialoginput.plain.hindi=Lohit Hindi ++dialoginput.plain.malayalam=Lohit Malayalam ++dialoginput.plain.oriya=Lohit Oriya ++dialoginput.plain.punjabi=Lohit Punjabi ++dialoginput.plain.tamil=Lohit Tamil ++dialoginput.plain.telugu=Lohit Telugu ++dialoginput.plain.sinhala=LKLUG + +-dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold ++dialoginput.bold.latin-1=DejaVu Sans Mono Bold + dialoginput.bold.japanese-x0208=Sazanami Gothic + dialoginput.bold.korean=Baekmuk Gulim + dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bold.bengali=Lohit Bengali ++dialoginput.bold.gujarati=Lohit Gujarati ++dialoginput.bold.hindi=Lohit Hindi ++dialoginput.bold.malayalam=Lohit Malayalam ++dialoginput.bold.oriya=Lohit Oriya ++dialoginput.bold.punjabi=Lohit Punjabi ++dialoginput.bold.tamil=Lohit Tamil ++dialoginput.bold.telugu=Lohit Telugu ++dialoginput.bold.sinhala=LKLUG + +-dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique ++dialoginput.italic.latin-1=DejaVu Sans Mono Oblique + dialoginput.italic.japanese-x0208=Sazanami Gothic + dialoginput.italic.korean=Baekmuk Gulim + dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.italic.bengali=Lohit Bengali ++dialoginput.italic.gujarati=Lohit Gujarati ++dialoginput.italic.hindi=Lohit Hindi ++dialoginput.italic.malayalam=Lohit Malayalam ++dialoginput.italic.oriya=Lohit Oriya ++dialoginput.italic.punjabi=Lohit Punjabi ++dialoginput.italic.tamil=Lohit Tamil ++dialoginput.italic.telugu=Lohit Telugu ++dialoginput.italic.sinhala=LKLUG + +-dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique ++dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique + dialoginput.bolditalic.japanese-x0208=Sazanami Gothic + dialoginput.bolditalic.korean=Baekmuk Gulim + dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni + dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bolditalic.bengali=Lohit Bengali ++dialoginput.bolditalic.gujarati=Lohit Gujarati ++dialoginput.bolditalic.hindi=Lohit Hindi ++dialoginput.bolditalic.malayalam=Lohit Malayalam ++dialoginput.bolditalic.oriya=Lohit Oriya ++dialoginput.bolditalic.punjabi=Lohit Punjabi ++dialoginput.bolditalic.tamil=Lohit Tamil ++dialoginput.bolditalic.telugu=Lohit Telugu ++dialoginput.bolditalic.sinhala=LKLUG + + # Search Sequences + +@@ -161,28 +337,40 @@ + sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 + sequence.allfonts.EUC-KR=korean,latin-1 + sequence.allfonts.GB18030=chinese-gb18030,latin-1 +-sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean ++sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala # Font File Names @@ -34,20 +366,20 @@ -filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf -filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf -filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf -+filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu/DejaVuLGCSans.ttf -+filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf -+filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-Oblique.ttf -+filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-BoldOblique.ttf -+ -+filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu/DejaVuLGCSansMono.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Bold.ttf -+filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Oblique.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-BoldOblique.ttf -+ -+filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu/DejaVuLGCSerif.ttf -+filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu/DejaVuLGCSerif-Bold.ttf -+filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-Oblique.ttf -+filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-BoldOblique.ttf ++filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf ++filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf ++filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf ++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf ++ ++filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf ++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf ++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf ++ ++filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf ++filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf ++filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf ++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf + +filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf @@ -55,3 +387,15 @@ +filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttf +filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf +filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf ++filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf ++ diff -r c75ccb890160 -r 87ee93ad7e38 patches/icedtea-lib64.patch --- a/patches/icedtea-lib64.patch Mon Apr 21 14:26:22 2008 -0400 +++ b/patches/icedtea-lib64.patch Wed Apr 23 09:01:27 2008 -0400 @@ -7,9 +7,9 @@ -#define DEFAULT_LIBPATH "/lib:/usr/lib" + +#if defined(AMD64) || defined(_LP64) && (defined(PPC) || defined(S390)) -+#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/usr/local/lib64:/lib:/usr/lib:/usr/local/lib" ++#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" +#else -+#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib" ++#define DEFAULT_LIBPATH "/lib:/usr/lib" +#endif #define EXTENSIONS_DIR "/lib/ext" From jsumali at redhat.com Wed Apr 23 08:09:40 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Wed, 23 Apr 2008 15:09:40 +0000 Subject: changeset in /hg/icedtea6: 2008-04-23 Joshua Sumali changeset d9e05854e953 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d9e05854e953 description: 2008-04-23 Joshua Sumali * Makefile.am: Added new files to EXTRA_DIST. * Makefile.in: Regenerated. * java-javaws.png: New file. * javaws.desktop: Likewise. diffstat: 4 files changed, 20 insertions(+), 2 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 2 +- Makefile.in | 2 +- javaws.desktop | 11 +++++++++++ diffs (55 lines): diff -r 87ee93ad7e38 -r d9e05854e953 ChangeLog --- a/ChangeLog Wed Apr 23 09:01:27 2008 -0400 +++ b/ChangeLog Wed Apr 23 11:09:16 2008 -0400 @@ -1,3 +1,10 @@ 2008-04-23 Lillian Angel + + * Makefile.am: Added new files to EXTRA_DIST. + * Makefile.in: Regenerated. + * java-javaws.png: New file. + * javaws.desktop: Likewise. + 2008-04-23 Lillian Angel * patches/icedtea-fonts.patch: Updated to include Indic languages. diff -r 87ee93ad7e38 -r d9e05854e953 Makefile.am --- a/Makefile.am Wed Apr 23 09:01:27 2008 -0400 +++ b/Makefile.am Wed Apr 23 11:09:16 2008 -0400 @@ -41,7 +41,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ - patches/icedtea-cacao.patch + patches/icedtea-cacao.patch java-javaws.png javaws.desktop # The Binary plugs directory is called jdk1.7.0 for historical reasons. The # name is completely irrelevant; only contains the plugs to build IcedTea. diff -r 87ee93ad7e38 -r d9e05854e953 Makefile.in --- a/Makefile.in Wed Apr 23 09:01:27 2008 -0400 +++ b/Makefile.in Wed Apr 23 11:09:16 2008 -0400 @@ -257,7 +257,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ - patches/icedtea-cacao.patch + patches/icedtea-cacao.patch java-javaws.png javaws.desktop # The Binary plugs directory is called jdk1.7.0 for historical reasons. The diff -r 87ee93ad7e38 -r d9e05854e953 java-javaws.png Binary file java-javaws.png has changed diff -r 87ee93ad7e38 -r d9e05854e953 javaws.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/javaws.desktop Wed Apr 23 11:09:16 2008 -0400 @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Java Web Start +Comment=Java Application Launcher +Exec=/usr/bin/javaws %f +Icon=java-javaws.png +Terminal=false +Type=Application +NoDisplay=true +Categories=Network;WebBrowser; +MimeType=application/x-java-jnlp-file; From bugzilla-daemon at icedtea.classpath.org Wed Apr 23 09:57:48 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 23 Apr 2008 16:57:48 +0000 Subject: [Bug 136] compilation of 6-1.1 crashes on jar option error [invalid option -- J] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=136 classpath45org at stuart.es changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |classpath45org at stuart.es ------- Comment #1 from classpath45org at stuart.es 2008-04-23 16:57 ------- http://doc.cliss21.com/index.php?title=IcedTea suggests adding "--with-jar=gjar-4.3" to configure to avoid this problem. I did this and got further in the compilation (on my Debian unstable system) but ended up with the messages the end of this message. Did you get any further? build-bootstrap-javac: [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [pcompile] Generating 7 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [copy] Copying 1 file to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [pcompile] Generating 1 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [javac] Compiling 8 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] Compiling 243 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/Modifier.java:74: missing return value [javac] return lowercase; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/type/TypeKind.java:157: missing return value [javac] return true; [javac] ^ -- 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 jsumali at redhat.com Wed Apr 23 12:18:25 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Wed, 23 Apr 2008 19:18:25 +0000 Subject: changeset in /hg/icedtea6: 2008-04-23 Joshua Sumali changeset 788b464fe89b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=788b464fe89b description: 2008-04-23 Joshua Sumali * java-javaws.png: Renamed to javaws.png * javaws.png: New file. diffstat: 1 file changed, 5 insertions(+) ChangeLog | 5 +++++ diffs (16 lines): diff -r d9e05854e953 -r 788b464fe89b ChangeLog --- a/ChangeLog Wed Apr 23 11:09:16 2008 -0400 +++ b/ChangeLog Wed Apr 23 15:17:50 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-23 Joshua Sumali + + * java-javaws.png: Renamed to javaws.png + * javaws.png: New file. + 2008-04-23 Joshua Sumali * Makefile.am: Added new files to EXTRA_DIST. diff -r d9e05854e953 -r 788b464fe89b java-javaws.png Binary file java-javaws.png has changed diff -r d9e05854e953 -r 788b464fe89b javaws.png Binary file javaws.png has changed From jsumali at redhat.com Wed Apr 23 13:13:13 2008 From: jsumali at redhat.com (Joshua Sumali) Date: Wed, 23 Apr 2008 20:13:13 +0000 Subject: changeset in /hg/icedtea6: 2008-04-23 Joshua Sumali changeset 89fe56f86307 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=89fe56f86307 description: 2008-04-23 Joshua Sumali * Makefile.am: Fixed javaws.png target in EXTRA_DIST. * Makefile.in: Regenerated. diffstat: 3 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 5 +++++ Makefile.am | 2 +- Makefile.in | 2 +- diffs (36 lines): diff -r 788b464fe89b -r 89fe56f86307 ChangeLog --- a/ChangeLog Wed Apr 23 15:17:50 2008 -0400 +++ b/ChangeLog Wed Apr 23 16:13:05 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-23 Joshua Sumali + + * Makefile.am: Fixed javaws.png target in EXTRA_DIST. + * Makefile.in: Regenerated. + 2008-04-23 Joshua Sumali * java-javaws.png: Renamed to javaws.png diff -r 788b464fe89b -r 89fe56f86307 Makefile.am --- a/Makefile.am Wed Apr 23 15:17:50 2008 -0400 +++ b/Makefile.am Wed Apr 23 16:13:05 2008 -0400 @@ -41,7 +41,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ - patches/icedtea-cacao.patch java-javaws.png javaws.desktop + patches/icedtea-cacao.patch javaws.png javaws.desktop # The Binary plugs directory is called jdk1.7.0 for historical reasons. The # name is completely irrelevant; only contains the plugs to build IcedTea. diff -r 788b464fe89b -r 89fe56f86307 Makefile.in --- a/Makefile.in Wed Apr 23 15:17:50 2008 -0400 +++ b/Makefile.in Wed Apr 23 16:13:05 2008 -0400 @@ -257,7 +257,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ - patches/icedtea-cacao.patch java-javaws.png javaws.desktop + patches/icedtea-cacao.patch javaws.png javaws.desktop # The Binary plugs directory is called jdk1.7.0 for historical reasons. The From fitzsim at redhat.com Wed Apr 23 13:25:40 2008 From: fitzsim at redhat.com (Thomas Fitzsimmons) Date: Wed, 23 Apr 2008 20:25:40 +0000 Subject: changeset in /hg/icedtea6: 2008-04-23 Thomas Fitzsimmons changeset a4cd5dcd7df9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4cd5dcd7df9 description: 2008-04-23 Thomas Fitzsimmons * javaws.desktop (Name): Change to IcedTea Web Start. (Comment): Change to IcedTea Application Launcher. (Icon): Update to javaws.png. diffstat: 2 files changed, 9 insertions(+), 3 deletions(-) ChangeLog | 6 ++++++ javaws.desktop | 6 +++--- diffs (29 lines): diff -r 89fe56f86307 -r a4cd5dcd7df9 ChangeLog --- a/ChangeLog Wed Apr 23 16:13:05 2008 -0400 +++ b/ChangeLog Wed Apr 23 16:25:35 2008 -0400 @@ -1,3 +1,9 @@ 2008-04-23 Joshua Sumali + + * javaws.desktop (Name): Change to IcedTea Web Start. + (Comment): Change to IcedTea Application Launcher. + (Icon): Update to javaws.png. + 2008-04-23 Joshua Sumali * Makefile.am: Fixed javaws.png target in EXTRA_DIST. diff -r 89fe56f86307 -r a4cd5dcd7df9 javaws.desktop --- a/javaws.desktop Wed Apr 23 16:13:05 2008 -0400 +++ b/javaws.desktop Wed Apr 23 16:25:35 2008 -0400 @@ -1,9 +1,9 @@ [Desktop Entry] Encoding=UTF-8 -Name=Java Web Start -Comment=Java Application Launcher +Name=IcedTea Web Start +Comment=IcedTea Application Launcher Exec=/usr/bin/javaws %f -Icon=java-javaws.png +Icon=javaws.png Terminal=false Type=Application NoDisplay=true From bugzilla-daemon at icedtea.classpath.org Thu Apr 24 03:46:01 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 24 Apr 2008 10:46:01 +0000 Subject: [Bug 137] New: icedtea6 build fails on Debian unstable (sid) with "missing return value" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=137 Summary: icedtea6 build fails on Debian unstable (sid) with "missing return value" Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: classpath45org at stuart.es CC: Gerard.Vidal at ens-lyon.fr My build of IcedTea6 from Mercurial (updated this morning) failed on my Debian unstable (sid) system. The build stopped in "build-bootstrap-javac" with the message "missing return value". My system is up to date (as of last night). I guess that I'm missing a dependancy. Any help would be very much appreciated. I read http://iced-tea.org/wiki/DebianBuildingInstructions and http://doc.cliss21.com/index.php?title=IcedTea which indicated that building on Debian Lenny is easy. Why doesn't building on Debian unstable work? Here are some of the messages: build-bootstrap-javac: [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [pcompile] Generating 7 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [copy] Copying 1 file to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [pcompile] Generating 1 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [javac] Compiling 8 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] Compiling 243 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/Modifier.java:74: missing return value [javac] return lowercase; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/type/TypeKind.java:157: missing return value [javac] return true; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/type/TypeKind.java:160: missing return value [javac] return false; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/NestingKind.java:97: missing return value [javac] return this != TOP_LEVEL; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/ElementKind.java:101: missing return value [javac] return this == CLASS || this == ENUM; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/ElementKind.java:111: missing return value [javac] return this == INTERFACE || this == ANNOTATION_TYPE; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/ElementKind.java:121: missing return value -- 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 Apr 24 05:14:18 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 24 Apr 2008 12:14:18 +0000 Subject: [Bug 137] icedtea6 build fails on Debian unstable (sid) with "missing return value" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=137 ------- Comment #1 from classpath45org at stuart.es 2008-04-24 12:14 ------- Created an attachment (id=69) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=69&action=view) part 0 of configure and make output from failed build of icedtea6 This is the first 1000KB of the output from running "./configure --with-jar=gjar-4.3 && nice make" on my Debian unstable Intel 686 machine. -- 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 Apr 24 09:46:53 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 24 Apr 2008 16:46:53 +0000 Subject: [Bug 137] icedtea6 build fails on Debian unstable (sid) with "missing return value" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=137 ------- Comment #2 from classpath45org at stuart.es 2008-04-24 16:46 ------- Created an attachment (id=70) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=70&action=view) part 7 of configure and make output from failed build of icedtea6 This the last part of the build log from the make of icedtea6. -- 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 langel at redhat.com Thu Apr 24 13:46:42 2008 From: langel at redhat.com (Lillian Angel) Date: Thu, 24 Apr 2008 20:46:42 +0000 Subject: changeset in /hg/icedtea6: 2008-04-24 Lillian Angel changeset 794c2af9fd68 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=794c2af9fd68 description: 2008-04-24 Lillian Angel * patches/icedtea-version.patch: Changed product name to OpenJDK. diffstat: 2 files changed, 6 insertions(+), 2 deletions(-) ChangeLog | 4 ++++ patches/icedtea-version.patch | 4 ++-- diffs (32 lines): diff -r a4cd5dcd7df9 -r 794c2af9fd68 ChangeLog --- a/ChangeLog Wed Apr 23 16:25:35 2008 -0400 +++ b/ChangeLog Thu Apr 24 16:46:35 2008 -0400 @@ -1,3 +1,7 @@ 2008-04-23 Thomas Fitzsimmons + + * patches/icedtea-version.patch: Changed product name to OpenJDK. + 2008-04-23 Thomas Fitzsimmons * javaws.desktop (Name): Change to IcedTea Web Start. diff -r a4cd5dcd7df9 -r 794c2af9fd68 patches/icedtea-version.patch --- a/patches/icedtea-version.patch Wed Apr 23 16:25:35 2008 -0400 +++ b/patches/icedtea-version.patch Thu Apr 24 16:46:35 2008 -0400 @@ -5,7 +5,7 @@ # Default names LAUNCHER_NAME = java -PRODUCT_NAME = Java(TM) -+PRODUCT_NAME = IcedTea ++PRODUCT_NAME = OpenJDK PRODUCT_SUFFIX = SE Runtime Environment COMPANY_NAME = Sun Microsystems, Inc. @@ -13,7 +13,7 @@ - LAUNCHER_NAME = openjdk - PRODUCT_NAME = OpenJDK + LAUNCHER_NAME = java -+ PRODUCT_NAME = IcedTea ++ PRODUCT_NAME = OpenJDK PRODUCT_SUFFIX = Runtime Environment COMPANY_NAME = endif From bugzilla-daemon at icedtea.classpath.org Fri Apr 25 07:03:27 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Apr 2008 14:03:27 +0000 Subject: [Bug 137] icedtea6 build fails on Debian unstable (sid) with "missing return value" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=137 classpath45org at stuart.es changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |classpath45org at stuart.es ------- Comment #3 from classpath45org at stuart.es 2008-04-25 14:03 ------- I updated my version of Icedtea6 and tried again, this time with ./configure --with-java=/usr/bin/gij-4.3 --with-javah=/usr/bin/gjavah-4.3 --with-jar=/usr/bin/gjar-4.3 --with-rmic=/usr/bin/grmic-4.3 but I still get the same error message. Any ideas? build-bootstrap-javac: [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [pcompile] Generating 7 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [copy] Copying 1 file to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [pcompile] Generating 1 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [javac] Compiling 8 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] Compiling 243 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/Modifier.java:74: missing return value [javac] return lowercase; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/type/TypeKind.java:157: missing return value [javac] return true; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/type/TypeKind.java:160: missing return value -- 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 Paul.Hohensee at Sun.COM Fri Apr 25 14:49:26 2008 From: Paul.Hohensee at Sun.COM (Paul Hohensee) Date: Fri, 25 Apr 2008 17:49:26 -0400 Subject: hotspot linux-sparc support has been pushed Message-ID: <481251E6.3050904@sun.com> into http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot openjdk build support already exists (see below). The hotspot-rt changeset id is 435e64505015 hotspot-rt will be pushed up into the hotspot integration repository at http://hg.openjdk.java.net/jdk7/hotspot/hotspot within a week, and hotspot will in turn be pushed into the jdk7 project repository at http://hg.openjdk.java.net/jdk7/jdk7/hotspot in time for the next jdk7 build, which might be up to a month from now. The changes include adding a src/os_cpu/linux_sparc directory and a change of a 64-bit constant in src/share/vm/oops/oop.inline.hpp to use 'ULL' instead of 'LL' as a suffix so gcc4 wouldn't choke. My build machine's 'uname -a' produces Linux memleak 2.6.15-26-sparc64-smp #1 SMP Fri Sep 8 20:10:24 UTC 2006 sparc64 GNU/Linux which is ancient. memleak is a Sun T2000 (i.e., a niagara 1) box. 'gcc -v' produces Using built-in specs. Target: sparc-linux-gnu Configured with: ../src/configure -v --enable-languages=c,c++,java,f95,objc,ada,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.0 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-java-awt=gtk-default --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/jre --enable-mpfr --disable-werror --with-cpu=v8 --enable-checking=release sparc-linux-gnu Thread model: posix gcc version 4.0.3 (Ubuntu 4.0.3-1ubuntu5) also a bit long in the tooth. All the hotspot make targets work (I tried both client and server, product, optimized, fastdebug, and jvmg) and the resulting vms seem to work. I've got bootstrap jdks but don't know where to put them for public access. Full 32-bit openjdk builds successfully on my build machine, but 64-bit fails with system library linkage issues, probably because it's running such an old distribution. If someone would kindly point me at the latest linux-sparc ubuntu release I'd appreciate it. I've attached the csh scripts I use to build the jdk. If anyone wants the build logs, let me know: I don't want to spam the list. Performance is as good as on solaris, e.g. the compilers generate exactly the same code as they do on solaris. A gotcha is that large pages aren't on by default on linux: you must set up a large page cache and use -XX:+UseLargePages -XX:LargePageSizeInBytes= on the command line. That's the only performance glitch you might encounter that I can think of right now. Some time ago the port passed 95%+ of the jcks, with most of the failures in jdi. Probably only a few real problems left to fix. The code is provided as-is and is totally unsupported by Sun. It'd be really great if someone would step up and propose a project to maintain the port. If enough users are willing to pay $ for support, Sun might eventually decide to support it. The hotspot team will maintain the linux-sparc specific code on a best efforts basis, which, because os_cpu code mutates very slowly, means it'll bit-rot very slowly. I at least will try to build it every few months. We'll be really happy to accept contributions and will sponser them if needed. Same applies to the rest of the linux-sparc specific openjdk code, though the vast majority of that is in the makefiles and also doesn't change all that rapidly (one hopes :) ). Enjoy, Paul -------------- next part -------------- A non-text attachment was scrubbed... Name: build-linux-sparc.csh Type: application/x-csh Size: 1464 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080425/48bb08ad/build-linux-sparc.csh -------------- next part -------------- A non-text attachment was scrubbed... Name: build-linux-sparcv9.csh Type: application/x-csh Size: 1357 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080425/48bb08ad/build-linux-sparcv9.csh -------------- next part -------------- An embedded message was scrubbed... From: Paul Hohensee Subject: Re: Someone is doing a linux-sparc port! (Paul Hohensee) Date: Tue, 04 Mar 2008 13:27:43 -0500 Size: 3773 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080425/48bb08ad/attachment.nws -------------- next part -------------- An embedded message was scrubbed... From: Paul Hohensee Subject: Re: OpenJDK zero on sparc linux Date: Mon, 07 Apr 2008 14:31:04 -0400 Size: 2434 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080425/48bb08ad/attachment-0001.nws From Paul.Hohensee at Sun.COM Fri Apr 25 15:23:48 2008 From: Paul.Hohensee at Sun.COM (Paul Hohensee) Date: Fri, 25 Apr 2008 18:23:48 -0400 Subject: hotspot linux-sparc support has been pushed 2) Message-ID: <481259F4.1030509@sun.com> Repository changeset at http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/435e64505015 Paul From dennis at ausil.us Fri Apr 25 15:34:21 2008 From: dennis at ausil.us (Dennis Gilmore) Date: Fri, 25 Apr 2008 17:34:21 -0500 Subject: hotspot linux-sparc support has been pushed In-Reply-To: <481251E6.3050904@sun.com> References: <481251E6.3050904@sun.com> Message-ID: <200804251734.27453.dennis@ausil.us> On Friday 25 April 2008, Paul Hohensee wrote: Thanks for getting this out there. > > The code is provided as-is and is totally unsupported by Sun. It'd be > really > great if someone would step up and propose a project to maintain the port. > If enough users are willing to pay $ for support, Sun might eventually > decide > to support it. > > The hotspot team will maintain the linux-sparc specific code on a best > efforts basis, which, because os_cpu code mutates very slowly, means > it'll bit-rot very slowly. I at least will try to build it every few > months. > We'll be really happy to accept contributions and will sponser them if > needed. Same applies to the rest of the linux-sparc specific openjdk code, > though the vast majority of that is in the makefiles and also doesn't > change all that rapidly (one hopes :) ). Im working to integrate it into fedora's openjdk builds. We currently have gcc-4.3.0 to build it, the build server is a T1000 uname -a Linux daedalus.ausil.us 2.6.21-1.3149.al3.14smp #1 SMP Wed Aug 29 14:06:19 EDT 2007 sparc64 sparc64 sparc64 GNU/Linux i also have a 2.6.25 kernel i can test. When i get the T2000 next week it will be running Fedora 9 with a 2.6.25 kernel. With secondary architectures for Fedora we will be building everytime fedora builds a new jdk. One of the most requested features for Aurora SPARC Linux is a working java. Not sure if that means there is a market for it. but i think that it will get decent testing. Again thanks for releasing the code. Dennis -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: This is a digitally signed message part. Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080425/d188e27d/attachment.bin From mvfranz at gmail.com Fri Apr 25 17:45:56 2008 From: mvfranz at gmail.com (Michael Franz) Date: Fri, 25 Apr 2008 20:45:56 -0400 Subject: Hotspot generated AD files In-Reply-To: <20080416114620.GA6857@redhat.com> References: <20080416064628.GA3499@redhat.com> <20080416114620.GA6857@redhat.com> Message-ID: Gary, I tried this patch on OS X. Does it matter what ICEDTEA_CORE_BUILD is defined as? I am getting the following error: No rule to make target `jvm_darwin.h', needed by `incls/_precompiled.incl.gch'. Should this be required? Michael > > > It's not a generated file, it's something you have to write > > > yourself if you want to port the server JIT. > > > > Does that mean I can somehow skip this part of the build? If I can > > I would like too. Then come back later. > > The icedtea-core-build.patch (http://tinyurl.com/6hsqns) alters the > build such that if ICEDTEA_CORE_BUILD is set then an interpreter-only > JVM will be built. If you wait a couple of hours I'm hopefully about > to commit an update to it, so if you're not in a rush then that one > will be better for you. > > Cheers, > Gary > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080425/d2605342/attachment.html From mark at klomp.org Sun Apr 27 08:11:06 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 27 Apr 2008 17:11:06 +0200 Subject: (J)Hat tool exclusion Message-ID: <1209309066.3103.24.camel@dijkstra.wildebeest.org> Hi, I found that all distributions (fedora, opensuse, ubuntu) carry a patch to remove the (j)hat tool from the sources. They apparently do this because the files under openjdk/jdk/src/share/classes/com/sun/tools/hat/ contain both the standard GPLv2.0 and SPLv1.0 legal language in their boilerplate. Since the terms of the GNU General Public License and the Sun Public License have conflicting terms this would seem to make them not redistributable. So, should we do the same in icedtea for now? Mark, Dalibor, do you know the history behind these files? I am pretty sure Sun didn't intend this to be read as conflicting terms for redistribution, so nobody should distribute them at all. Maybe they should be read as you can either distribute these files under the GPL or alternatively under the SPL? Is there someone we can/should contact to clarify this? Thanks, Mark From mark at klomp.org Sun Apr 27 09:25:42 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 27 Apr 2008 18:25:42 +0200 Subject: bcopy, bzero, bcmp Message-ID: <1209313542.3103.30.camel@dijkstra.wildebeest.org> Hi, Another patch that all distros seem to apply is one to remove the redefine of bcopy in openjdk/hotspot/src/share/vm/libadt/port.hpp. -#undef bcopy -inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); } +//#undef bcopy +//inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); } Now I cannot find any usage of bcopy (or bzero, or bcmp) in hotspot, so the above seems not to actually do anything. But I was wondering why the above might be necessary. Cheers, Mark From Kelly.Ohair at Sun.COM Sun Apr 27 12:05:32 2008 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Sun, 27 Apr 2008 12:05:32 -0700 Subject: bcopy, bzero, bcmp In-Reply-To: <1209313542.3103.30.camel@dijkstra.wildebeest.org> References: <1209313542.3103.30.camel@dijkstra.wildebeest.org> Message-ID: <4814CE7C.80808@sun.com> Same thing might be said of bcmp, bzero, stricmp, and strcasecmp. Looks like this is just old BSDism cruft that could be deleted. (BSD didn't have the mem*() functions as I recall). It's possible that some other .so might depend on having this extern in libjvm.so, but that strikes me as bad news and if someone is depending on it, they should be taken out and shot or something. ;^) -kto Mark Wielaard wrote: > Hi, > > Another patch that all distros seem to apply is one to remove the > redefine of bcopy in openjdk/hotspot/src/share/vm/libadt/port.hpp. > > -#undef bcopy > -inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); } > +//#undef bcopy > +//inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); } > > Now I cannot find any usage of bcopy (or bzero, or bcmp) in hotspot, so > the above seems not to actually do anything. But I was wondering why the > above might be necessary. > > Cheers, > > Mark > From Kelly.Ohair at Sun.COM Sun Apr 27 12:47:38 2008 From: Kelly.Ohair at Sun.COM (Kelly O'Hair) Date: Sun, 27 Apr 2008 12:47:38 -0700 Subject: (J)Hat tool exclusion In-Reply-To: <1209309066.3103.24.camel@dijkstra.wildebeest.org> References: <1209309066.3103.24.camel@dijkstra.wildebeest.org> Message-ID: <4814D85A.8050604@sun.com> IANAL ... I think this was just an oversight on our part. I will investigate, since I was the one that initiated dragging these files into the jdk sources. -kto Mark Wielaard wrote: > Hi, > > I found that all distributions (fedora, opensuse, ubuntu) carry a patch > to remove the (j)hat tool from the sources. They apparently do this > because the files under openjdk/jdk/src/share/classes/com/sun/tools/hat/ > contain both the standard GPLv2.0 and SPLv1.0 legal language in their > boilerplate. Since the terms of the GNU General Public License and the > Sun Public License have conflicting terms this would seem to make them > not redistributable. > > So, should we do the same in icedtea for now? > > Mark, Dalibor, do you know the history behind these files? I am pretty > sure Sun didn't intend this to be read as conflicting terms for > redistribution, so nobody should distribute them at all. Maybe they > should be read as you can either distribute these files under the GPL or > alternatively under the SPL? Is there someone we can/should contact to > clarify this? > > Thanks, > > Mark > From doko at ubuntu.com Sun Apr 27 15:33:15 2008 From: doko at ubuntu.com (Matthias Klose) Date: Mon, 28 Apr 2008 00:33:15 +0200 Subject: [patch] Don't check md5sum if configured --with-openjdk-src-zip Message-ID: <4814FF2B.1020700@ubuntu.com> Configuring --with-openjdk-src-zip doesn't allow you to set a md5sum as well; assuming that a developer knows what he does, don't check the md5sum when configuring with this option. Ok to check in? Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: nocheck.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080428/cdcea20f/nocheck.diff From mark at klomp.org Sun Apr 27 16:55:12 2008 From: mark at klomp.org (Mark Wielaard) Date: Mon, 28 Apr 2008 01:55:12 +0200 Subject: Add new color profiles Message-ID: <1209340512.3103.42.camel@dijkstra.wildebeest.org> Hi, Andrew and Keith solved a problem with missing color profiles which made some applications (like batik) very unhappy: http://mail.openjdk.java.net/pipermail/2d-dev/2008-April/000261.html They aren't in openjdk[7] or openjdk6 yet, but because it is such an annoying problem I have added them already to icedtea. Since the profiles are basically binary files (I don't believe there is a textual representation defined) it is somewhat difficult to add them to a standard patch. So I added a simple overlay mechanism that might come in handy later as alternative to patch files. The overlay files are copied after the patches are applied. 2008-04-27 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch. (stamps/overlay.stamp): New target. (overlay): Likewise. (stamps/extract-ecj.stamp): Depend on stamps/overlay.stamp. (icedtea): Likewise. (icedtea-debug): Likewise. (stamps/hotspot-tools-copy-source-files.stamp): Likewise. * Makefile.in: Regenerated. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: New file. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Likewise. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Likewise. * patches/icedtea-color-profiles.patch: New patch. I am a happy batik/squiggle user now :) Committed and pushed, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: profile.patch Type: text/x-patch Size: 6724 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080428/dd53d526/profile.patch From mark at klomp.org Sun Apr 27 16:55:46 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 27 Apr 2008 23:55:46 +0000 Subject: changeset in /hg/icedtea6: Add new color profiles. Message-ID: changeset 20700688fd03 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=20700688fd03 description: Add new color profiles. 2008-04-27 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch. (stamps/overlay.stamp): New target. (overlay): Likewise. (stamps/extract-ecj.stamp): Depend on stamps/overlay.stamp. (icedtea): Likewise. (icedtea-debug): Likewise. (stamps/hotspot-tools-copy-source-files.stamp): Likewise. * Makefile.in: Regenerated. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: New file. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Likewise. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Likewise. * patches/icedtea-color-profiles.patch: New patch. diffstat: 4 files changed, 68 insertions(+), 12 deletions(-) ChangeLog | 15 +++++++++++++++ Makefile.am | 18 ++++++++++++------ Makefile.in | 18 ++++++++++++------ patches/icedtea-color-profiles.patch | 29 +++++++++++++++++++++++++++++ diffs (195 lines): diff -r 794c2af9fd68 -r 20700688fd03 ChangeLog --- a/ChangeLog Thu Apr 24 16:46:35 2008 -0400 +++ b/ChangeLog Mon Apr 28 01:46:39 2008 +0200 @@ -1,3 +1,18 @@ 2008-04-24 Lillian Angel + + * Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch. + (stamps/overlay.stamp): New target. + (overlay): Likewise. + (stamps/extract-ecj.stamp): Depend on stamps/overlay.stamp. + (icedtea): Likewise. + (icedtea-debug): Likewise. + (stamps/hotspot-tools-copy-source-files.stamp): Likewise. + * Makefile.in: Regenerated. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: New file. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Likewise. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Likewise. + * patches/icedtea-color-profiles.patch: New patch. + 2008-04-24 Lillian Angel * patches/icedtea-version.patch: Changed product name to OpenJDK. diff -r 794c2af9fd68 -r 20700688fd03 Makefile.am --- a/Makefile.am Thu Apr 24 16:46:35 2008 -0400 +++ b/Makefile.am Mon Apr 28 01:46:39 2008 +0200 @@ -303,6 +303,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ + patches/icedtea-color-profiles.patch \ patches/icedtea-fonts.patch \ $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) @@ -366,11 +367,14 @@ clean-patch: echo "WARNING Not all patches reverted cleanly" ; \ fi +stamps/overlay.stamp: stamps/patch.stamp + cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp + # OpenJDK ecj Source Preparation Targets # ====================================== # Copy over OpenJDK sources for ecj. -stamps/extract-ecj.stamp: stamps/patch.stamp +stamps/extract-ecj.stamp: stamps/patch.stamp stamps/overlay.stamp if ! test -d openjdk-ecj ; then \ cp -pPRl openjdk openjdk-ecj ; \ fi @@ -563,8 +567,8 @@ endif # you change it in the icedtea-debug target as well. icedtea: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make/ \ @@ -586,8 +590,8 @@ icedtea: stamps/bootstrap-directory-syml icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make \ @@ -741,7 +745,7 @@ OPENJDK_SOURCEPATH_DIRS = \ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) # tools.jar class files. -stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp +stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ @@ -939,6 +943,8 @@ patch-ecj: stamps/patch-ecj.stamp patch: stamps/patch.stamp +overlay: stamps/overlay.stamp + plugs: stamps/plugs.stamp rt-class-files: stamps/rt-class-files.stamp diff -r 794c2af9fd68 -r 20700688fd03 Makefile.in --- a/Makefile.in Thu Apr 24 16:46:35 2008 -0400 +++ b/Makefile.in Mon Apr 28 01:46:39 2008 +0200 @@ -410,6 +410,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ + patches/icedtea-color-profiles.patch \ patches/icedtea-fonts.patch $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) $(am__append_7) @@ -874,11 +875,14 @@ clean-patch: echo "WARNING Not all patches reverted cleanly" ; \ fi +stamps/overlay.stamp: stamps/patch.stamp + cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp + # OpenJDK ecj Source Preparation Targets # ====================================== # Copy over OpenJDK sources for ecj. -stamps/extract-ecj.stamp: stamps/patch.stamp +stamps/extract-ecj.stamp: stamps/patch.stamp stamps/overlay.stamp if ! test -d openjdk-ecj ; then \ cp -pPRl openjdk openjdk-ecj ; \ fi @@ -1033,8 +1037,8 @@ clean-bootstrap-directory-symlink-ecj: # you change it in the icedtea-debug target as well. icedtea: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make/ \ @@ -1056,8 +1060,8 @@ icedtea: stamps/bootstrap-directory-syml icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ stamps/hotspot-tools.stamp stamps/plugs.stamp \ - stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so \ - extra-lib/about.jar + stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \ + gcjwebplugin.so extra-lib/about.jar $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make \ @@ -1181,7 +1185,7 @@ clean-copy: done # tools.jar class files. -stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp +stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ @@ -1379,6 +1383,8 @@ patch-ecj: stamps/patch-ecj.stamp patch: stamps/patch.stamp +overlay: stamps/overlay.stamp + plugs: stamps/plugs.stamp rt-class-files: stamps/rt-class-files.stamp diff -r 794c2af9fd68 -r 20700688fd03 overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed diff -r 794c2af9fd68 -r 20700688fd03 overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed diff -r 794c2af9fd68 -r 20700688fd03 overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed diff -r 794c2af9fd68 -r 20700688fd03 patches/icedtea-color-profiles.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-color-profiles.patch Mon Apr 28 01:46:39 2008 +0200 @@ -0,0 +1,29 @@ +# Changeset: 804b0757d801 +# Author: prr +# Date: 2008-04-24 11:58 -0700 +# URL: http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801 +# +# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles +# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix. +# Reviewed-by: jgodinez, avu, prr +# Contributed-by: aph at redhat.com +# +# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/ + +--- openjdk/jdk/make/sun/cmm/Makefile.orig 2008-04-27 23:59:37.000000000 +0200 ++++ openjdk/jdk/make/sun/cmm/Makefile 2008-04-27 23:59:45.000000000 +0200 +@@ -41,12 +41,8 @@ + ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm + + iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \ +- $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf +- +-ifndef OPENJDK +-iccprofiles: $(ICCPROFILE_DEST_DIR)/PYCC.pf \ +- $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf +-endif ++ $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \ ++ $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf + + $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf + $(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf From mail4openjdk2java9net at stuart.es Mon Apr 28 02:05:50 2008 From: mail4openjdk2java9net at stuart.es (Stuart Pook) Date: Mon, 28 Apr 2008 11:05:50 +0200 Subject: icedtea6 build fails on Debian unstable with "missing return value" Message-ID: <4815936E.5080006@stuart.es> Hello The build of http://icedtea.classpath.org/hg/icedtea6 fails on my Debian Intel Core2 Duo CPU machine with the message "missing return value". I have no idea why. Can anyone give me a hint? I did a pull and an update this morning and "hg identify" says "20700688fd03+ tip" (if that means anything). I did a "make distclean" then "./configure --with-java=/usr/bin/gij-4.3 --with-javah=/usr/bin/gjavah-4.3 --with-jar=/usr/bin/gjar-4.3 --with-rmic=/usr/bin/grmic-4.3". The make runs for an hour and then dies with build-bootstrap-javac: [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [mkdir] Created dir: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [pcompile] Generating 7 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [copy] Copying 1 file to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [pcompile] Generating 1 resource files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/gensrc [javac] Compiling 8 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] Compiling 243 source files to /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/control/build/linux-i586/langtools/build/bootstrap/classes [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/Modifier.java:74: missing return value [javac] return lowercase; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/type/TypeKind.java:157: missing return value [javac] return true; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/type/TypeKind.java:160: missing return value [javac] return false; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/NestingKind.java:97: missing return value [javac] return this != TOP_LEVEL; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/ElementKind.java:101: missing return value [javac] return this == CLASS || this == ENUM; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/ElementKind.java:111: missing return value [javac] return this == INTERFACE || this == ANNOTATION_TYPE; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/element/ElementKind.java:121: missing return value [javac] return this == FIELD || this == ENUM_CONSTANT; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/SourceVersion.java:130: missing return value [javac] return RELEASE_6; [javac] ^ [javac] /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/src/share/classes/javax/lang/model/SourceVersion.java:139: missing return value [...] BUILD FAILED /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/make/build.xml:177: The following error occurred while executing this line: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/make/build.xml:413: The following error occurred while executing this line: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/make/build.xml:451: The following error occurred while executing this line: /home/stuart/install/icedtea/Mercurial/icedtea6/openjdk/langtools/make/build.xml:514: Compile failed; see the compiler error output for details. From doko at ubuntu.com Mon Apr 28 02:28:34 2008 From: doko at ubuntu.com (Matthias Klose) Date: Mon, 28 Apr 2008 11:28:34 +0200 Subject: another review of copyright/license stuff in openjdk-b09 In-Reply-To: <480DD868.2060003@ubuntu.com> References: <480DD868.2060003@ubuntu.com> Message-ID: <481598C2.9020308@ubuntu.com> there some more files without source in the tarball; the majority not required for a Linux build, however the following files are required for the build. $ find openjdk -name '*.jar' -o -name '*.class'|grep -v test openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib/jscheme.jar openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib/jschemelogutil.jar this is from http://jscheme.sourceforge.net/jscheme/main.html? mentioned in the third party readme "... Altered versions may be distributed in packages under other licenses (such as the GNU license)." I don't know if this is altered or not, but it would make things clearer if the source is included. openjdk/hotspot/build/linux/Queens.class openjdk/hotspot/build/solaris/Queens.class Couldn't find any source for these. openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar no source as well, but those are not required by the build. I didn't look at jar and class files in test directories yet. There are some more binary files, which are not removed by the generate-fedora script; I'm attaching my current version of the script to build the dfsg tarball. Matthias -------------- next part -------------- A non-text attachment was scrubbed... Name: generate-dfsg-zip.sh Type: application/x-sh Size: 6398 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080428/1e44cbeb/generate-dfsg-zip.sh From mark at klomp.org Mon Apr 28 03:03:40 2008 From: mark at klomp.org (Mark Wielaard) Date: Mon, 28 Apr 2008 12:03:40 +0200 Subject: [patch] Don't check md5sum if configured --with-openjdk-src-zip In-Reply-To: <4814FF2B.1020700@ubuntu.com> References: <4814FF2B.1020700@ubuntu.com> Message-ID: <1209377020.3098.7.camel@dijkstra.wildebeest.org> Hi Matthias, On Mon, 2008-04-28 at 00:33 +0200, Matthias Klose wrote: > Configuring --with-openjdk-src-zip doesn't allow you to set a md5sum as well; > assuming that a developer knows what he does, don't check the md5sum when > configuring with this option. Ok to check in? > > 2008-04-28 Matthias Klose > > * Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip. > * Makefile.in: Regenerate. Yes, I think this makes sense. I would feel somewhat more comfortable with an explicit --disable-md5-check, but I guess that might be too much. Cheers, Mark From doko at ubuntu.com Mon Apr 28 03:20:07 2008 From: doko at ubuntu.com (doko at ubuntu.com) Date: Mon, 28 Apr 2008 10:20:07 +0000 Subject: changeset in /hg/icedtea6: 2008-04-28 Matthias Klose changeset cf748f5fffce in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cf748f5fffce description: 2008-04-28 Matthias Klose * Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip. * Makefile.in: Regenerated. diffstat: 3 files changed, 17 insertions(+), 9 deletions(-) ChangeLog | 5 +++++ Makefile.am | 3 +++ Makefile.in | 18 +++++++++--------- diffs (60 lines): diff -r 20700688fd03 -r cf748f5fffce ChangeLog --- a/ChangeLog Mon Apr 28 01:46:39 2008 +0200 +++ b/ChangeLog Mon Apr 28 12:19:31 2008 +0200 @@ -1,3 +1,8 @@ 2008-04-27 Mark Wielaard + + * Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip. + * Makefile.in: Regenerated. + 2008-04-27 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch. diff -r 20700688fd03 -r cf748f5fffce Makefile.am --- a/Makefile.am Mon Apr 28 01:46:39 2008 +0200 +++ b/Makefile.am Mon Apr 28 12:19:31 2008 +0200 @@ -201,6 +201,8 @@ endif endif stamps/download.stamp: +if USE_ALT_OPENJDK_SRC_ZIP +else if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ | $(MD5SUM) --check ; \ then \ @@ -210,6 +212,7 @@ stamps/download.stamp: fi ; \ $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \ fi +endif mkdir -p stamps touch stamps/download.stamp diff -r 20700688fd03 -r cf748f5fffce Makefile.in --- a/Makefile.in Mon Apr 28 01:46:39 2008 +0200 +++ b/Makefile.in Mon Apr 28 12:19:31 2008 +0200 @@ -788,15 +788,15 @@ snapshot: dist mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz stamps/download.stamp: - if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(OPENJDK_SRC_ZIP) ] ; \ - then \ - mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \ - fi + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ | $(MD5SUM) --check ; \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ then \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ if [ $(OPENJDK_SRC_ZIP) ] ; \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ then \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ fi ; \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \ + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ fi mkdir -p stamps touch stamps/download.stamp From bugzilla-daemon at icedtea.classpath.org Mon Apr 28 03:29:49 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:29:49 +0000 Subject: [Bug 138] New: jdk6 - DFSG compliant licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 Summary: jdk6 - DFSG compliant licenses and documented copyrights and licenses Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com meta report to track the status of the opendjk6 upstream tarball regarding DFSG compliant licenses and documented copyrights and licenses. Please file separate reports for single issues and add a 'Blocks' on this report. -- 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 Apr 28 03:30:32 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:30:32 +0000 Subject: [Bug 138] jdk6 - DFSG compliant licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|normal |major Status|NEW |ASSIGNED -- 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 Apr 28 03:39:56 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:39:56 +0000 Subject: [Bug 139] New: no source included for maf-1_0.jar, jlfgr-1_0.jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=139 Summary: no source included for maf-1_0.jar, jlfgr-1_0.jar Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com OtherBugsDependingO 138 nThis: No source icluded for these jar files, apparently the build doesn't require these. openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar -- 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 Apr 28 03:39:56 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:39:56 +0000 Subject: [Bug 138] jdk6 - DFSG compliant licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |139 -- 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 Apr 28 03:41:29 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:41:29 +0000 Subject: [Bug 140] New: no source included for jscheme*jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140 Summary: no source included for jscheme*jar Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com OtherBugsDependingO 138 nThis: openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib/jscheme.jar openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib/jschemelogutil.jar this is from http://jscheme.sourceforge.net/jscheme/main.html? mentioned in the third party readme "... Altered versions may be distributed in packages under other licenses (such as the GNU license)." I don't know if this is altered or not, but it would make things clearer if the source is included. -- 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 Apr 28 03:41:30 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:41:30 +0000 Subject: [Bug 138] jdk6 - DFSG compliant licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |140 -- 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 Apr 28 03:47:32 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:47:32 +0000 Subject: [Bug 138] jdk6 - free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|jdk6 - DFSG compliant |jdk6 - free software |licenses and documented |licenses and documented |copyrights and licenses |copyrights and licenses -- 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 Apr 28 03:49:23 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:49:23 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 aph at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|jdk6 - free software |jdk6 - GPL-compatible free |licenses and documented |software licenses and |copyrights and licenses |documented copyrights and | |licenses -- 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 Apr 28 03:57:02 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:57:02 +0000 Subject: [Bug 141] New: corba .prp files "contain restricted materials of IBM" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=141 Summary: corba .prp files "contain restricted materials of IBM" Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com OtherBugsDependingO 138 nThis: # THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_*.prp openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable*.prp -- 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 Apr 28 03:57:03 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:57:03 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |141 -- 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 Apr 28 03:57:51 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 10:57:51 +0000 Subject: [Bug 141] corba .prp files "contain restricted materials of IBM" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=141 ------- Comment #1 from doko at ubuntu.com 2008-04-28 10:57 ------- openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set -- 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 Apr 28 04:07:35 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 11:07:35 +0000 Subject: [Bug 142] New: corrupt and/or files which cannot be built from the source files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142 Summary: corrupt and/or files which cannot be built from the source files Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com OtherBugsDependingO 138 nThis: Question for the following files: can these be edited/modfied using free tools? - openjdk/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/ the .gif and .png files built from .vsd and .sxd files are corrupt, cannot be opened. The .sxd file is probably an OOo Impress file, but cannot be opened with OOo 2.4. The .vsd file is a Visio file? If yes, can the packages.png generated by free software? -- 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 Apr 28 04:07:36 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 11:07:36 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 doko at ubuntu.com changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |142 -- 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 langel at redhat.com Mon Apr 28 05:24:26 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 28 Apr 2008 08:24:26 -0400 Subject: [patch] Don't check md5sum if configured --with-openjdk-src-zip In-Reply-To: <4814FF2B.1020700@ubuntu.com> References: <4814FF2B.1020700@ubuntu.com> Message-ID: <4815C1FA.6090701@redhat.com> Matthias Klose wrote: > Configuring --with-openjdk-src-zip doesn't allow you to set a md5sum as well; > assuming that a developer knows what he does, don't check the md5sum when > configuring with this option. Ok to check in? > Yes, thanks Lillian > Matthias > > > From bugzilla-daemon at icedtea.classpath.org Mon Apr 28 05:56:05 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 12:56:05 +0000 Subject: [Bug 143] New: (J)Hat tool has conflicting GPL/SPL license terms Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=143 Summary: (J)Hat tool has conflicting GPL/SPL license terms Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org OtherBugsDependingO 138 nThis: The files under openjdk/jdk/src/share/classes/com/sun/tools/hat/ contain both the standard GPLv2.0 and SPLv1.0 legal language in their boilerplate. Since the terms of the GNU General Public License and the Sun Public License have conflicting terms this would seem to make them not redistributable. And various GNU/Linux distributions do exclude these files from their packages. See also the thread starting at: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-April/001801.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. From bugzilla-daemon at icedtea.classpath.org Mon Apr 28 05:56:06 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 12:56:06 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |143 -- 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 Apr 28 06:07:58 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 13:07:58 +0000 Subject: [Bug 144] New: jvmtiLib.xsl and archDesc.cpp generate files with SUN PROPRIETARY/CONFIDENTIAL notices (openjdk6 only) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=144 Summary: jvmtiLib.xsl and archDesc.cpp generate files with SUN PROPRIETARY/CONFIDENTIAL notices (openjdk6 only) Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org OtherBugsDependingO 138 nThis: openjdk/hotspot/src/share/vm/prims/jvmtiLib.xsl and openjdk/hotspot/src/share/vm/adlc/archDesc.cpp generate files which contain "SUN PROPRIETARY/CONFIDENTIAL" notices. This is only in openjdk6 (b09), jdk7 has a fix for this and icedtea contains a patch to correct the issue: patches/icedtea-hotspot-6b06-7b24.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 bugzilla-daemon at icedtea.classpath.org Mon Apr 28 06:07:59 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 13:07:59 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |144 -- 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 Apr 28 06:14:34 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 13:14:34 +0000 Subject: [Bug 145] New: hotspot copy.cpp and vmStructs_parNew.hpp source files contains proprietary sun notice (openjdk6 only) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=145 Summary: hotspot copy.cpp and vmStructs_parNew.hpp source files contains proprietary sun notice (openjdk6 only) Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org OtherBugsDependingO 138 nThis: The files in hotspot (openjdk/hotspot/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp and openjdk/hotspot/src/share/vm/utilities/copy.cpp) in openjdk6 just says: * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. The version on jdk7 has the GPL boilerplate on it (and icedtea patches this file to be the same as the jdk7 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 Mon Apr 28 06:14:35 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 13:14:35 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |145 -- 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 Apr 28 06:20:43 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Apr 2008 13:20:43 +0000 Subject: [Bug 140] no source included for jscheme*jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140 ------- Comment #1 from mark at klomp.org 2008-04-28 13:20 ------- The jschemelogutil.jar contains only two classes: com/sun/tools/corba/se/logutil/IndentingPrintWriter.class com/sun/tools/corba/se/logutil/StringUtil.class The source can be found at: openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/IndentingPrintWriter.java openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/StringUtil.java -- 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 langel at redhat.com Mon Apr 28 07:15:34 2008 From: langel at redhat.com (Lillian Angel) Date: Mon, 28 Apr 2008 14:15:34 +0000 Subject: changeset in /hg/icedtea6: 2008-04-28 Lillian Angel changeset 0bdd2917dfdb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0bdd2917dfdb description: 2008-04-28 Lillian Angel * Makefile.am (EXTRA_DIST): Added overlays and extra. * Makefile.in: Regenerated. diffstat: 3 files changed, 10 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 3 ++- Makefile.in | 3 ++- diffs (39 lines): diff -r cf748f5fffce -r 0bdd2917dfdb ChangeLog --- a/ChangeLog Mon Apr 28 12:19:31 2008 +0200 +++ b/ChangeLog Mon Apr 28 10:15:30 2008 -0400 @@ -1,3 +1,9 @@ 2008-04-28 Matthias Klose + + * Makefile.am + (EXTRA_DIST): Added overlays and extra. + * Makefile.in: Regenerated. + 2008-04-28 Matthias Klose * Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip. diff -r cf748f5fffce -r 0bdd2917dfdb Makefile.am --- a/Makefile.am Mon Apr 28 12:19:31 2008 +0200 +++ b/Makefile.am Mon Apr 28 10:15:30 2008 -0400 @@ -41,7 +41,8 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ - patches/icedtea-cacao.patch javaws.png javaws.desktop + patches/icedtea-cacao.patch javaws.png javaws.desktop \ + overlays extra # The Binary plugs directory is called jdk1.7.0 for historical reasons. The # name is completely irrelevant; only contains the plugs to build IcedTea. diff -r cf748f5fffce -r 0bdd2917dfdb Makefile.in --- a/Makefile.in Mon Apr 28 12:19:31 2008 +0200 +++ b/Makefile.in Mon Apr 28 10:15:30 2008 -0400 @@ -257,7 +257,8 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ - patches/icedtea-cacao.patch javaws.png javaws.desktop + patches/icedtea-cacao.patch javaws.png javaws.desktop \ + overlays extra # The Binary plugs directory is called jdk1.7.0 for historical reasons. The From Paul.Hohensee at Sun.COM Mon Apr 28 09:00:38 2008 From: Paul.Hohensee at Sun.COM (Paul Hohensee) Date: Mon, 28 Apr 2008 12:00:38 -0400 Subject: hotspot linux-sparc support has been pushed In-Reply-To: <200804251734.27453.dennis@ausil.us> References: <481251E6.3050904@sun.com> <200804251734.27453.dennis@ausil.us> Message-ID: <4815F4A6.1010503@sun.com> An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080428/d7d15eb1/attachment.html From Joe.Darcy at Sun.COM Mon Apr 28 10:03:05 2008 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Mon, 28 Apr 2008 10:03:05 -0700 Subject: Add new color profiles In-Reply-To: <1209340512.3103.42.camel@dijkstra.wildebeest.org> References: <1209340512.3103.42.camel@dijkstra.wildebeest.org> Message-ID: <48160349.5050708@sun.com> Hello. Mark Wielaard wrote: > Hi, > > Andrew and Keith solved a problem with missing color profiles which made > some applications (like batik) very unhappy: > http://mail.openjdk.java.net/pipermail/2d-dev/2008-April/000261.html > > They aren't in openjdk[7] or openjdk6 yet, but because it is such an This fix will be in the next OpenJDK 6 drop, which will probably be after JavaOne (May 6-9). -Joe > annoying problem I have added them already to icedtea. Since the > profiles are basically binary files (I don't believe there is a textual > representation defined) it is somewhat difficult to add them to a > standard patch. So I added a simple overlay mechanism that might come in > handy later as alternative to patch files. The overlay files are copied > after the patches are applied. > > 2008-04-27 Mark Wielaard > > * Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch. > (stamps/overlay.stamp): New target. > (overlay): Likewise. > (stamps/extract-ecj.stamp): Depend on stamps/overlay.stamp. > (icedtea): Likewise. > (icedtea-debug): Likewise. > (stamps/hotspot-tools-copy-source-files.stamp): Likewise. > * Makefile.in: Regenerated. > * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: New file. > * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: > Likewise. > * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Likewise. > * patches/icedtea-color-profiles.patch: New patch. > > I am a happy batik/squiggle user now :) > > Committed and pushed, > > Mark > From bugzilla-daemon at icedtea.classpath.org Tue Apr 29 02:07:44 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 09:07:44 +0000 Subject: [Bug 136] compilation of 6-1.1 crashes on jar option error [invalid option -- J] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=136 ------- Comment #2 from Gerard.Vidal at ens-lyon.fr 2008-04-29 09:07 ------- No I have not found a workaround. Can you tell me how your system jumps over the -J options that are not allowed. Are they present in your instructions and java passes through, or your makefile is better than mine and does not have these invalid -J options. 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 bugzilla-daemon at icedtea.classpath.org Tue Apr 29 05:58:23 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 12:58:23 +0000 Subject: [Bug 136] compilation of 6-1.1 crashes on jar option error [invalid option -- J] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=136 ------- Comment #3 from Gerard.Vidal at ens-lyon.fr 2008-04-29 12:58 ------- Maybe a solution... I have commented out all the JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%) lines in the four Defs-java.gmk and replaced them with JAR_JFLAGS = Probably a bit violent and not correct, but the compilation finishes without any other 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 Tue Apr 29 08:54:30 2008 From: gbenson at redhat.com (Gary Benson) Date: Tue, 29 Apr 2008 16:54:30 +0100 Subject: Hotspot generated AD files In-Reply-To: References: <20080416064628.GA3499@redhat.com> <20080416114620.GA6857@redhat.com> Message-ID: <20080429155429.GA3819@redhat.com> Yes, that file is required, you'll have to create it yourself in order to build on Darwin. Cheers, Gary Michael Franz wrote: > Gary, > > I tried this patch on OS X. Does it matter what ICEDTEA_CORE_BUILD > is defined as? I am getting the following error: No rule to make > target `jvm_darwin.h', needed by `incls/_precompiled.incl.gch'. > > Should this be required? > > Michael > > > > > It's not a generated file, it's something you have to write > > > > yourself if you want to port the server JIT. > > > > > > Does that mean I can somehow skip this part of the build? If I can > > > I would like too. Then come back later. > > > > The icedtea-core-build.patch (http://tinyurl.com/6hsqns) alters the > > build such that if ICEDTEA_CORE_BUILD is set then an interpreter-only > > JVM will be built. If you wait a couple of hours I'm hopefully about > > to commit an update to it, so if you're not in a rush then that one > > will be better for you. > > > > Cheers, > > Gary -- http://gbenson.net/ From langel at redhat.com Tue Apr 29 09:34:43 2008 From: langel at redhat.com (Lillian Angel) Date: Tue, 29 Apr 2008 16:34:43 +0000 Subject: changeset in /hg/icedtea6: 2008-04-29 Lillian Angel changeset d0081b7856c8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d0081b7856c8 description: 2008-04-29 Lillian Angel * jconsole.desktop: New file. * policytool.desktop: New file. diffstat: 1 file changed, 5 insertions(+) ChangeLog | 5 +++++ diffs (12 lines): diff -r 0bdd2917dfdb -r d0081b7856c8 ChangeLog --- a/ChangeLog Mon Apr 28 10:15:30 2008 -0400 +++ b/ChangeLog Tue Apr 29 12:34:39 2008 -0400 @@ -1,3 +1,8 @@ 2008-04-28 Lillian Angel + + * jconsole.desktop: New file. + * policytool.desktop: New file. + 2008-04-28 Lillian Angel * Makefile.am From langel at redhat.com Tue Apr 29 09:47:58 2008 From: langel at redhat.com (Lillian Angel) Date: Tue, 29 Apr 2008 16:47:58 +0000 Subject: changeset in /hg/icedtea6: 2008-04-29 Lillian Angel changeset 1b845dd20b86 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1b845dd20b86 description: 2008-04-29 Lillian Angel * Makefile.am (EXTRA_DIST): Added jconsole.desktop and policytool.desktop. * Makefile.in: Regenerated. diffstat: 5 files changed, 28 insertions(+), 2 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 2 +- Makefile.in | 2 +- jconsole.desktop | 10 ++++++++++ policytool.desktop | 10 ++++++++++ diffs (65 lines): diff -r d0081b7856c8 -r 1b845dd20b86 ChangeLog --- a/ChangeLog Tue Apr 29 12:34:39 2008 -0400 +++ b/ChangeLog Tue Apr 29 12:47:53 2008 -0400 @@ -1,3 +1,9 @@ 2008-04-29 Lillian Angel + + * Makefile.am + (EXTRA_DIST): Added jconsole.desktop and policytool.desktop. + * Makefile.in: Regenerated. + 2008-04-29 Lillian Angel * jconsole.desktop: New file. diff -r d0081b7856c8 -r 1b845dd20b86 Makefile.am --- a/Makefile.am Tue Apr 29 12:34:39 2008 -0400 +++ b/Makefile.am Tue Apr 29 12:47:53 2008 -0400 @@ -42,7 +42,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ patches/icedtea-cacao.patch javaws.png javaws.desktop \ - overlays extra + overlays extra jconsole.desktop policytool.desktop # The Binary plugs directory is called jdk1.7.0 for historical reasons. The # name is completely irrelevant; only contains the plugs to build IcedTea. diff -r d0081b7856c8 -r 1b845dd20b86 Makefile.in --- a/Makefile.in Tue Apr 29 12:34:39 2008 -0400 +++ b/Makefile.in Tue Apr 29 12:47:53 2008 -0400 @@ -258,7 +258,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC gcjwebplugin.cc tools-copy contrib ports \ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \ patches/icedtea-cacao.patch javaws.png javaws.desktop \ - overlays extra + overlays extra jconsole.desktop policytool.desktop # The Binary plugs directory is called jdk1.7.0 for historical reasons. The diff -r d0081b7856c8 -r 1b845dd20b86 jconsole.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jconsole.desktop Tue Apr 29 12:47:53 2008 -0400 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=/usr/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Monitor;Java; +Version=1.0 diff -r d0081b7856c8 -r 1b845dd20b86 policytool.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/policytool.desktop Tue Apr 29 12:47:53 2008 -0400 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=/usr/binpolicytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Java; +Version=1.0 From Tim.Bell at Sun.COM Tue Apr 29 10:21:34 2008 From: Tim.Bell at Sun.COM (Tim Bell) Date: Tue, 29 Apr 2008 10:21:34 -0700 Subject: Build Fails on Debian PPC Message-ID: <4817591E.6070506@sun.com> Harley wrote: > /home/harley/icedtea/openjdk-ecj/hotspot/src/os/linux/vm/jvm_linux.cpp:179: warning: deprecated conversion from string constant to ?char*? For the record, this is Sun Bug-ID 6681796: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6681796 Tim From bugzilla-daemon at icedtea.classpath.org Tue Apr 29 14:32:53 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 21:32:53 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 ------- Comment #1 from mark at klomp.org 2008-04-29 21:32 ------- This bug tracks (legal) issues that conflict with the free software guidelines of various GNU/Linux distributions: The Debian Free Software Guidelines (DFSG) http://www.debian.org/social_contract#guidelines Fedora Packaging Guidelines http://fedoraproject.org/wiki/Packaging/Guidelines Issues tracked are, no, or unclear, legal notices on source files, conflicting legal notices on files, binaries for which no sources are available, or binaries which aren't actually build from the corresponding source code. The last category is important because GNU/Linux distributions have rules against source packages including pre-build binaries, packages need to be build from source code that is the preferred form of the work for making modifications to. -- 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 Apr 29 15:05:38 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 22:05:38 +0000 Subject: [Bug 146] New: windows executables in sources Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=146 Summary: windows executables in sources Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org openjdk/jdk/make/tools/winver/bin/winver.exe source available in jdk/make/tools/winver/src -- 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 Apr 29 15:05:47 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 22:05:47 +0000 Subject: [Bug 146] windows executables in sources Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=146 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- OtherBugsDependingO| |138 nThis| | -- 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 Apr 29 15:05:48 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 22:05:48 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |146 -- 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 Apr 29 15:25:44 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 22:25:44 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |147 -- 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 Apr 29 15:25:43 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 22:25:43 +0000 Subject: [Bug 147] New: Queens.class isn't build from source Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=147 Summary: Queens.class isn't build from source Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org OtherBugsDependingO 138 nThis: openjdk/hotspot/build/linux/Queens.class openjdk/hotspot/build/solaris/Queens.class sources are available under hotspot/build/test/Queens.java but aren't build from source during the build. The class is run from the gamma_test in hotspot/build/linux/makefiles/buildtree.make -- 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 Apr 29 16:03:36 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 23:03:36 +0000 Subject: [Bug 148] New: AutoMulti and TestALFGenerator generates Sun proprietary notices Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=148 Summary: AutoMulti and TestALFGenerator generates Sun proprietary notices Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org OtherBugsDependingO 138 nThis: openjdk/jdk/make/tools/src/build/tools/automulti/AutoMulti.java openjdk/jdk/make/tools/src/build/tools/automulti/TestALFGenerator.java These generate files in openjdk/jdk/src/share/classes/javax/swing/plaf/multi with: * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. * * This software is the proprietary information of Sun Microsystems, Inc. * Use is subject to license terms. See the createPreamble() method. IcedTea contains a patch to change this to generating the standard GPL boilerplate in patches/icedtea-license-headers.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 bugzilla-daemon at icedtea.classpath.org Tue Apr 29 16:03:36 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 29 Apr 2008 23:03:36 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |148 -- 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 Apr 30 06:34:50 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Apr 2008 13:34:50 +0000 Subject: [Bug 149] New: soundbank.gm binary file included in sources Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149 Summary: soundbank.gm binary file included in sources Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mark at klomp.org OtherBugsDependingO 138 nThis: openjdk/jdk/src/share/lib/audio/soundbank.gm This is a 500K binary file of a proprietary, non-published soundbank file format for which no free reader or editor is available. -- 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 Apr 30 06:34:53 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Apr 2008 13:34:53 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- BugsThisDependsOn| |149 -- 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 Apr 30 07:43:51 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Apr 2008 14:43:51 +0000 Subject: [Bug 141] corba .prp files "contain restricted materials of IBM" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=141 ------- Comment #2 from tv+icedteabugzilla at beamnet.de 2008-04-30 14:43 ------- This seems to be one of the bugs that seems to stall inclusion in Debian without some clarification or resolution and we don't have much idea of how to work around. -- 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 Apr 30 07:49:27 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 30 Apr 2008 14:49:27 +0000 Subject: [Bug 149] soundbank.gm binary file included in sources Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149 ------- Comment #1 from mark at klomp.org 2008-04-30 14:49 ------- To be clear, this (large) file does get installed (under jre/lib/audio/) but is completely useless. Even when we import a new midi synthesizer implementation it will most likely not support this soundbank format since there is no documentation for it. See also http://openjdk.java.net/projects/audio-engine/ -- 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 mark at klomp.org Wed Apr 30 13:09:38 2008 From: mark at klomp.org (Mark Wielaard) Date: Wed, 30 Apr 2008 20:09:38 +0000 Subject: changeset in /hg/icedtea6: Integrate Gervill. Message-ID: changeset bcba163568ac in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bcba163568ac description: Integrate Gervill. 2008-04-30 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-gervill.patch. * Makefile.in: Regenerated. * patches/icedtea-gervill.patch: New patch. * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*: New Gervill files. diffstat: 101 files changed, 26224 insertions(+), 2 deletions(-) ChangeLog | 8 Makefile.am | 1 Makefile.in | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 141 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 670 ++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java | 297 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java | 132 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java | 85 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 179 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java | 115 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java | 384 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java | 284 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java | 162 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSample.java | 131 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java | 62 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java | 85 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java | 1333 ++++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 82 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 2795 ++++++++++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java | 771 ++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java | 49 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java | 48 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 118 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/LICENSE | 347 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java | 130 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java | 205 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 347 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 296 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java | 54 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java | 149 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java | 99 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java | 41 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java | 47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java | 153 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java | 143 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java | 55 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java | 66 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java | 44 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java | 46 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java | 57 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java | 130 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelSource.java | 104 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java | 88 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java | 134 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java | 37 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java | 50 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/PATInstrument.java | 536 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/PATSample.java | 113 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/PATSoundbankReader.java | 294 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt | 403 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java | 46 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java | 47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java | 308 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java | 377 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java | 36 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java | 808 ++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java | 46 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java | 85 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java | 46 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java | 96 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Region.java | 179 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java | 219 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java | 1000 +++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java | 86 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java | 210 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java | 155 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 422 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java | 112 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java | 52 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 102 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java | 1502 +++++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java | 206 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 383 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftControl.java | 40 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java | 91 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java | 338 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 657 ++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java | 95 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 278 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 121 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java | 202 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java | 74 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java | 110 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 138 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 1003 +++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java | 218 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java | 763 ++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java | 67 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java | 43 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java | 56 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java | 93 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java | 39 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java | 41 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java | 500 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java | 61 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java | 144 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 1006 +++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java | 259 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 959 +++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java | 173 patches/icedtea-gervill.patch | 30 diffs (truncated from 26651 to 500 lines): diff -r 1b845dd20b86 -r bcba163568ac ChangeLog --- a/ChangeLog Tue Apr 29 12:47:53 2008 -0400 +++ b/ChangeLog Wed Apr 30 22:09:08 2008 +0200 @@ -1,3 +1,11 @@ 2008-04-29 Lillian Angel + + * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-gervill.patch. + * Makefile.in: Regenerated. + * patches/icedtea-gervill.patch: New patch. + * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*: + New Gervill files. + 2008-04-29 Lillian Angel * Makefile.am diff -r 1b845dd20b86 -r bcba163568ac Makefile.am --- a/Makefile.am Tue Apr 29 12:47:53 2008 -0400 +++ b/Makefile.am Wed Apr 30 22:09:08 2008 +0200 @@ -309,6 +309,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-color-createcontext.patch \ patches/icedtea-color-profiles.patch \ patches/icedtea-fonts.patch \ + patches/icedtea-gervill.patch \ $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r 1b845dd20b86 -r bcba163568ac Makefile.in --- a/Makefile.in Tue Apr 29 12:47:53 2008 -0400 +++ b/Makefile.in Wed Apr 30 22:09:08 2008 +0200 @@ -412,8 +412,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ patches/icedtea-color-profiles.patch \ - patches/icedtea-fonts.patch $(GCC_PATCH) \ - $(DISTRIBUTION_PATCHES) $(am__append_7) + patches/icedtea-fonts.patch patches/icedtea-gervill.patch \ + $(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7) # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch diff -r 1b845dd20b86 -r bcba163568ac overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java Wed Apr 30 22:09:08 2008 +0200 @@ -0,0 +1,141 @@ +/* + * 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. + */ + +package com.sun.media.sound; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +import javax.sound.midi.InvalidMidiDataException; +import javax.sound.midi.Soundbank; +import javax.sound.midi.spi.SoundbankReader; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.UnsupportedAudioFileException; + +/** + * Soundbank reader that uses audio files as soundbanks. + * + * @version %I%, %E% + * @author Karl Helgason + * + */ +public class AudioFileSoundbankReader extends SoundbankReader { + + public Soundbank getSoundbank(URL url) throws InvalidMidiDataException, + IOException { + try { + AudioInputStream ais = AudioSystem.getAudioInputStream(url); + Soundbank sbk = getSoundbank(ais); + ais.close(); + return sbk; + } catch (UnsupportedAudioFileException e) { + return null; + } catch (IOException e) { + return null; + } + } + + public Soundbank getSoundbank(InputStream stream) + throws InvalidMidiDataException, IOException { + + stream.mark(512); + try { + AudioInputStream ais = AudioSystem.getAudioInputStream(stream); + Soundbank sbk = getSoundbank(ais); + if (sbk != null) + return sbk; + } catch (UnsupportedAudioFileException e) { + } catch (IOException e) { + } + stream.reset(); + return null; + } + + public Soundbank getSoundbank(AudioInputStream ais) + throws InvalidMidiDataException, IOException { + + try { + try { + byte[] buffer; + if (ais.getFrameLength() == -1) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + byte[] buff = new byte[1024 - (1024 % ais.getFormat().getFrameSize())]; + int ret; + while ((ret = ais.read(buff)) != -1) + baos.write(buff, 0, ret); + ais.close(); + buffer = baos.toByteArray(); + } else { + buffer = new byte[(int) (ais.getFrameLength() * ais + .getFormat().getFrameSize())]; + ais.read(buffer); + } + ModelByteBufferWavetable osc = new ModelByteBufferWavetable( + new ModelByteBuffer(buffer), ais.getFormat(), -4800); + ModelPerformer performer = new ModelPerformer(); + ; + performer.getOscillators().add(osc); + + SimpleSoundbank sbk = new SimpleSoundbank(); + SimpleInstrument ins = new SimpleInstrument(); + ins.add(performer); + sbk.addInstrument(ins); + return sbk; + } finally { + } + } catch (Exception e) { + return null; + } + } + + public Soundbank getSoundbank(File file) throws InvalidMidiDataException, + IOException { + + try { + AudioInputStream ais = AudioSystem.getAudioInputStream(file); + ais.close(); + ModelByteBufferWavetable osc = new ModelByteBufferWavetable( + new ModelByteBuffer(file, 0, file.length()), -4800); + ModelPerformer performer = new ModelPerformer(); + performer.getOscillators().add(osc); + SimpleSoundbank sbk = new SimpleSoundbank(); + SimpleInstrument ins = new SimpleInstrument(); + ins.add(performer); + sbk.addInstrument(ins); + return sbk; + } catch (UnsupportedAudioFileException e1) { + return null; + } catch (IOException e) { + return null; + } + + } + + +} diff -r 1b845dd20b86 -r bcba163568ac overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java Wed Apr 30 22:09:08 2008 +0200 @@ -0,0 +1,670 @@ +/* + * 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. + */ + +package com.sun.media.sound; + +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.FloatBuffer; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioFormat.Encoding; + +/** + * This class is used to convert between 8,16,24,32 bit signed/unsigned + * big/litle endian fixed/floating point byte buffers and float buffers. + * + * @version %I%, %E% + * @author Karl Helgason + */ + +public abstract class AudioFloatConverter { + + public static final Encoding PCM_FLOAT = new Encoding("PCM_FLOAT"); + + /*************************************************************************** + * + * 32 bit float, little/big-endian + * + **************************************************************************/ + + // PCM 32 bit float, little-endian + private static class AudioFloatConversion32L extends AudioFloatConverter { + ByteBuffer bytebuffer = null; + + FloatBuffer floatbuffer = null; + + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int in_len = out_len * 4; + if (bytebuffer == null || bytebuffer.capacity() < in_len) { + bytebuffer = ByteBuffer.allocate(in_len).order( + ByteOrder.LITTLE_ENDIAN); + floatbuffer = bytebuffer.asFloatBuffer(); + } + bytebuffer.position(0); + floatbuffer.position(0); + bytebuffer.put(in_buff, in_offset, in_len); + floatbuffer.get(out_buff, out_offset, out_len); + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int out_len = in_len * 4; + if (bytebuffer == null || bytebuffer.capacity() < out_len) { + bytebuffer = ByteBuffer.allocate(out_len).order( + ByteOrder.LITTLE_ENDIAN); + floatbuffer = bytebuffer.asFloatBuffer(); + } + floatbuffer.position(0); + bytebuffer.position(0); + floatbuffer.put(in_buff, in_offset, in_len); + bytebuffer.get(out_buff, out_offset, out_len); + return out_buff; + } + } + + // PCM 32 bit float, big-endian + private static class AudioFloatConversion32B extends AudioFloatConverter { + ByteBuffer bytebuffer = null; + + FloatBuffer floatbuffer = null; + + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int in_len = out_len * 4; + if (bytebuffer == null || bytebuffer.capacity() < in_len) { + bytebuffer = ByteBuffer.allocate(in_len).order( + ByteOrder.BIG_ENDIAN); + floatbuffer = bytebuffer.asFloatBuffer(); + } + bytebuffer.position(0); + floatbuffer.position(0); + bytebuffer.put(in_buff, in_offset, in_len); + floatbuffer.get(out_buff, out_offset, out_len); + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int out_len = in_len * 4; + if (bytebuffer == null || bytebuffer.capacity() < out_len) { + bytebuffer = ByteBuffer.allocate(out_len).order( + ByteOrder.BIG_ENDIAN); + floatbuffer = bytebuffer.asFloatBuffer(); + } + floatbuffer.position(0); + bytebuffer.position(0); + floatbuffer.put(in_buff, in_offset, in_len); + bytebuffer.get(out_buff, out_offset, out_len); + return out_buff; + } + } + + /*************************************************************************** + * + * 8 bit signed/unsigned + * + **************************************************************************/ + + // PCM 8 bit, signed + private static class AudioFloatConversion8S extends AudioFloatConverter { + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < out_len; i++) + out_buff[ox++] = in_buff[ix++] * (1.0f / 127.0f); + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < in_len; i++) + out_buff[ox++] = (byte) (in_buff[ix++] * 127.0f); + return out_buff; + } + } + + // PCM 8 bit, unsigned + private static class AudioFloatConversion8U extends AudioFloatConverter { + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < out_len; i++) + out_buff[ox++] = ((in_buff[ix++]&0xFF) - 127) * (1.0f / 127.0f); + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < in_len; i++) + out_buff[ox++] = (byte) (127 + in_buff[ix++] * 127.0f); + return out_buff; + } + } + + /*************************************************************************** + * + * 16 bit signed/unsigned, little/big-endian + * + **************************************************************************/ + + // PCM 16 bit, signed, little-endian + private static class AudioFloatConversion16SL extends AudioFloatConverter { + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int ix = in_offset; + /* + int ox = out_offset; + for (int i = 0; i < out_len; i++) + out_buff[ox++] = ((short) ((in_buff[ix++] & 0xFF) | (in_buff[ix++] << 8))) + * (1.0f / 32767.0f); + */ + int len = out_offset + out_len; + for (int ox = out_offset; ox < len; ox++) + out_buff[ox] = ((short) ((in_buff[ix++] & 0xFF) | (in_buff[ix++] << 8))) + * (1.0f / 32767.0f); + + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int ox = out_offset; + int len = in_offset + in_len; + for (int ix = in_offset; ix < len; ix++) { + int x = (int) (in_buff[ix] * 32767.0); + out_buff[ox++] = (byte) x; + out_buff[ox++] = (byte) (x >>> 8); + } + return out_buff; + } + } + + // PCM 16 bit, signed, big-endian + private static class AudioFloatConversion16SB extends AudioFloatConverter { + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < out_len; i++) + out_buff[ox++] = ((short) ((in_buff[ix++] << 8) | (in_buff[ix++] & 0xFF))) + * (1.0f / 32767.0f); + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < in_len; i++) { + int x = (int) (in_buff[ix++] * 32767.0); + out_buff[ox++] = (byte) (x >>> 8); + out_buff[ox++] = (byte) x; + } + return out_buff; + } + } + + // PCM 16 bit, unsigned, little-endian + private static class AudioFloatConversion16UL extends AudioFloatConverter { + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < out_len; i++) + out_buff[ox++] = (( ((in_buff[ix++] & 0xFF) | ((in_buff[ix++] & 0xFF) << 8))) - 32767) + * (1.0f / 32767.0f); + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < in_len; i++) { + int x = 32767 + (int) (in_buff[ix++] * 32767.0); + out_buff[ox++] = (byte) x; + out_buff[ox++] = (byte) (x >>> 8); + } + return out_buff; + } + } + + // PCM 16 bit, unsigned, big-endian + private static class AudioFloatConversion16UB extends AudioFloatConverter { + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < out_len; i++) + out_buff[ox++] = (( (((in_buff[ix++] & 0xFF) << 8) | (in_buff[ix++] & 0xFF))) - 32767) + * (1.0f / 32767.0f); + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < in_len; i++) { + int x = 32767 + (int) (in_buff[ix++] * 32767.0); + out_buff[ox++] = (byte) (x >>> 8); + out_buff[ox++] = (byte) x; + } + return out_buff; + } + } + + /*************************************************************************** + * + * 24 bit signed/unsigned, little/big-endian + * + **************************************************************************/ + + // PCM 24 bit, signed, little-endian + private static class AudioFloatConversion24SL extends AudioFloatConverter { + public float[] toFloatArray(byte[] in_buff, int in_offset, + float[] out_buff, int out_offset, int out_len) { + int ix = in_offset; + int ox = out_offset; + for (int i = 0; i < out_len; i++) { + int x = (in_buff[ix++] & 0xFF) | ((in_buff[ix++] & 0xFF) << 8) + | ((in_buff[ix++] & 0xFF) << 16); + if (x > 8388607) + x -= 16777216; + out_buff[ox++] = x * (1.0f / 8388607.0f); + } + return out_buff; + } + + public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, + byte[] out_buff, int out_offset) { From mark at klomp.org Wed Apr 30 13:13:33 2008 From: mark at klomp.org (Mark Wielaard) Date: Wed, 30 Apr 2008 22:13:33 +0200 Subject: Gervill integrated into IcedTea Message-ID: <1209586413.3996.24.camel@dijkstra.wildebeest.org> Hi, Gervill [1] is a software sound synthesizer, written by Karl Helgason, which was created as a proposal for the Audio Synthesis Engine Project [2] and it was recently accepted as one of the projects for the Innovators' Challenge [3]. Since this is one of the major pieces missing, because it is fun to play with sounds and to give the code a little more exposure I integrated it into IcedTea. I took the version from Gervill CVS which is already assigned to Sun and distributed under the GPL + Classpath exception (README.txt, CHANGES.txt and LICENSE also included of course). This provides the following new service providers javax.sound.sampled.spi.AudioFileReader: com.sun.media.sound.WaveFloatFileReader com.sun.media.sound.SoftMidiAudioFileReader javax.sound.midi.spi.MidiDeviceProvider: com.sun.media.sound.SoftProvider javax.sound.midi.spi.SoundbankReader: com.sun.media.sound.SF2SoundbankReader com.sun.media.sound.DLSSoundbankReader com.sun.media.sound.PATSoundbankReader com.sun.media.sound.AudioFileSoundbankReader com.sun.media.sound.JARSoundbankReader It is added as an overlay for the code under openjdk/jdk/src/share/classes/com/sun/media/sound/ and a patch against the service provider files in patches/icedtea-gervill.patch. 2008-04-30 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-gervill.patch. * Makefile.in: Regenerated. * patches/icedtea-gervill.patch: New patch. * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*: New Gervill files. I also ran the testsuite in Gervill against a freshly build IcedTea and all all test PASS. I haven't included the tests yet since I thought they would not run without jtreg, but a quick little dirty fake jtreg harness was easy to come up with [*]. If this works for other jtreg based tests I will try and integrate it so we don't have to wait till jtreg is liberate to run more test. If you can please test and report any issues (best to CC audio-engine-dev). Cheers, Mark [1] https://gervill.dev.java.net/ [2] http://openjdk.java.net/projects/audio-engine/ [3] http://blogs.sun.com/rsands/entry/the_challenge_of_the_challenge [*] for i in `find com -name \*.java`; do echo -n "$i: "; grep 'static void main' $i > /dev/null; if test $? == 0; then javac -cp `dirname $i` $i; java -cp `dirname $i` `basename $i .java`; if test $? == 0; then echo PASS; else echo FAIL; fi; else echo "SKIPPED"; fi; done From gnu_andrew at member.fsf.org Wed Apr 30 13:18:53 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 30 Apr 2008 21:18:53 +0100 Subject: Gervill integrated into IcedTea In-Reply-To: <1209586413.3996.24.camel@dijkstra.wildebeest.org> References: <1209586413.3996.24.camel@dijkstra.wildebeest.org> Message-ID: <17c6771e0804301318w4bd72bd9o6a26d82fabcdca6c@mail.gmail.com> On 30/04/2008, Mark Wielaard wrote: > Hi, > > Gervill [1] is a software sound synthesizer, written by Karl Helgason, > which was created as a proposal for the Audio Synthesis Engine Project > [2] and it was recently accepted as one of the projects for the > Innovators' Challenge [3]. > > Since this is one of the major pieces missing, because it is fun to play > with sounds and to give the code a little more exposure I integrated it > into IcedTea. > > I took the version from Gervill CVS which is already assigned to Sun and > distributed under the GPL + Classpath exception (README.txt, CHANGES.txt > and LICENSE also included of course). > > This provides the following new service providers > > javax.sound.sampled.spi.AudioFileReader: > com.sun.media.sound.WaveFloatFileReader > com.sun.media.sound.SoftMidiAudioFileReader > > javax.sound.midi.spi.MidiDeviceProvider: > com.sun.media.sound.SoftProvider > > javax.sound.midi.spi.SoundbankReader: > com.sun.media.sound.SF2SoundbankReader > com.sun.media.sound.DLSSoundbankReader > com.sun.media.sound.PATSoundbankReader > com.sun.media.sound.AudioFileSoundbankReader > com.sun.media.sound.JARSoundbankReader > > It is added as an overlay for the code under > openjdk/jdk/src/share/classes/com/sun/media/sound/ and a patch against > the service provider files in patches/icedtea-gervill.patch. > > 2008-04-30 Mark Wielaard > > * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-gervill.patch. > * Makefile.in: Regenerated. > * patches/icedtea-gervill.patch: New patch. > * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*: > New Gervill files. > > I also ran the testsuite in Gervill against a freshly build IcedTea and > all all test PASS. I haven't included the tests yet since I thought they > would not run without jtreg, but a quick little dirty fake jtreg harness > was easy to come up with [*]. If this works for other jtreg based tests > I will try and integrate it so we don't have to wait till jtreg is > liberate to run more test. > > If you can please test and report any issues (best to CC audio-engine-dev). > > Cheers, > > Mark > > [1] https://gervill.dev.java.net/ > [2] http://openjdk.java.net/projects/audio-engine/ > [3] http://blogs.sun.com/rsands/entry/the_challenge_of_the_challenge > > [*] > for i in `find com -name \*.java`; do echo -n "$i: "; grep 'static void main' $i > /dev/null; if test $? == 0; then javac -cp `dirname $i` $i; java -cp `dirname $i` `basename $i .java`; if test $? == 0; then echo PASS; else echo FAIL; fi; else echo "SKIPPED"; fi; done > > Great news! Thanks for doing this, Mark. I look forward to playing with it soon. As to the jtreg hack, I fiddled about with a similar short bit of shell hackery a few months back and managed to run the JMX tests this way. Not a full-proof solution by any means, and I wouldn't attest to it working well generally, but it does the job for the time being. The spec. for the jtreg files is available online. Was it not for a Free version being in the works from Sun anyway, we could probably implement a clone. Cheers, -- Andrew :-) 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 gnu_andrew at member.fsf.org Wed Apr 30 13:21:53 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Wed, 30 Apr 2008 21:21:53 +0100 Subject: IcedTea Message-ID: <17c6771e0804301321j2c071fcdq1a5460a798d8527d@mail.gmail.com> Dear IcedTea hackers, I've noticed that all new packaging work is now being done solely on the IcedTea6 repository which makes sense -- this is obviously what needs to be packaged up and shipped in distros right now. However, looking towards working on my challenge project, I ideally want to be doing this on the OpenJDK tree rather than on OpenJDK6. I can port the changes across locally, but would anyone be interested in me pushing these back to the main IcedTea tree as well? Or, taking the alternative view, does anyone have any objections to this? Thanks for the great work, -- Andrew :-) 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 fitzsim at redhat.com Wed Apr 30 14:08:32 2008 From: fitzsim at redhat.com (Thomas Fitzsimmons) Date: Wed, 30 Apr 2008 21:08:32 +0000 Subject: changeset in /hg/icedtea6: 2008-04-30 Thomas Fitzsimmons changeset 7b560b84e143 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7b560b84e143 description: 2008-04-30 Thomas Fitzsimmons * rt/net/sourceforge/jnlp/security/MoreInfoPane.java: Fix typo. diffstat: 2 files changed, 5 insertions(+), 1 deletion(-) ChangeLog | 4 ++++ rt/net/sourceforge/jnlp/security/MoreInfoPane.java | 2 +- diffs (23 lines): diff -r bcba163568ac -r 7b560b84e143 ChangeLog --- a/ChangeLog Wed Apr 30 22:09:08 2008 +0200 +++ b/ChangeLog Wed Apr 30 17:08:19 2008 -0400 @@ -1,3 +1,7 @@ 2008-04-30 Mark Wielaard + + * rt/net/sourceforge/jnlp/security/MoreInfoPane.java: Fix typo. + 2008-04-30 Mark Wielaard * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-gervill.patch. diff -r bcba163568ac -r 7b560b84e143 rt/net/sourceforge/jnlp/security/MoreInfoPane.java --- a/rt/net/sourceforge/jnlp/security/MoreInfoPane.java Wed Apr 30 22:09:08 2008 +0200 +++ b/rt/net/sourceforge/jnlp/security/MoreInfoPane.java Wed Apr 30 17:08:19 2008 -0400 @@ -85,7 +85,7 @@ public class MoreInfoPane extends Securi } JPanel buttonsPanel = new JPanel(new BorderLayout()); - JButton certDetails = new JButton("Cerificate Details"); + JButton certDetails = new JButton("Certificate Details"); certDetails.addActionListener(new CertInfoButtonListener()); JButton close = new JButton("Close"); close.addActionListener(createButtonActionListener(0)); From fitzsim at redhat.com Wed Apr 30 15:23:15 2008 From: fitzsim at redhat.com (Thomas Fitzsimmons) Date: Wed, 30 Apr 2008 18:23:15 -0400 Subject: IcedTea In-Reply-To: <17c6771e0804301321j2c071fcdq1a5460a798d8527d@mail.gmail.com> References: <17c6771e0804301321j2c071fcdq1a5460a798d8527d@mail.gmail.com> Message-ID: <4818F153.4000703@redhat.com> Andrew John Hughes wrote: > Dear IcedTea hackers, > > I've noticed that all new packaging work is now being done solely on > the IcedTea6 repository which makes sense -- this is obviously what > needs to be packaged up and shipped in distros right now. > > However, looking towards working on my challenge project, I ideally > want to be doing this on the OpenJDK tree rather than on OpenJDK6. I > can port the changes across locally, but would anyone be interested in > me pushing these back to the main IcedTea tree as well? Or, taking > the alternative view, does anyone have any objections to this? Your challenge project is the virtual machine interface, right? By "main IcedTea" tree, do you mean icedtea, or icedtea6? I'd rather keep the icedtea6 branch focused on distribution integration of OpenJDK 6, but I have no objection experimental work such as the VM interface being integrated on the icedtea branch. Tom From gnu_andrew at member.fsf.org Wed Apr 30 16:37:02 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Thu, 1 May 2008 00:37:02 +0100 Subject: IcedTea In-Reply-To: <4818F153.4000703@redhat.com> References: <17c6771e0804301321j2c071fcdq1a5460a798d8527d@mail.gmail.com> <4818F153.4000703@redhat.com> Message-ID: <17c6771e0804301637q7cec77e7n413dfde90e5d4c9d@mail.gmail.com> On 30/04/2008, Thomas Fitzsimmons wrote: > Andrew John Hughes wrote: > > > Dear IcedTea hackers, > > > > I've noticed that all new packaging work is now being done solely on > > the IcedTea6 repository which makes sense -- this is obviously what > > needs to be packaged up and shipped in distros right now. > > > > However, looking towards working on my challenge project, I ideally > > want to be doing this on the OpenJDK tree rather than on OpenJDK6. I > > can port the changes across locally, but would anyone be interested in > > me pushing these back to the main IcedTea tree as well? Or, taking > > the alternative view, does anyone have any objections to this? > > > > Your challenge project is the virtual machine interface, right? By "main > IcedTea" tree, do you mean icedtea, or icedtea6? I'd rather keep the > icedtea6 branch focused on distribution integration of OpenJDK 6, but I have > no objection experimental work such as the VM interface being integrated on > the icedtea branch. > > Tom > Yes, you're correct about the project. I just realised I didn't make myself that clear in the original mail. What I'm referring to is not the VM interface work itself (though it would be nice to have that available via IcedTea too) but merely that the icedtea branch now lags behind the icedtea6 branch in terms of patches, etc. In working with OpenJDK, using IcedTea would make it much easier for me to build and work with, so having an up-to-date icedtea branch would be very useful. As I say, I can easily merge across the patches locally from icedtea6, but are people happy for me to push these to the icedtea tree? -- Andrew :-) 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 fitzsim at redhat.com Wed Apr 30 16:38:39 2008 From: fitzsim at redhat.com (Thomas Fitzsimmons) Date: Wed, 30 Apr 2008 19:38:39 -0400 Subject: IcedTea In-Reply-To: <17c6771e0804301637q7cec77e7n413dfde90e5d4c9d@mail.gmail.com> References: <17c6771e0804301321j2c071fcdq1a5460a798d8527d@mail.gmail.com> <4818F153.4000703@redhat.com> <17c6771e0804301637q7cec77e7n413dfde90e5d4c9d@mail.gmail.com> Message-ID: <481902FF.8060304@redhat.com> Andrew John Hughes wrote: > On 30/04/2008, Thomas Fitzsimmons wrote: >> Andrew John Hughes wrote: >> >>> Dear IcedTea hackers, >>> >>> I've noticed that all new packaging work is now being done solely on >>> the IcedTea6 repository which makes sense -- this is obviously what >>> needs to be packaged up and shipped in distros right now. >>> >>> However, looking towards working on my challenge project, I ideally >>> want to be doing this on the OpenJDK tree rather than on OpenJDK6. I >>> can port the changes across locally, but would anyone be interested in >>> me pushing these back to the main IcedTea tree as well? Or, taking >>> the alternative view, does anyone have any objections to this? >>> >> Your challenge project is the virtual machine interface, right? By "main >> IcedTea" tree, do you mean icedtea, or icedtea6? I'd rather keep the >> icedtea6 branch focused on distribution integration of OpenJDK 6, but I have >> no objection experimental work such as the VM interface being integrated on >> the icedtea branch. >> >> Tom >> > > Yes, you're correct about the project. I just realised I didn't make > myself that clear in the original mail. What I'm referring to is not > the VM interface work itself (though it would be nice to have that > available via IcedTea too) but merely that the icedtea branch now lags > behind the icedtea6 branch in terms of patches, etc. > > In working with OpenJDK, using IcedTea would make it much easier for > me to build and work with, so having an up-to-date icedtea branch > would be very useful. As I say, I can easily merge across the patches > locally from icedtea6, but are people happy for me to push these to > the icedtea tree? Yes, please do. Thanks, Tom