From gbenson at redhat.com  Thu Nov  1 08:03:04 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 01 Nov 2007 15:03:04 +0000
Subject: changeset in /hg/icedtea: 2007-11-01  Gary Benson  <gbenson@redh...
Message-ID: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>

changeset fb428e9dbfa6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fb428e9dbfa6
description:
	2007-11-01  Gary Benson  <gbenson at redhat.com>

		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
		* configure: Regenerated.

diffstat:

3 files changed, 5 insertions(+), 8 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |    4 ----
configure    |    4 ----

diffs (40 lines):

diff -r a62d79e2140c -r fb428e9dbfa6 ChangeLog
--- a/ChangeLog	Wed Oct 31 16:43:46 2007 -0400
+++ b/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
@@ -1,3 +1,8 @@ 2007-10-31  Joshua Sumali  <jsumali at redh
+2007-11-01  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
+	* configure: Regenerated.
+
 2007-10-31  Joshua Sumali  <jsumali at redhat.com>
 
 	* patches/icedtea-sunsrc.patch: Fixed patch to include some missing
diff -r a62d79e2140c -r fb428e9dbfa6 acinclude.m4
--- a/acinclude.m4	Wed Oct 31 16:43:46 2007 -0400
+++ b/acinclude.m4	Thu Nov 01 11:02:51 2007 -0400
@@ -17,10 +17,6 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
diff -r a62d79e2140c -r fb428e9dbfa6 configure
--- a/configure	Wed Oct 31 16:43:46 2007 -0400
+++ b/configure	Thu Nov 01 11:02:51 2007 -0400
@@ -4840,10 +4840,6 @@ fi
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR


From twisti at complang.tuwien.ac.at  Fri Nov  2 07:34:43 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Fri, 02 Nov 2007 15:34:43 +0100
Subject: changeset in /hg/icedtea: 2007-11-01  Gary Benson 
	<gbenson@redh...
In-Reply-To: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
Message-ID: <1194014083.15194.0.camel@localhost.localdomain>

On Thu, 2007-11-01 at 15:03 +0000, Gary Benson wrote:
> changeset fb428e9dbfa6 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fb428e9dbfa6
> description:
> 	2007-11-01  Gary Benson  <gbenson at redhat.com>
> 
> 		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.

Why did you remove s390?

- twisti



From gbenson at redhat.com  Fri Nov  2 07:50:53 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 2 Nov 2007 14:50:53 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194014083.15194.0.camel@localhost.localdomain>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
Message-ID: <20071102145053.GA3733@redhat.com>

Christian Thalinger wrote:
> On Thu, 2007-11-01 at 15:03 +0000, Gary Benson wrote:
> > changeset fb428e9dbfa6 in /hg/icedtea
> > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fb428e9dbfa6
> > description:
> > 	2007-11-01  Gary Benson  <gbenson at redhat.com>
> > 
> > 		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
> 
> Why did you remove s390?

Because it was broken.  It merged s390 and s390x in the same way
as ppc and ppc64 used to be merged, and I assumed no-one was using
it since ppc had been changed but s390 had not.

Are you using it?

Cheers,
Gary


From langel at redhat.com  Fri Nov  2 13:00:31 2007
From: langel at redhat.com (Lillian Angel)
Date: Fri, 02 Nov 2007 20:00:31 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Lillian Angel  <langel@red...
Message-ID: <hg.4bb9761d77a8.1194033631.-6899778133799504387@icedtea.classpath.org>

changeset 4bb9761d77a8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4bb9761d77a8
description:
	2007-11-02  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-libraries.patch: Added patch to remove conflicting
	        definition of uLong. This fixes the build on 64-bit.

diffstat:

2 files changed, 73 insertions(+), 44 deletions(-)
ChangeLog                       |    5 +
patches/icedtea-libraries.patch |  112 +++++++++++++++++++++++----------------

diffs (138 lines):

diff -r fb428e9dbfa6 -r 4bb9761d77a8 ChangeLog
--- a/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
+++ b/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
@@ -1,3 +1,8 @@ 2007-11-01  Gary Benson  <gbenson at redhat
+2007-11-02  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-libraries.patch: Added patch to remove conflicting
+	definition of uLong. This fixes the build on 64-bit.
+
 2007-11-01  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
diff -r fb428e9dbfa6 -r 4bb9761d77a8 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Thu Nov 01 11:02:51 2007 -0400
+++ b/patches/icedtea-libraries.patch	Fri Nov 02 15:59:43 2007 -0400
@@ -164,50 +164,6 @@
  
  #
  # Library to compile.
---- openjdk.old/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
-+++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-22 15:08:03.000000000 -0400
-@@ -64,20 +64,18 @@
-   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
- 
-   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
--
--  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--  OTHER_CXXFLAGS += $(ZINCLUDE)
--  LDDFLAGS += $(ZIPOBJS)
-+            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
-+
-+  OTHER_LDLIBS += -lz
- else
-   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
-   OTHER_LDLIBS += $(JVMLIB)
-@@ -101,7 +99,7 @@
-   COMPILER_WARNINGS_FATAL=false
- else
-   LDOUTPUT = -o #Have a space 
--  LDDFLAGS += -lc
-+  LDDFLAGS += -lz -lc
-   OTHER_LDLIBS  += $(LIBCXX)
- # setup the list of libraries to link in...
- ifeq ($(PLATFORM), linux)
 --- openjdk.old/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-22 15:21:32.000000000 -0400
 @@ -35,7 +35,7 @@
@@ -25514,3 +25470,71 @@ diff -ruN openjdk.old/j2se/src/share/nat
      }
  
      if (scale != NULL) {
+--- oldopenjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
++++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-11-02 14:59:13.000000000 -0400
+@@ -64,23 +64,21 @@
+   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+ 
+   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+-
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-  OTHER_CXXFLAGS += $(ZINCLUDE)
+-  LDDFLAGS += $(ZIPOBJS)
++            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
++
++  OTHER_LDLIBS += -lz
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+-  OTHER_LDLIBS += $(JVMLIB)
++  OTHER_LDLIBS += -lz $(JVMLIB)
+ endif
+ 
+ CXXFLAGS_DBG += -DFULL
+@@ -101,12 +99,12 @@
+   COMPILER_WARNINGS_FATAL=false
+ else
+   LDOUTPUT = -o #Have a space 
+-  LDDFLAGS += -lc
++  LDDFLAGS += -lz -lc
+   OTHER_LDLIBS  += $(LIBCXX)
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
+ ifeq ("$(CC_VER_MAJOR)", "3")
+-  OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
++  OTHER_LDLIBS  += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ endif
+ endif #LINUX
+ endif #PLATFORM
+--- oldopenjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-10-12 04:03:44.000000000 -0400
++++ openjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-11-02 15:48:45.000000000 -0400
+@@ -87,11 +87,7 @@
+ // bytes and byte arrays
+ 
+ typedef unsigned int uint;
+-#ifdef _LP64
+-typedef unsigned int uLong; // Historical zlib, should be 32-bit.
+-#else
+ typedef unsigned long uLong;
+-#endif
+ #ifdef _MSC_VER 
+ typedef LONGLONG 	jlong;
+ typedef DWORDLONG 	julong;


From jsumali at redhat.com  Fri Nov  2 13:55:01 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Fri, 02 Nov 2007 20:55:01 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Joshua Sumali  <jsumali@re...
Message-ID: <hg.95a271d04351.1194036900.-6899778133799504387@icedtea.classpath.org>

changeset 95a271d04351 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=95a271d04351
description:
	2007-11-02  Joshua Sumali  <jsumali at redhat.com>

	        * rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
	        now implemented.
	        * rt/com/sun/media/sound/JDK13Services.java: Likewise.
	        * rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDevice.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiUtils.java: Likewise.
	        * rt/com/sun/media/sound/PortMixer.java: Likewise.
	        * rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
	        * rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.

diffstat:

11 files changed, 14 insertions(+), 533 deletions(-)
ChangeLog                                           |   14 +++
rt/com/sun/media/sound/DataPusher.java              |   62 -----------------
rt/com/sun/media/sound/JDK13Services.java           |   62 -----------------
rt/com/sun/media/sound/JavaSoundAudioClip.java      |   68 -------------------
rt/com/sun/media/sound/MidiInDevice.java            |   45 ------------
rt/com/sun/media/sound/MidiInDeviceProvider.java    |   45 ------------
rt/com/sun/media/sound/MidiOutDeviceProvider.java   |   45 ------------
rt/com/sun/media/sound/MidiUtils.java               |   59 ----------------
rt/com/sun/media/sound/PortMixer.java               |   45 ------------
rt/com/sun/media/sound/PortMixerProvider.java       |   45 ------------
rt/com/sun/media/sound/ReferenceCountingDevice.java |   57 ---------------

diffs (truncated from 594 to 500 lines):

diff -r 4bb9761d77a8 -r 95a271d04351 ChangeLog
--- a/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
+++ b/ChangeLog	Fri Nov 02 12:53:15 2007 -0400
@@ -1,3 +1,17 @@ 2007-11-02  Lillian Angel  <langel at redha
+2007-11-02  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
+	now implemented.
+	* rt/com/sun/media/sound/JDK13Services.java: Likewise.
+	* rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDevice.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiUtils.java: Likewise.
+	* rt/com/sun/media/sound/PortMixer.java: Likewise.
+	* rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
+	* rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.
+
 2007-11-02  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-libraries.patch: Added patch to remove conflicting
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/DataPusher.java
--- a/rt/com/sun/media/sound/DataPusher.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* DataPusher.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.SourceDataLine;
-
-public class DataPusher {
-
-	public DataPusher(SourceDataLine sourcedataline, AudioInputStream as) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void start() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/JDK13Services.java
--- a/rt/com/sun/media/sound/JDK13Services.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* JDK13Services.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import java.util.List;
-
-public class JDK13Services {
-
-	public static String getDefaultProviderClassName(Class deviceClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static String getDefaultInstanceName(Class deviceClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static List getProviders(Class providerClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/JavaSoundAudioClip.java
--- a/rt/com/sun/media/sound/JavaSoundAudioClip.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/* JavaSoundAudioClip.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import java.applet.AudioClip;
-import java.io.InputStream;
-
-public class JavaSoundAudioClip implements AudioClip {
-
-	public JavaSoundAudioClip(InputStream in) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void loop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void play() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiInDevice.java
--- a/rt/com/sun/media/sound/MidiInDevice.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiInDevice.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class MidiInDevice
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiInDeviceProvider.java
--- a/rt/com/sun/media/sound/MidiInDeviceProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiInDeviceProvider.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class MidiInDeviceProvider
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiOutDeviceProvider.java
--- a/rt/com/sun/media/sound/MidiOutDeviceProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiOutDeviceProvider.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class MidiOutDeviceProvider
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/MidiUtils.java
--- a/rt/com/sun/media/sound/MidiUtils.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/* MidiUtils.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import javax.sound.midi.MidiMessage;
-import javax.sound.midi.Sequence;
-
-public class MidiUtils {
-
-	public static final byte META_END_OF_TRACK_TYPE = 0;
-
-	public static long tick2microsecond(Sequence sequence, long tickLength, Object object) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static boolean isMetaEndOfTrack(MidiMessage message) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/PortMixer.java
--- a/rt/com/sun/media/sound/PortMixer.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* PortMixer.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class PortMixer
-{
-
-}
-
-
diff -r 4bb9761d77a8 -r 95a271d04351 rt/com/sun/media/sound/PortMixerProvider.java
--- a/rt/com/sun/media/sound/PortMixerProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* PortMixerProvider.java -- stub file.
-   Copyright (C) 2007 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


From bero at arklinux.org  Fri Nov  2 16:35:37 2007
From: bero at arklinux.org (Bernhard Rosenkraenzer)
Date: Sat, 3 Nov 2007 00:35:37 +0100
Subject: [PATCH] Use openjdk b23
Message-ID: <200711030035.38976.bero@arklinux.org>

SSIA...

Due to the large size of the patch, I'm not posting it to the list, it can be 
downloaded at

http://arklinux.org/~bero/icedtea-309-openjdk-b23.patch.bz2

The patch is against an icedtea checkout from a couple of days ago (rev 309), 
might need slight adjustments with today's changes to icedtea-libraries.patch

Regards,
bero


From bero at arklinux.org  Fri Nov  2 16:53:55 2007
From: bero at arklinux.org (Bernhard Rosenkraenzer)
Date: Sat, 3 Nov 2007 00:53:55 +0100
Subject: [PATCH] make it compile with gcc 4.3
Message-ID: <200711030053.56163.bero@arklinux.org>

This patch (relative to hg from 2 days ago + my patch to switch it to b23) 
makes icedtea build with gcc 4.3.

Some chunks are fairly crappy (just getting rid of -Werror because openjdk 
code is nowhere near clean enough to compile with -Werror on gcc 4.3 --- lots 
of warnings saying the likes of
"cast from short to unsigned int:3 may change value"), the other bits are 
mostly adding missing includes (e.g. libstdc++'s <string> no longer includes 
<cstring>/<string.h>, causing gcc to complain about lack of memcpy/strlen/... 
prototypes.

Regards,
bero
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-1.4-gcc-4.3.patch
Type: text/x-diff
Size: 4568 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071103/99e77cb1/icedtea-1.4-gcc-4.3.patch 

From twisti at complang.tuwien.ac.at  Mon Nov  5 02:46:20 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Mon, 05 Nov 2007 11:46:20 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071102145053.GA3733@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
Message-ID: <1194259580.16845.6.camel@c1.complang.tuwien.ac.at>

On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > Why did you remove s390?
> 
> Because it was broken.  It merged s390 and s390x in the same way
> as ppc and ppc64 used to be merged, and I assumed no-one was using
> it since ppc had been changed but s390 had not.

True, missed that.  The default case maps the correct architecture
anyways.

- twisti


From gbenson at redhat.com  Mon Nov  5 03:05:35 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 5 Nov 2007 11:05:35 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071105110535.GA3954@redhat.com>

Christian Thalinger wrote:
> On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > Why did you remove s390?
> > 
> > Because it was broken.  It merged s390 and s390x in the same way
> > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > it since ppc had been changed but s390 had not.
> 
> True, missed that.  The default case maps the correct architecture
> anyways.

Can I leave it to you to put it back how you want it?
I don't like to commit things when I don't know what's needed...

Cheers,
Gary


From amitksaha at netbeans.org  Mon Nov  5 03:26:18 2007
From: amitksaha at netbeans.org (Amit Kumar Saha)
Date: Mon, 5 Nov 2007 16:56:18 +0530
Subject: IcedTea interview
Message-ID: <547db2260711050326x4824a357s1ceb82d28b30fde0@mail.gmail.com>

Hi all!

I am working on an article on "IcedTea" for an India based Linux/Open
Source Magazine. Though, the FAQ answers most questions related to
"IcedTea", it would be nice to have an interview with the "IcedTea"
developers answering some of them in a "first person" fashion.

So, I would like to request you to kindly chip in with your thoughts:

* The main motivation behind IcedTea
* What is the future agenda?
* Are there plans to support other distributions as well?

Any other things you would like to be covered.

I really appreciate your time and comments.

Thank you very much!

Regards,
Amit



-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com


From twisti at complang.tuwien.ac.at  Mon Nov  5 04:31:19 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Mon, 05 Nov 2007 13:31:19 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071105110535.GA3954@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071105110535.GA3954@redhat.com>
Message-ID: <1194265879.16845.13.camel@c1.complang.tuwien.ac.at>

On Mon, 2007-11-05 at 11:05 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > > Why did you remove s390?
> > > 
> > > Because it was broken.  It merged s390 and s390x in the same way
> > > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > > it since ppc had been changed but s390 had not.
> > 
> > True, missed that.  The default case maps the correct architecture
> > anyways.
> 
> Can I leave it to you to put it back how you want it?
> I don't like to commit things when I don't know what's needed...

Yes, I'll take care of it.

- twisti


From gbenson at redhat.com  Mon Nov  5 05:56:07 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 5 Nov 2007 13:56:07 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194265879.16845.13.camel@c1.complang.tuwien.ac.at>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071105110535.GA3954@redhat.com>
	<1194265879.16845.13.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071105135607.GB3954@redhat.com>

Christian Thalinger wrote:
> On Mon, 2007-11-05 at 11:05 +0000, Gary Benson wrote:
> > Christian Thalinger wrote:
> > > On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > > > Why did you remove s390?
> > > > 
> > > > Because it was broken.  It merged s390 and s390x in the same way
> > > > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > > > it since ppc had been changed but s390 had not.
> > > 
> > > True, missed that.  The default case maps the correct architecture
> > > anyways.
> > 
> > Can I leave it to you to put it back how you want it?
> > I don't like to commit things when I don't know what's needed...
> 
> Yes, I'll take care of it.

Cool


From amitsaha.in at gmail.com  Mon Nov  5 03:22:22 2007
From: amitsaha.in at gmail.com (Amit Kumar Saha)
Date: Mon, 5 Nov 2007 16:52:22 +0530
Subject: IcedTea interview
Message-ID: <547db2260711050322l39594836t5756d4d2eb8d693@mail.gmail.com>

Hi all!

I am working on an article on "IcedTea" for an India based Linux/Open
Source Magazine. Though, the FAQ answers most questions related to
"IcedTea", it would be nice to have an interview with the "IcedTea"
developers answering some of them in a "first person" fashion.

So, I would like to request you to kindly chip in with your thoughts:

* The main motivation behind IcedTea
* What is the future agenda?
* Are there plans to support other distributions as well?

Any other things you would like to be covered.

I really appreciate your time and comments.

Thank you very much!

Regards,
Amit



-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com


From langel at redhat.com  Mon Nov  5 07:21:26 2007
From: langel at redhat.com (Lillian Angel)
Date: Mon, 05 Nov 2007 10:21:26 -0500
Subject: [PATCH] Use openjdk b23
In-Reply-To: <200711030035.38976.bero@arklinux.org>
References: <200711030035.38976.bero@arklinux.org>
Message-ID: <472F34F6.7000404@redhat.com>

Hi,

Thanks for your patches. We are putting off the upgrade to b23 at the 
moment, because of the major build changes that would interfere with 
other on-going issues. We are working on re-implementing the ecj 
bootstrapping support into the build and ppc integration.

I will try out your patch at a later time and think about merging it. 
Another possibility is committing it to a separate branch.


Thanks again,
Lillian



Bernhard Rosenkraenzer wrote:
> SSIA...
> 
> Due to the large size of the patch, I'm not posting it to the list, it can be 
> downloaded at
> 
> http://arklinux.org/~bero/icedtea-309-openjdk-b23.patch.bz2
> 
> The patch is against an icedtea checkout from a couple of days ago (rev 309), 
> might need slight adjustments with today's changes to icedtea-libraries.patch
> 
> Regards,
> bero


From fitzsim at redhat.com  Mon Nov  5 12:41:28 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Mon, 05 Nov 2007 15:41:28 -0500
Subject: RFC: GConf Preference Backend for IcedTea
In-Reply-To: <1193790094.4755.10.camel@nirvana.limasoftware.net>
References: <1193790094.4755.10.camel@nirvana.limasoftware.net>
Message-ID: <472F7FF8.4060300@redhat.com>

Mario Torre wrote:
> hehe, it seems like I'm going back in time with this :)
> 
> I've just finished to port the GConf backend to IcedTea, so sorry for
> cross posting, but I think it's a good news for both Classpath and
> IcedTea.
> 
> I'm asking for comment because I'm not a configure expert, so may very
> well be that this is not the perfect way to handle things.
> 
> I've tested with few applications and all seems correct, the code is
> pretty much the same as the Classpath version. I've not tested it as
> concern the security model. I say this because I've seen that the
> FileBasedPreferences in openjdk does a little more checks on the
> SecurityManager than what we do. I want to check this carefully, but
> other than that, I think it's ok as is.
> 
> This thing works that way, if the user issues a --disable-gconf-peer to
> configure, nothing happens and the backend is not compiled. Otherwise,
> the backend is compiled and a shared object is created and then copied
> in the jre tree (much like we do with gcjwebplugin). Also, a patch is
> applied to call this backend on Linux and Solaris.
> 
> I'm waiting for comments, thanks,

+	if test "x${ENABLE_GCONF_PEER}" = xyes; then \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so  \
+	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
+	fi

Makefile.am sections that test for ${ENABLE_GCONF_PEER} should use the
CREATE_GCONF_PEER_LIBRARIES conditional instead.

@@ -221,6 +240,12 @@ icedtea-debug: stamps/bootstrap-director
  	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
  	cp -af gcjwebplugin.so \
  	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	if test "x${ENABLE_GCONF_PEER}" = xyes; then \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \
+	  cp -af $(GCONF_PEER_LIB_DIR)/libgconfpeer.so \
+	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
+	fi

Copy-n-paste errors: you want $(BUILD_OUTPUT_DIR)-debug here.

+	if test "x${ENABLE_GCONF_PEER}" = xyes; then \
+          if [ ! -d "rt/gnu" ]; then \
+            mkdir -p rt/gnu ; \
+          fi ;\
+          cp -arf gconf-prefs-peer/gnu/* rt/gnu ;\
+        fi ; \

You could just commit the new Java source files under rt.

+AC_CONFIG_FILES([Makefile
+gconf-prefs-peer/Makefile
+gconf-prefs-peer/native/Makefile])

These files aren't included in the patch.  Can they be inlined in
the top-level Makefile.am?

+AC_ARG_ENABLE([gconf-peer],
...

You could just assume that GConf2 is installed in the system,
like we already do for similar dependencies.

+static void
+throw_exception_by_name (JNIEnv * env, const char *name, const char *msg);

The function name shouldn't be at the start of a line in a
declaration, only in a definition.

+ * Factory object that generates a Preferences nodes that are read from a GConf
+ * daemon.

Typo: "a Preferences nodes".

Some general comments:

In the future, try not to include generated files in patch
submissions.

I'd like the security situation cleared up before this patch goes
in.  For example, can untrusted applets read or write GConf2
preferences with the patch as-is?

Have you tested with the Swing GTK PLAF to ensure your use of the
GDK lock doesn't interfere?  Have you investigated retrieving the
default GConfBackendVTable and using its lock/unlock functions
instead?

Tom


From gbenson at redhat.com  Tue Nov  6 03:58:10 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 6 Nov 2007 11:58:10 +0000
Subject: package org.omg.CORBA_2_3.portable does not exist
In-Reply-To: <200710161555.02689.bero@arklinux.org>
References: <200710151342.53740.bero@arklinux.org>
	<18195.21702.312045.341227@zebedee.pink>
	<200710161555.02689.bero@arklinux.org>
Message-ID: <20071106115810.GA3734@redhat.com>

Bernhard Rosenkraenzer wrote:
> On Monday 15 October 2007, you wrote:
> > Bernhard Rosenkraenzer writes:
> > > I've just tried to bootstrap icedtea (current hg) with gcj 4.3
> > > from SVN (the first semi-official gcc with generics support).
> >
> > It can't be done.  The current icedTea needs to be bootstrapped
> > with IcedTea.  We're thinking about how to solve this problem,
> > but it's hard.
> 
> Thanks, that helped -- I got IcedTea 1.3 to compile with gcj 4.3
> (just minor tweaks required - mostly it's a matter of killing the
> -Werror flag because gcc 4.3 introduces quite a few new warniongs).
> 
> Using the resulting JVM to bootstrap current hg icedtea still fails though:
> 
> /usr/src/ark/BUILD/icedtea/bootstrap/jdk1.6.0/bin/java -client -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m -Xbootclasspath/p:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -jar /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes -sourcepath /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/gensrc:../../../src/solaris/classes:../../../src/share/classes -d /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes @/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/tmp/java/java.lang.management/management/.classes.list
> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:39: package org.omg.CORBA_2_3.portable does not exist
> import org.omg.CORBA_2_3.portable.InputStream;
>                                  ^
> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:42: 
> package org.omg.CORBA_2_3.portable does not exist
...

I got stuck on this.  It's the second -Xbootclasspath that kills it,
the one that says -Xbootclasspath:/path/to/linux-i586/classes, and
sure enough the CORBA_2_3 classes aren't in there.  It's a weird one
in that it only seems to happen on a clean build, so you'll hit the
error, do something, rebuild, "cool, that fixed it", then get bitten
by it all over again when you do a clean build.  But this patch seems
to fix it.

Cheers,
Gary
-------------- next part --------------
diff -r 45ea734f4db6 openjdk/corba/make/org/omg/CORBA/Makefile
--- openjdk/corba/make/org/omg/CORBA/Makefile	Tue Nov 06 08:51:19 2007 +0000
+++ openjdk/corba/make/org/omg/CORBA/Makefile	Tue Nov 06 09:39:33 2007 +0000
@@ -47,8 +47,8 @@ endif
 endif
 
 FILES_java = \
-        $(ORG_OMG_SENDINGCONTEXT_java) \
-        $(ORG_OMG_CORBA_2_3_java) \
+        $(org_omg_SENDINGCONTEXT_java) \
+        $(org_omg_CORBA_2_3_java) \
         $(ORG_OMG_CORBA_java)
 
 #

From gbenson at redhat.com  Tue Nov  6 04:44:43 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 6 Nov 2007 12:44:43 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071106124443.GB3734@redhat.com>

Christian Thalinger wrote:
> On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > Why did you remove s390?
> > 
> > Because it was broken.  It merged s390 and s390x in the same way
> > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > it since ppc had been changed but s390 had not.
> 
> True, missed that.  The default case maps the correct architecture
> anyways.

Oh, I didn't realise what you meant by that, but it just dawned on me
that the ppc cases are also redundant in that they do exactly what the
default case does.  Mind if I remove them too?

Cheers,
Gary


From twisti at complang.tuwien.ac.at  Wed Nov  7 02:45:57 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Wed, 07 Nov 2007 11:45:57 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071106124443.GB3734@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
Message-ID: <1194432357.32318.0.camel@localhost.localdomain>

On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Fri, 2007-11-02 at 14:50 +0000, Gary Benson wrote:
> > > > Why did you remove s390?
> > > 
> > > Because it was broken.  It merged s390 and s390x in the same way
> > > as ppc and ppc64 used to be merged, and I assumed no-one was using
> > > it since ppc had been changed but s390 had not.
> > 
> > True, missed that.  The default case maps the correct architecture
> > anyways.
> 
> Oh, I didn't realise what you meant by that, but it just dawned on me
> that the ppc cases are also redundant in that they do exactly what the
> default case does.  Mind if I remove them too?

No, that not true.  The PowerPC cases map powerpc to ppc and powerpc64
to ppc64.  We need them.

- twisti



From gbenson at redhat.com  Wed Nov  7 03:04:15 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 7 Nov 2007 11:04:15 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194432357.32318.0.camel@localhost.localdomain>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
	<1194432357.32318.0.camel@localhost.localdomain>
Message-ID: <20071107110415.GA3656@redhat.com>

Christian Thalinger wrote:
> On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> > Oh, I didn't realise what you meant by that, but it just dawned on
> > me that the ppc cases are also redundant in that they do exactly
> > what the default case does.  Mind if I remove them too?
> 
> No, that not true.  The PowerPC cases map powerpc to ppc and
> powerpc64 to ppc64.  We need them.

The default case handles that mapping though:

  case "${host}" in
    x86_64-*-*)
      BUILD_ARCH_DIR=amd64
      INSTALL_ARCH_DIR=amd64
      ;;
    i?86-*-*)
      BUILD_ARCH_DIR=i586
      INSTALL_ARCH_DIR=i386
      ;;
    *)
      BUILD_ARCH_DIR=`uname -m`
      INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
      ;;
  esac

This is what I'm using at the moment.

Cheers,
Gary


From twisti at complang.tuwien.ac.at  Wed Nov  7 03:18:11 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Wed, 07 Nov 2007 12:18:11 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071107110415.GA3656@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
	<1194432357.32318.0.camel@localhost.localdomain>
	<20071107110415.GA3656@redhat.com>
Message-ID: <1194434291.32318.5.camel@localhost.localdomain>

On Wed, 2007-11-07 at 11:04 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> > > Oh, I didn't realise what you meant by that, but it just dawned on
> > > me that the ppc cases are also redundant in that they do exactly
> > > what the default case does.  Mind if I remove them too?
> > 
> > No, that not true.  The PowerPC cases map powerpc to ppc and
> > powerpc64 to ppc64.  We need them.
> 
> The default case handles that mapping though:
> 
>   case "${host}" in
>     x86_64-*-*)
>       BUILD_ARCH_DIR=amd64
>       INSTALL_ARCH_DIR=amd64
>       ;;
>     i?86-*-*)
>       BUILD_ARCH_DIR=i586
>       INSTALL_ARCH_DIR=i386
>       ;;
>     *)
>       BUILD_ARCH_DIR=`uname -m`
>       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
>       ;;
>   esac
> 
> This is what I'm using at the moment.

Ahh, I missed that we're using `uname -m' and not the host triplet.
Sorry.  Yes, then we can remove it.

- twisti



From gbenson at redhat.com  Wed Nov  7 03:56:33 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 07 Nov 2007 11:56:33 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Gary Benson  <gbenson@redh...
Message-ID: <hg.6117d91ad783.1194436593.-6899778133799504387@icedtea.classpath.org>

changeset 6117d91ad783 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6117d91ad783
description:
	2007-11-07  Gary Benson  <gbenson at redhat.com>

		* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
		* configure: Regenerated.

diffstat:

3 files changed, 5 insertions(+), 16 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |    8 --------
configure    |    8 --------

diffs (48 lines):

diff -r 95a271d04351 -r 6117d91ad783 ChangeLog
--- a/ChangeLog	Fri Nov 02 12:53:15 2007 -0400
+++ b/ChangeLog	Wed Nov 07 11:56:25 2007 +0000
@@ -1,3 +1,8 @@ 2007-11-02  Joshua Sumali  <jsumali at redh
+2007-11-07  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
+	* configure: Regenerated.
+
 2007-11-02  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
diff -r 95a271d04351 -r 6117d91ad783 acinclude.m4
--- a/acinclude.m4	Fri Nov 02 12:53:15 2007 -0400
+++ b/acinclude.m4	Wed Nov 07 11:56:25 2007 +0000
@@ -8,14 +8,6 @@ AC_DEFUN([SET_ARCH_DIRS],
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
-      ;;
-    powerpc-*-*)
-      BUILD_ARCH_DIR=ppc
-      INSTALL_ARCH_DIR=ppc
-      ;;
-    powerpc64-*-*)
-      BUILD_ARCH_DIR=ppc64
-      INSTALL_ARCH_DIR=ppc64
       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
diff -r 95a271d04351 -r 6117d91ad783 configure
--- a/configure	Fri Nov 02 12:53:15 2007 -0400
+++ b/configure	Wed Nov 07 11:56:25 2007 +0000
@@ -4832,14 +4832,6 @@ fi
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       ;;
-    powerpc-*-*)
-      BUILD_ARCH_DIR=ppc
-      INSTALL_ARCH_DIR=ppc
-      ;;
-    powerpc64-*-*)
-      BUILD_ARCH_DIR=ppc64
-      INSTALL_ARCH_DIR=ppc64
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR


From gbenson at redhat.com  Wed Nov  7 03:58:08 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 7 Nov 2007 11:58:08 +0000
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <1194434291.32318.5.camel@localhost.localdomain>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
	<1194432357.32318.0.camel@localhost.localdomain>
	<20071107110415.GA3656@redhat.com>
	<1194434291.32318.5.camel@localhost.localdomain>
Message-ID: <20071107115807.GB3656@redhat.com>

Christian Thalinger wrote:
> On Wed, 2007-11-07 at 11:04 +0000, Gary Benson wrote:
> > Christian Thalinger wrote:
> > > On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> > > > Oh, I didn't realise what you meant by that, but it just
> > > > dawned on me that the ppc cases are also redundant in that
> > > > they do exactly what the default case does.  Mind if I remove
> > > > them too?
> > > 
> > > No, that not true.  The PowerPC cases map powerpc to ppc and
> > > powerpc64 to ppc64.  We need them.
> > 
> > The default case handles that mapping though:
> > 
> >   case "${host}" in
> >     x86_64-*-*)
> >       BUILD_ARCH_DIR=amd64
> >       INSTALL_ARCH_DIR=amd64
> >       ;;
> >     i?86-*-*)
> >       BUILD_ARCH_DIR=i586
> >       INSTALL_ARCH_DIR=i386
> >       ;;
> >     *)
> >       BUILD_ARCH_DIR=`uname -m`
> >       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
> >       ;;
> >   esac
> > 
> > This is what I'm using at the moment.
> 
> Ahh, I missed that we're using `uname -m' and not the host triplet.
> Sorry.  Yes, then we can remove it.

Done :)

Cheers,
Gary


From langel at redhat.com  Wed Nov  7 05:42:22 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 08:42:22 -0500
Subject: package org.omg.CORBA_2_3.portable does not exist
In-Reply-To: <20071106115810.GA3734@redhat.com>
References: <200710151342.53740.bero@arklinux.org>	<18195.21702.312045.341227@zebedee.pink>	<200710161555.02689.bero@arklinux.org>
	<20071106115810.GA3734@redhat.com>
Message-ID: <4731C0BE.5060702@redhat.com>



Gary Benson wrote:
> Bernhard Rosenkraenzer wrote:
>> On Monday 15 October 2007, you wrote:
>>> Bernhard Rosenkraenzer writes:
>>>> I've just tried to bootstrap icedtea (current hg) with gcj 4.3
>>>> from SVN (the first semi-official gcc with generics support).
>>> It can't be done.  The current icedTea needs to be bootstrapped
>>> with IcedTea.  We're thinking about how to solve this problem,
>>> but it's hard.
>> Thanks, that helped -- I got IcedTea 1.3 to compile with gcj 4.3
>> (just minor tweaks required - mostly it's a matter of killing the
>> -Werror flag because gcc 4.3 introduces quite a few new warniongs).
>>
>> Using the resulting JVM to bootstrap current hg icedtea still fails though:
>>
>> /usr/src/ark/BUILD/icedtea/bootstrap/jdk1.6.0/bin/java -client -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m -Xbootclasspath/p:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -jar /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/langtools/dist/bootstrap/lib/javac.jar -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes -sourcepath /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/gensrc:../../../src/solaris/classes:../../../src/share/classes -d /usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/classes @/usr/src/ark/BUILD/icedtea/openjdk/control/build/linux-i586/tmp/java/java.lang.management/management/.classes.list
>> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:39: package org.omg.CORBA_2_3.portable does not exist
>> import org.omg.CORBA_2_3.portable.InputStream;
>>                                  ^
>> ../../../src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java:42: 
>> package org.omg.CORBA_2_3.portable does not exist
> ...
> 
> I got stuck on this.  It's the second -Xbootclasspath that kills it,
> the one that says -Xbootclasspath:/path/to/linux-i586/classes, and
> sure enough the CORBA_2_3 classes aren't in there.  It's a weird one
> in that it only seems to happen on a clean build, so you'll hit the
> error, do something, rebuild, "cool, that fixed it", then get bitten
> by it all over again when you do a clean build.  But this patch seems
> to fix it.

I have also come across this issue while re-implementing ecj support. 
I will commit it with the rest of my stuff when it is ready.

Thanks,
Lillian


From langel at redhat.com  Wed Nov  7 08:23:47 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:47 +0000
Subject: changeset in /hg/icedtea: 2007-10-18  Lillian Angel  <langel@red...
Message-ID: <hg.26d6cb7b4b56.1194452627.-6899778133799504387@icedtea.classpath.org>

changeset 26d6cb7b4b56 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=26d6cb7b4b56
description:
	2007-10-18  Lillian Angel  <langel at redhat.com>

	        * README: Updated.

diffstat:

2 files changed, 5 insertions(+), 2 deletions(-)
ChangeLog |    4 ++++
README    |    3 +--

diffs (27 lines):

diff -r 173cae44913b -r 26d6cb7b4b56 ChangeLog
--- a/ChangeLog	Tue Oct 23 13:27:20 2007 +0200
+++ b/ChangeLog	Thu Oct 18 10:12:12 2007 -0400
@@ -3,6 +3,10 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-18  Lillian Angel  <langel at redhat.com>
+
+	* README: Updated.
 
 2007-10-17  Christan Thalinger  <twisti at complang.tuwien.ac.at>
 
diff -r 173cae44913b -r 26d6cb7b4b56 README
--- a/README	Tue Oct 23 13:27:20 2007 +0200
+++ b/README	Thu Oct 18 10:12:12 2007 -0400
@@ -21,8 +21,7 @@ binary plugs.
 binary plugs.
 
 IcedTea also provides build scripts and patches that allow the source
-code from openjdk.java.net to be built with ecj running on libgcj or
-with IcedTea itself.
+code from openjdk.java.net to be built with IcedTea itself.
 
 See INSTALL for build instructions.
 


From langel at redhat.com  Wed Nov  7 08:23:48 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-22  Lillian Angel  <langel@red...
Message-ID: <hg.7304808731d0.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset 7304808731d0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7304808731d0
description:
	2007-10-22  Lillian Angel  <langel at redhat.com>

	        * INSTALL: Updated requirements.
	        * Makefile.am: Updated patch list.
	        * Makefile.in: Regenerated.
	        * configure: Regenerated.
	        * configure.ac: Added checks for libpng, libjpeg, zlib and giflib.
	        * patches/icedtea-libraries.patch: New patch to remove built-in
	        libraries (libpng, libjpeg, zlib, giflib) and use system installed libs.
	        * patches/icedtea-libpng.patch: Removed (combined with previous patch).

diffstat:

7 files changed, 747 insertions(+), 16 deletions(-)
ChangeLog                       |   11 
INSTALL                         |    4 
Makefile.am                     |    2 
configure                       |  284 ++++++++++++++++++++++++-
configure.ac                    |    8 
patches/icedtea-libpng.patch    |   11 
patches/icedtea-libraries.patch |  443 +++++++++++++++++++++++++++++++++++++++

diffs (truncated from 856 to 500 lines):

diff -r cee826c52531 -r 7304808731d0 ChangeLog
--- a/ChangeLog	Fri Oct 19 12:33:26 2007 -0400
+++ b/ChangeLog	Mon Oct 22 16:00:02 2007 -0400
@@ -3,6 +3,17 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-22  Lillian Angel  <langel at redhat.com>
+
+	* INSTALL: Updated requirements.
+	* Makefile.am: Updated patch list.
+	* Makefile.in: Regenerated.
+	* configure: Regenerated.
+	* configure.ac: Added checks for libpng, libjpeg, zlib and giflib.
+	* patches/icedtea-libraries.patch: New patch to remove built-in
+	libraries (libpng, libjpeg, zlib, giflib) and use system installed libs.
+	* patches/icedtea-libpng.patch: Removed (combined with previous patch).
 
 2007-10-19  Joshua Sumali  <jsumali at redhat.com>
 
diff -r cee826c52531 -r 7304808731d0 INSTALL
--- a/INSTALL	Fri Oct 19 12:33:26 2007 -0400
+++ b/INSTALL	Mon Oct 22 16:00:02 2007 -0400
@@ -26,6 +26,10 @@ gtk2-devel
 gtk2-devel
 ant >= 1.6.5
 libXinerama-devel
+giflib-devel
+libpng-devel
+libjpeg-devel
+zlib-devel
 java-1.7.0-icedtea-devel (or IcedTea <= b19 built)
 
 See ./configure --help if you need to override defaults.
diff -r cee826c52531 -r 7304808731d0 Makefile.am
--- a/Makefile.am	Fri Oct 19 12:33:26 2007 -0400
+++ b/Makefile.am	Mon Oct 22 16:00:02 2007 -0400
@@ -136,7 +136,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-debuginfo.patch \
 	patches/icedtea-ssl.patch \
 	patches/icedtea-license-headers.patch \
-	patches/icedtea-libpng.patch \
 	patches/icedtea-plugin.patch \
 	patches/icedtea-rmi_amd64.patch \
 	patches/icedtea-tools.patch \
@@ -152,6 +151,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-sunsrc.patch \
+	patches/icedtea-libraries.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r cee826c52531 -r 7304808731d0 configure
--- a/configure	Fri Oct 19 12:33:26 2007 -0400
+++ b/configure	Mon Oct 22 16:00:02 2007 -0400
@@ -6934,6 +6934,282 @@ fi
 fi
 
 
+{ echo "$as_me:$LINENO: checking for main in -lpng" >&5
+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6; }
+if test "${ac_cv_lib_png_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_png_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_png_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
+echo "${ECHO_T}$ac_cv_lib_png_main" >&6; }
+if test $ac_cv_lib_png_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPNG 1
+_ACEOF
+
+  LIBS="-lpng $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"libpng not found - try installing libpng-devel\"" >&5
+echo "$as_me: error: \"libpng not found - try installing libpng-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+{ echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
+echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6; }
+if test "${ac_cv_lib_jpeg_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_jpeg_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_jpeg_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6; }
+if test $ac_cv_lib_jpeg_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJPEG 1
+_ACEOF
+
+  LIBS="-ljpeg $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"libjpeg not found - try installing libjpeg-devel\"" >&5
+echo "$as_me: error: \"libjpeg not found - try installing libjpeg-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+{ echo "$as_me:$LINENO: checking for main in -lgif" >&5
+echo $ECHO_N "checking for main in -lgif... $ECHO_C" >&6; }
+if test "${ac_cv_lib_gif_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgif  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_gif_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_gif_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gif_main" >&5
+echo "${ECHO_T}$ac_cv_lib_gif_main" >&6; }
+if test $ac_cv_lib_gif_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGIF 1
+_ACEOF
+
+  LIBS="-lgif $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"libgif not found - try installing libgif-devel\"" >&5
+echo "$as_me: error: \"libgif not found - try installing libgif-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+{ echo "$as_me:$LINENO: checking for main in -lz" >&5
+echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6; }
+if test "${ac_cv_lib_z_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_z_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_z_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5
+echo "${ECHO_T}$ac_cv_lib_z_main" >&6; }
+if test $ac_cv_lib_z_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: \"zlib not found - try installing zlib-devel\"" >&5
+echo "$as_me: error: \"zlib not found - try installing zlib-devel\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -7600,7 +7876,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7610,7 +7886,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -7711,7 +7987,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7721,7 +7997,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
diff -r cee826c52531 -r 7304808731d0 configure.ac
--- a/configure.ac	Fri Oct 19 12:33:26 2007 -0400
+++ b/configure.ac	Mon Oct 22 16:00:02 2007 -0400
@@ -75,6 +75,14 @@ AC_CHECK_LIB(Xtst, XTestQueryExtension,
 	, [AC_MSG_ERROR("libXtst not found - try installing libXtst-devel")])
 AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
 	, [AC_MSG_ERROR("libXinerama not found - try installing libXinerama-devel")])
+AC_CHECK_LIB(png, main,
+        , [AC_MSG_ERROR("libpng not found - try installing libpng-devel")])
+AC_CHECK_LIB(jpeg, main,
+        , [AC_MSG_ERROR("libjpeg not found - try installing libjpeg-devel")])
+AC_CHECK_LIB(gif, main,
+        , [AC_MSG_ERROR("libgif not found - try installing libgif-devel")])
+AC_CHECK_LIB(z, main,
+	, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
 
 dnl Check for plugin support headers and libraries.
 PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], \
diff -r cee826c52531 -r 7304808731d0 patches/icedtea-libpng.patch
--- a/patches/icedtea-libpng.patch	Fri Oct 19 12:33:26 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- openjdk.orig/j2se/make/sun/splashscreen/Makefile	2007-08-19 15:04:21.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/Makefile	2007-08-19 15:08:45.000000000 -0400
-@@ -59,7 +59,7 @@
- # C Flags
- #
- 
--CFLAGS += -DSPLASHSCREEN
-+CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
- 
- ifneq ($(PLATFORM), windows)
-   CFLAGS += -DWITH_X11
diff -r cee826c52531 -r 7304808731d0 patches/icedtea-libraries.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-libraries.patch	Mon Oct 22 16:00:02 2007 -0400
@@ -0,0 +1,443 @@
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2007-10-22 12:50:36.000000000 -0400
+@@ -25,7 +25,7 @@
+ 
+ #include "splashscreen_impl.h"
+ 
+-#include "../libpng/png.h"
++#include <png.h>
+ 
+ #include <setjmp.h>
+ 
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2007-10-22 12:50:36.000000000 -0400
+@@ -26,7 +26,7 @@
+ #include "splashscreen_impl.h"
+ #include "splashscreen_gfx.h"
+ 
+-#include "../giflib/gif_lib.h"
++#include <gif_lib.h>
+ 
+ #define GIF_TRANSPARENT     0x01
+ #define GIF_USER_INPUT      0x02
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-22 12:50:36.000000000 -0400
+@@ -25,11 +25,9 @@
+ 
+ #include "splashscreen_impl.h"
+ 
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-#include "jerror.h"
+-
++#include <jerror.h>
+ #include <setjmp.h>
++#include <jpeglib.h>
+ 
+ /* stream input handling */
+ 
+@@ -105,13 +103,9 @@
+     stream_src_ptr src;
+ 
+     if (cinfo->src == NULL) {   /* first time for this JPEG object? */
+-        cinfo->src = (struct jpeg_source_mgr *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
++        cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
+         src = (stream_src_ptr) cinfo->src;
+-        src->buffer = (JOCTET *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
++        src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
+     }
+ 
+     src = (stream_src_ptr) cinfo->src;
+--- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-22 12:50:36.000000000 -0400
+@@ -23,53 +23,7 @@
+ # have any questions.
+ #
+ 
+-FILES_c = \
+-	imageioJPEG.c \
+-	jpegdecoder.c \
+-	jcomapi.c \
+-	jdapimin.c \
+-	jdapistd.c \
+-	jdcoefct.c \
+-	jdcolor.c \
+-	jddctmgr.c \
+-	jdhuff.c \
+-	jdinput.c \
+-	jdmainct.c \
+-	jdmarker.c \
+-	jdmaster.c \
+-	jdmerge.c \
+-	jdphuff.c \
+-	jdpostct.c \
+-	jdsample.c \
+-	jerror.c \
+-	jidctflt.c \
+-	jidctfst.c \
+-	jidctint.c \
+-	jidctred.c \
+-	jmemmgr.c \
+-	jmemnobs.c \
+-	jquant1.c \
+-	jquant2.c \


From langel at redhat.com  Wed Nov  7 08:23:48 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-18  Lillian Angel  <langel@red...
Message-ID: <hg.6595cc8bc5ab.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset 6595cc8bc5ab in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6595cc8bc5ab
description:
	2007-10-18  Lillian Angel  <langel at redhat.com>

	        * Makefile.am (OPENJDK_SOURCEPATH_DIRS): Added CORBA sources.

diffstat:

3 files changed, 8 insertions(+), 2 deletions(-)
ChangeLog   |    4 ++++
Makefile.am |    3 ++-
Makefile.in |    3 ++-

diffs (43 lines):

diff -r 26d6cb7b4b56 -r 6595cc8bc5ab ChangeLog
--- a/ChangeLog	Thu Oct 18 10:12:12 2007 -0400
+++ b/ChangeLog	Thu Oct 18 11:31:12 2007 -0400
@@ -3,6 +3,10 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-18  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am (OPENJDK_SOURCEPATH_DIRS): Added CORBA sources.
 
 2007-10-18  Lillian Angel  <langel at redhat.com>
 
diff -r 26d6cb7b4b56 -r 6595cc8bc5ab Makefile.am
--- a/Makefile.am	Thu Oct 18 10:12:12 2007 -0400
+++ b/Makefile.am	Thu Oct 18 11:31:12 2007 -0400
@@ -324,9 +324,10 @@ SOLARIS = openjdk/j2se/src/solaris/class
 SOLARIS = openjdk/j2se/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
+CORBA = openjdk/corba/src/share/classes
 
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP)
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA)
 
 # tools.jar class files.
 stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
diff -r 26d6cb7b4b56 -r 6595cc8bc5ab Makefile.in
--- a/Makefile.in	Thu Oct 18 10:12:12 2007 -0400
+++ b/Makefile.in	Thu Oct 18 11:31:12 2007 -0400
@@ -292,8 +292,9 @@ SOLARIS = openjdk/j2se/src/solaris/class
 SOLARIS = openjdk/j2se/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
+CORBA = openjdk/corba/src/share/classes
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP)
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA)
 
 all: all-am
 


From langel at redhat.com  Wed Nov  7 08:23:49 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-22  Lillian Angel  <langel@red...
Message-ID: <hg.335f71762c44.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset 335f71762c44 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=335f71762c44
description:
	2007-10-22  Lillian Angel  <langel at redhat.com>

	        * configure.ac: Fixed typo. libgif should be giflib.
	        * configure: Regenerate.

diffstat:

3 files changed, 12 insertions(+), 7 deletions(-)
ChangeLog    |    5 +++++
configure    |   12 ++++++------
configure.ac |    2 +-

diffs (77 lines):

diff -r 7304808731d0 -r 335f71762c44 ChangeLog
--- a/ChangeLog	Mon Oct 22 16:00:02 2007 -0400
+++ b/ChangeLog	Mon Oct 22 16:10:10 2007 -0400
@@ -3,6 +3,11 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-22  Lillian Angel  <langel at redhat.com>
+
+	* configure.ac: Fixed typo. libgif should be giflib.
+	* configure: Regenerate.
 
 2007-10-22  Lillian Angel  <langel at redhat.com>
 
diff -r 7304808731d0 -r 335f71762c44 configure
--- a/configure	Mon Oct 22 16:00:02 2007 -0400
+++ b/configure	Mon Oct 22 16:10:10 2007 -0400
@@ -7135,8 +7135,8 @@ _ACEOF
   LIBS="-lgif $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: \"libgif not found - try installing libgif-devel\"" >&5
-echo "$as_me: error: \"libgif not found - try installing libgif-devel\"" >&2;}
+  { { echo "$as_me:$LINENO: error: \"giflib not found - try installing giflib-devel\"" >&5
+echo "$as_me: error: \"giflib not found - try installing giflib-devel\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -7876,7 +7876,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7886,7 +7886,7 @@ and GLIB_LIBS to avoid the need to call 
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -7987,7 +7987,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -7997,7 +7997,7 @@ and GTK_LIBS to avoid the need to call p
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
diff -r 7304808731d0 -r 335f71762c44 configure.ac
--- a/configure.ac	Mon Oct 22 16:00:02 2007 -0400
+++ b/configure.ac	Mon Oct 22 16:10:10 2007 -0400
@@ -80,7 +80,7 @@ AC_CHECK_LIB(jpeg, main,
 AC_CHECK_LIB(jpeg, main,
         , [AC_MSG_ERROR("libjpeg not found - try installing libjpeg-devel")])
 AC_CHECK_LIB(gif, main,
-        , [AC_MSG_ERROR("libgif not found - try installing libgif-devel")])
+        , [AC_MSG_ERROR("giflib not found - try installing giflib-devel")])
 AC_CHECK_LIB(z, main,
 	, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
 


From langel at redhat.com  Wed Nov  7 08:23:48 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-18  Lillian Angel  <langel@red...
Message-ID: <hg.10ce9710bee5.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset 10ce9710bee5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=10ce9710bee5
description:
	2007-10-18  Lillian Angel  <langel at redhat.com>

	        * javac.in, javap.in: Removed

diffstat:

3 files changed, 4 insertions(+), 32 deletions(-)
ChangeLog |    4 ++++
javac.in  |   29 -----------------------------
javap.in  |    3 ---

diffs (54 lines):

diff -r 6595cc8bc5ab -r 10ce9710bee5 ChangeLog
--- a/ChangeLog	Thu Oct 18 11:31:12 2007 -0400
+++ b/ChangeLog	Thu Oct 18 16:04:37 2007 -0400
@@ -3,6 +3,10 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-18  Lillian Angel  <langel at redhat.com>
+
+	* javac.in, javap.in: Removed
 
 2007-10-18  Lillian Angel  <langel at redhat.com>
 
diff -r 6595cc8bc5ab -r 10ce9710bee5 javac.in
--- a/javac.in	Thu Oct 18 11:31:12 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-case "$*" in
-  *-bootclasspath*) ;;
-  *) bcoption="-bootclasspath @LIBGCJ_JAR@"
-esac
-
-# Work around ecj's inability to handle duplicate command-line
-# options.
-
-NEW_ARGS="$@"
-
-if echo "$@" | grep -q '\-source\ .*\-source\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-source\ *1\.[3456]//1'`
-fi
-
-if echo "$@" | grep -q '\-d\ .*\-d\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-d\ *[^\ ]*//1'`
-fi
-
-if echo "$@" | grep -q '\-encoding\ .*\-encoding\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-encoding\ *[^\ ]*//1'`
-fi
-
-CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
-  @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
diff -r 6595cc8bc5ab -r 10ce9710bee5 javap.in
--- a/javap.in	Thu Oct 18 11:31:12 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0


From jsumali at redhat.com  Wed Nov  7 08:23:48 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Wed, 07 Nov 2007 16:23:48 +0000
Subject: changeset in /hg/icedtea: 2007-10-19  Joshua Sumali  <jsumali@re...
Message-ID: <hg.cee826c52531.1194452628.-6899778133799504387@icedtea.classpath.org>

changeset cee826c52531 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cee826c52531
description:
	2007-10-19  Joshua Sumali  <jsumali at redhat.com>

	        * patches/icedtea-sunsrc.patch: New file.
	        * Makefile.am: Added icedtea-sunsrc to patch list.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 30 insertions(+)
ChangeLog                    |    6 ++++++
Makefile.am                  |    1 +
patches/icedtea-sunsrc.patch |   23 +++++++++++++++++++++++

diffs (54 lines):

diff -r 10ce9710bee5 -r cee826c52531 ChangeLog
--- a/ChangeLog	Thu Oct 18 16:04:37 2007 -0400
+++ b/ChangeLog	Fri Oct 19 12:33:26 2007 -0400
@@ -3,6 +3,12 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-19  Joshua Sumali  <jsumali at redhat.com>
+
+	* patches/icedtea-sunsrc.patch: New file.
+	* Makefile.am: Added icedtea-sunsrc to patch list.
+	* Makefile.in: Regenerated.
 
 2007-10-18  Lillian Angel  <langel at redhat.com>
 
diff -r 10ce9710bee5 -r cee826c52531 Makefile.am
--- a/Makefile.am	Thu Oct 18 16:04:37 2007 -0400
+++ b/Makefile.am	Fri Oct 19 12:33:26 2007 -0400
@@ -151,6 +151,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-xjc.patch \
+	patches/icedtea-sunsrc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 10ce9710bee5 -r cee826c52531 patches/icedtea-sunsrc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sunsrc.patch	Fri Oct 19 12:33:26 2007 -0400
@@ -0,0 +1,23 @@
+--- openjdk.orig/j2se/make/common/Release.gmk	2007-10-17 16:06:30.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-18 14:47:55.000000000 -0400
+@@ -625,6 +625,10 @@
+ 	    $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
+ 		-o  $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
+ 	$(MV) $@.temp $@
++	$(CAT) $@ | $(GREP) "^sun" | $(GREP) "class" | $(GREP) -v '\$$' \
++	    > $(ABS_TEMPDIR)/sun_classes_list
++	sed 's/\.class/\.java/' < $(ABS_TEMPDIR)/sun_classes_list \
++	    > $(ABS_TEMPDIR)/sun_sources_list
+ 	@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
+ 
+ # Create the rt.jar file list & non-class files list
+@@ -1002,6 +1006,9 @@
+ 	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
+ 	  fi; \
+ 	done
++	($(CD) $(SHARE_SRC)/classes && $(TAR) cf - -T \
++	    $(ABS_TEMPDIR)/sun_sources_list ) \
++	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -);
+   else
+ 	for d in $(SOURCE_DIRS); do \
+ 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \


From langel at redhat.com  Wed Nov  7 08:23:49 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-24  Lillian Angel  <langel@red...
Message-ID: <hg.8d9b3ea59444.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset 8d9b3ea59444 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d9b3ea59444
description:
	2007-10-24  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-libraries.patch: Updated jpeg patches to properly
	        create OpenJDK's libjpeg.so without files common to the system
	        installed libjpeg.so.

diffstat:

2 files changed, 25301 insertions(+), 222 deletions(-)
ChangeLog                       |    6 
patches/icedtea-libraries.patch |25517 ++++++++++++++++++++++++++++++++++++++-

diffs (truncated from 25551 to 500 lines):

diff -r 335f71762c44 -r 8d9b3ea59444 ChangeLog
--- a/ChangeLog	Mon Oct 22 16:10:10 2007 -0400
+++ b/ChangeLog	Wed Oct 24 22:28:39 2007 -0400
@@ -1,3 +1,9 @@ 2007-10-23  Christan Thalinger  <twisti@
+2007-10-24  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-libraries.patch: Updated jpeg patches to properly
+	create OpenJDK's libjpeg.so without files common to the system
+	installed libjpeg.so.
+
 2007-10-23  Christan Thalinger  <twisti at complang.tuwien.ac.at>
 
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
diff -r 335f71762c44 -r 8d9b3ea59444 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Mon Oct 22 16:10:10 2007 -0400
+++ b/patches/icedtea-libraries.patch	Wed Oct 24 22:28:39 2007 -0400
@@ -20,210 +20,6 @@
  
  #define GIF_TRANSPARENT     0x01
  #define GIF_USER_INPUT      0x02
---- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-12 04:03:51.000000000 -0400
-+++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-22 12:50:36.000000000 -0400
-@@ -25,11 +25,9 @@
- 
- #include "splashscreen_impl.h"
- 
--#include "jinclude.h"
--#include "jpeglib.h"
--#include "jerror.h"
--
-+#include <jerror.h>
- #include <setjmp.h>
-+#include <jpeglib.h>
- 
- /* stream input handling */
- 
-@@ -105,13 +103,9 @@
-     stream_src_ptr src;
- 
-     if (cinfo->src == NULL) {   /* first time for this JPEG object? */
--        cinfo->src = (struct jpeg_source_mgr *)
--            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
--            JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
-+        cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
-         src = (stream_src_ptr) cinfo->src;
--        src->buffer = (JOCTET *)
--            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
--            JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
-+        src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
-     }
- 
-     src = (stream_src_ptr) cinfo->src;
---- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-22 12:50:36.000000000 -0400
-@@ -23,53 +23,7 @@
- # have any questions.
- #
- 
--FILES_c = \
--	imageioJPEG.c \
--	jpegdecoder.c \
--	jcomapi.c \
--	jdapimin.c \
--	jdapistd.c \
--	jdcoefct.c \
--	jdcolor.c \
--	jddctmgr.c \
--	jdhuff.c \
--	jdinput.c \
--	jdmainct.c \
--	jdmarker.c \
--	jdmaster.c \
--	jdmerge.c \
--	jdphuff.c \
--	jdpostct.c \
--	jdsample.c \
--	jerror.c \
--	jidctflt.c \
--	jidctfst.c \
--	jidctint.c \
--	jidctred.c \
--	jmemmgr.c \
--	jmemnobs.c \
--	jquant1.c \
--	jquant2.c \
--	jutils.c \
--	jcapimin.c \
--	jcapistd.c \
--	jccoefct.c \
--	jccolor.c \
--	jcdctmgr.c \
--	jchuff.c \
--	jcinit.c \
--	jcmainct.c \
--	jcmarker.c \
--	jcmaster.c \
--	jcparam.c \
--	jcphuff.c \
--	jcprepct.c \
--	jcsample.c \
--	jctrans.c \
--	jdtrans.c \
--	jfdctflt.c \
--	jfdctfst.c \
--	jfdctint.c
-+
- 
- ifndef OPENJDK
- FILES_c += \
---- openjdk.old/j2se/make/sun/splashscreen/Makefile	2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/Makefile	2007-10-22 13:17:21.000000000 -0400
-@@ -59,12 +59,12 @@
- # C Flags
- #
- 
--CFLAGS += -DSPLASHSCREEN
-+CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
- 
- ifneq ($(PLATFORM), windows)
-   CFLAGS += -DWITH_X11
-   CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
--  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
-+  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
- else # PLATFORM
-   CFLAGS += -DWITH_WIN32
-   OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
-@@ -76,12 +76,7 @@
- #
- vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
- vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
--vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
--vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
--vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
- vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
- 
- CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
- 
---- openjdk.old/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
-+++ openjdk/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-22 13:18:28.000000000 -0400
-@@ -30,81 +30,5 @@
- 	splashscreen_impl.c \
- 	splashscreen_jpeg.c \
- 	splashscreen_png.c \
--	splashscreen_sys.c \
--	png.c \
--	pngerror.c \
--	pngget.c \
--	pngmem.c  \
--	pngpread.c \
--	pngread.c \
--	pngrio.c \
--	pngrtran.c \
--	pngrutil.c \
--	pngset.c \
--	pngtrans.c \
--	pngwio.c \
--	pngwrite.c \
--	pngwtran.c \
--	pngwutil.c \
--	dgif_lib.c \
--	gif_err.c \
--	gifalloc.c \
--	compress.c \
--	deflate.c \
--	gzio.c \
--	infblock.c \
--	infcodes.c \
--	inffast.c \
--	inflate.c \
--	inftrees.c \
--	infutil.c \
--	trees.c \
--	uncompr.c \
--	zadler32.c \
--	zcrc32.c \
--	zutil.c \
--	jcomapi.c \
--	jdapimin.c \
--	jdapistd.c \
--	jdcoefct.c \
--	jdcolor.c \
--	jddctmgr.c \
--	jdhuff.c \
--	jdinput.c \
--	jdmainct.c \
--	jdmarker.c \
--	jdmaster.c \
--	jdmerge.c \
--	jdphuff.c \
--	jdpostct.c \
--	jdsample.c \
--	jerror.c \
--	jidctflt.c \
--	jidctfst.c \
--	jidctint.c \
--	jidctred.c \
--	jmemmgr.c \
--	jmemnobs.c \
--	jquant1.c \
--	jquant2.c \
--	jutils.c \
--	jcapimin.c \
--	jcapistd.c \
--	jccoefct.c \
--	jccolor.c \
--	jcdctmgr.c \
--	jchuff.c \
--	jcinit.c \
--	jcmainct.c \
--	jcmarker.c \
--	jcmaster.c \
--	jcparam.c \
--	jcphuff.c \
--	jcprepct.c \
--	jcsample.c \
--	jctrans.c \
--	jdtrans.c \
--	jfdctflt.c \
--	jfdctfst.c \
--	jfdctint.c
-+	splashscreen_sys.c
- 
 --- openjdk.old/j2se/src/share/native/java/util/zip/Adler32.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Adler32.c	2007-10-22 13:21:09.000000000 -0400
 @@ -29,7 +29,7 @@
@@ -235,24 +31,6 @@
  
  #include "java_util_zip_Adler32.h"
  
---- openjdk.old/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-12 04:03:46.000000000 -0400
-+++ openjdk/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-22 13:22:05.000000000 -0400
-@@ -36,6 +36,7 @@
- #include <time.h>
- #include <ctype.h>
- #include <assert.h>
-+#include <zlib.h>
- 
- #include "jni.h"
- #include "jni_util.h"
-@@ -44,7 +45,6 @@
- #include "io_util.h"
- #include "io_util_md.h"
- #include "zip_util.h"
--#include "zlib.h"
- 
- /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
- #ifdef USE_MMAP
 --- openjdk.old/j2se/src/share/native/java/util/zip/Deflater.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Deflater.c	2007-10-22 13:22:34.000000000 -0400
 @@ -32,7 +32,7 @@
@@ -441,3 +219,25298 @@
  #include "java_util_zip_Inflater.h"
  
  #define ThrowDataFormatException(env, msg) \
+--- openjdk.old/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-12 04:03:46.000000000 -0400
++++ openjdk/j2se/src/share/native/java/util/zip/zip_util.c	2007-10-23 14:33:18.000000000 -0400
+@@ -44,7 +44,8 @@
+ #include "io_util.h"
+ #include "io_util_md.h"
+ #include "zip_util.h"
+-#include "zlib.h"
++
++#include <zlib.h>
+ 
+ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
+ #ifdef USE_MMAP
+--- openjdk.old/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/splashscreen/FILES_c.gmk	2007-10-23 16:15:48.000000000 -0400
+@@ -30,81 +30,5 @@
+ 	splashscreen_impl.c \
+ 	splashscreen_jpeg.c \
+ 	splashscreen_png.c \
+-	splashscreen_sys.c \
+-	png.c \
+-	pngerror.c \
+-	pngget.c \
+-	pngmem.c  \
+-	pngpread.c \
+-	pngread.c \
+-	pngrio.c \
+-	pngrtran.c \
+-	pngrutil.c \
+-	pngset.c \
+-	pngtrans.c \
+-	pngwio.c \
+-	pngwrite.c \
+-	pngwtran.c \
+-	pngwutil.c \
+-	dgif_lib.c \
+-	gif_err.c \
+-	gifalloc.c \
+-	compress.c \
+-	deflate.c \
+-	gzio.c \
+-	infblock.c \
+-	infcodes.c \
+-	inffast.c \
+-	inflate.c \
+-	inftrees.c \
+-	infutil.c \
+-	trees.c \
+-	uncompr.c \
+-	zadler32.c \
+-	zcrc32.c \
+-	zutil.c \
+-	jcomapi.c \
+-	jdapimin.c \
+-	jdapistd.c \
+-	jdcoefct.c \
+-	jdcolor.c \
+-	jddctmgr.c \
+-	jdhuff.c \
+-	jdinput.c \
+-	jdmainct.c \
+-	jdmarker.c \
+-	jdmaster.c \
+-	jdmerge.c \
+-	jdphuff.c \
+-	jdpostct.c \
+-	jdsample.c \
+-	jerror.c \
+-	jidctflt.c \
+-	jidctfst.c \
+-	jidctint.c \
+-	jidctred.c \
+-	jmemmgr.c \
+-	jmemnobs.c \
+-	jquant1.c \
+-	jquant2.c \
+-	jutils.c \
+-	jcapimin.c \
+-	jcapistd.c \
+-	jccoefct.c \
+-	jccolor.c \
+-	jcdctmgr.c \
+-	jchuff.c \
+-	jcinit.c \
+-	jcmainct.c \
+-	jcmarker.c \
+-	jcmaster.c \
+-	jcparam.c \
+-	jcphuff.c \
+-	jcprepct.c \
+-	jcsample.c \
+-	jctrans.c \
+-	jdtrans.c \
+-	jfdctflt.c \
+-	jfdctfst.c \
+-	jfdctint.c
++	splashscreen_sys.c 
+ 
+--- openjdk.old/j2se/make/sun/splashscreen/Makefile	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/splashscreen/Makefile	2007-10-23 16:20:24.000000000 -0400
+@@ -59,12 +59,12 @@
+ # C Flags
+ #
+ 
+-CFLAGS += -DSPLASHSCREEN
++CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
+ 
+ ifneq ($(PLATFORM), windows)
+   CFLAGS += -DWITH_X11
+   CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+-  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
++  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
+ else # PLATFORM
+   CFLAGS += -DWITH_WIN32
+   OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
+@@ -76,12 +76,8 @@
+ #
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
+-vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
+-vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
+ vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+ vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
+ 
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ 
+--- openjdk.old/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-12 04:03:51.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c	2007-10-23 16:29:30.000000000 -0400
+@@ -25,9 +25,8 @@
+ 
+ #include "splashscreen_impl.h"
+ 
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-#include "jerror.h"
++#include <jpeglib.h>
++#include <jerror.h>
+ 
+ #include <setjmp.h>
+ 
+@@ -105,13 +104,9 @@
+     stream_src_ptr src;
+ 
+     if (cinfo->src == NULL) {   /* first time for this JPEG object? */
+-        cinfo->src = (struct jpeg_source_mgr *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, SIZEOF(stream_source_mgr));
++        cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(stream_source_mgr));
+         src = (stream_src_ptr) cinfo->src;
+-        src->buffer = (JOCTET *)
+-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+-            JPOOL_PERMANENT, INPUT_BUF_SIZE * SIZEOF(JOCTET));
++        src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET));
+     }
+ 
+     src = (stream_src_ptr) cinfo->src;
+diff -ruN openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk openjdk/j2se/make/sun/jpeg/FILES_c.gmk
+--- openjdk.old/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-12 03:54:08.000000000 -0400
++++ openjdk/j2se/make/sun/jpeg/FILES_c.gmk	2007-10-23 17:13:59.000000000 -0400
+@@ -25,51 +25,7 @@
+ 
+ FILES_c = \
+ 	imageioJPEG.c \
+-	jpegdecoder.c \
+-	jcomapi.c \
+-	jdapimin.c \
+-	jdapistd.c \
+-	jdcoefct.c \
+-	jdcolor.c \
+-	jddctmgr.c \
+-	jdhuff.c \
+-	jdinput.c \
+-	jdmainct.c \
+-	jdmarker.c \
+-	jdmaster.c \
+-	jdmerge.c \
+-	jdphuff.c \
+-	jdpostct.c \
+-	jdsample.c \
+-	jerror.c \
+-	jidctflt.c \
+-	jidctfst.c \
+-	jidctint.c \
+-	jidctred.c \
+-	jmemmgr.c \
+-	jmemnobs.c \
+-	jquant1.c \
+-	jquant2.c \
+-	jutils.c \
+-	jcapimin.c \
+-	jcapistd.c \
+-	jccoefct.c \
+-	jccolor.c \
+-	jcdctmgr.c \
+-	jchuff.c \
+-	jcinit.c \
+-	jcmainct.c \
+-	jcmarker.c \
+-	jcmaster.c \
+-	jcparam.c \
+-	jcphuff.c \
+-	jcprepct.c \
+-	jcsample.c \
+-	jctrans.c \
+-	jdtrans.c \
+-	jfdctflt.c \
+-	jfdctfst.c \
+-	jfdctint.c
++	jpegdecoder.c
+ 
+ ifndef OPENJDK
+ FILES_c += \
+diff -ruN openjdk.old/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c openjdk/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c
+--- openjdk.old/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c	2007-10-12 04:03:48.000000000 -0400
++++ openjdk/j2se/src/share/native/sun/awt/image/jpeg/jcapimin.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,284 +0,0 @@
+-/*
+- * reserved comment block
+- * DO NOT REMOVE OR ALTER!
+- */
+-/*
+- * jcapimin.c
+- *
+- * Copyright (C) 1994-1998, Thomas G. Lane.
+- * This file is part of the Independent JPEG Group's software.
+- * For conditions of distribution and use, see the accompanying README file.
+- *
+- * This file contains application interface code for the compression half
+- * of the JPEG library.  These are the "minimum" API routines that may be
+- * needed in either the normal full-compression case or the transcoding-only
+- * case.
+- *
+- * Most of the routines intended to be called directly by an application
+- * are in this file or in jcapistd.c.  But also see jcparam.c for
+- * parameter-setup helper routines, jcomapi.c for routines shared by
+- * compression and decompression, and jctrans.c for the transcoding case.
+- */
+-
+-#define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
+-
+-


From langel at redhat.com  Wed Nov  7 08:23:49 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-30  Lillian Angel  <langel@red...
Message-ID: <hg.f5f4a0462f74.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset f5f4a0462f74 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f5f4a0462f74
description:
	2007-10-30  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-bytecodeInterpreterWithChecks.patch: New patch to
	        fix cpp generated.
	        * patches/icedtea-javafiles.patch: New patch to add missing files to
	        the list.
	        * Makefile.am: Added patches to the list.
	        * Makefile.in: Regenerated.

diffstat:

4 files changed, 126 insertions(+)
ChangeLog                                           |    9 +
Makefile.am                                         |    2 
patches/icedtea-bytecodeInterpreterWithChecks.patch |   18 +++
patches/icedtea-javafiles.patch                     |   97 +++++++++++++++++++

diffs (151 lines):

diff -r 8d9b3ea59444 -r f5f4a0462f74 ChangeLog
--- a/ChangeLog	Wed Oct 24 22:28:39 2007 -0400
+++ b/ChangeLog	Tue Oct 30 13:18:22 2007 -0400
@@ -1,3 +1,12 @@ 2007-10-24  Lillian Angel  <langel at redha
+2007-10-30  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-bytecodeInterpreterWithChecks.patch: New patch to
+	fix cpp generated.
+	* patches/icedtea-javafiles.patch: New patch to add missing files to
+	the list.
+	* Makefile.am: Added patches to the list.
+	* Makefile.in: Regenerated.
+
 2007-10-24  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-libraries.patch: Updated jpeg patches to properly
diff -r 8d9b3ea59444 -r f5f4a0462f74 Makefile.am
--- a/Makefile.am	Wed Oct 24 22:28:39 2007 -0400
+++ b/Makefile.am	Tue Oct 30 13:18:22 2007 -0400
@@ -152,6 +152,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
+	patches/icedtea-bytecodeInterpreterWithChecks.patch \
+	patches/icedtea-javafiles.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 8d9b3ea59444 -r f5f4a0462f74 patches/icedtea-bytecodeInterpreterWithChecks.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-bytecodeInterpreterWithChecks.patch	Tue Oct 30 13:18:22 2007 -0400
@@ -0,0 +1,18 @@
+--- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl      2007-10-12 03:46:08.000000000 -0400
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl      2007-10-29 11:57:33.000000000 -0400
+@@ -8,6 +8,7 @@
+
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
++<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+ <xsl:template match="processcode">
+ <xsl:text>
+ #define VM_JVMTI
+@@ -17,7 +18,6 @@
+
+ </xsl:text>
+
+-<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+ </xsl:template>
+
+ </xsl:stylesheet>
diff -r 8d9b3ea59444 -r f5f4a0462f74 patches/icedtea-javafiles.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-javafiles.patch	Tue Oct 30 13:18:22 2007 -0400
@@ -0,0 +1,97 @@
+--- openjdk.old/j2se/make/java/java/FILES_java.gmk	2007-10-12 03:54:05.000000000 -0400
++++ openjdk/j2se/make/java/java/FILES_java.gmk	2007-10-29 13:54:32.000000000 -0400
+@@ -29,6 +29,80 @@
+ # will generate header files
+ #
+ JAVA_JAVA_java = \
++    java/lang/reflect/AccessibleObject.java \
++    java/lang/reflect/AnnotatedElement.java \
++    java/lang/reflect/Array.java \
++    java/lang/reflect/Constructor.java \
++    java/lang/reflect/Field.java \
++    java/lang/reflect/GenericArrayType.java \
++    java/lang/reflect/GenericDeclaration.java \
++    java/lang/reflect/GenericSignatureFormatError.java \
++    java/lang/reflect/InvocationHandler.java \
++    java/lang/reflect/InvocationTargetException.java \
++    java/lang/reflect/MalformedParameterizedTypeException.java \
++    java/lang/reflect/Member.java \
++    java/lang/reflect/Method.java \
++    java/lang/reflect/Modifier.java \
++    java/lang/reflect/package-info.java \
++    java/lang/reflect/ParameterizedType.java \
++    java/lang/reflect/Proxy.java \
++    java/lang/reflect/ReflectAccess.java \
++    java/lang/reflect/ReflectPermission.java \
++    java/lang/reflect/Type.java \
++    java/lang/reflect/TypeVariable.java \
++    java/lang/reflect/UndeclaredThrowableException.java \
++    java/lang/reflect/WildcardType.java \
++    java/lang/ref/Finalizer.java \
++    java/lang/ref/FinalReference.java \
++    java/lang/ref/PhantomReference.java \
++    java/lang/ref/Reference.java \
++    java/lang/ref/ReferenceQueue.java \
++    java/lang/ref/SoftReference.java \
++    java/lang/ref/WeakReference.java \
++    java/lang/management/ClassLoadingMXBean.java \
++    java/lang/management/CompilationMXBean.java \
++    java/lang/management/GarbageCollectorMXBean.java \
++    java/lang/management/LockInfo.java \
++    java/lang/management/ManagementFactory.java \
++    java/lang/management/ManagementPermission.java \
++    java/lang/management/MemoryManagerMXBean.java \
++    java/lang/management/MemoryMXBean.java \
++    java/lang/management/MemoryNotificationInfo.java \
++    java/lang/management/MemoryPoolMXBean.java \
++    java/lang/management/MemoryType.java \
++    java/lang/management/MemoryUsage.java \
++    java/lang/management/MonitorInfo.java \
++    java/lang/management/OperatingSystemMXBean.java \
++    java/lang/management/RuntimeMXBean.java \
++    java/lang/management/ThreadInfo.java \
++    java/lang/management/ThreadMXBean.java \
++    java/lang/instrument/ClassDefinition.java \
++    java/lang/instrument/ClassFileTransformer.java \
++    java/lang/instrument/IllegalClassFormatException.java \
++    java/lang/instrument/Instrumentation.java \
++    java/lang/instrument/UnmodifiableClassException.java \
++    java/lang/annotation/AnnotationFormatError.java \
++    java/lang/annotation/Annotation.java \
++    java/lang/annotation/AnnotationTypeMismatchException.java \
++    java/lang/annotation/Documented.java \
++    java/lang/annotation/ElementType.java \
++    java/lang/annotation/IncompleteAnnotationException.java \
++    java/lang/annotation/Inherited.java \
++    java/lang/annotation/package-info.java \
++    java/lang/annotation/Retention.java \
++    java/lang/annotation/RetentionPolicy.java \
++    java/lang/annotation/Target.java \
++    java/io/IOError.java \
++    java/lang/Deprecated.java \
++    java/lang/Iterable.java \
++    java/util/RandomAccess.java \
++    java/lang/CharacterData00.java \
++    java/lang/CharacterData01.java \
++    java/lang/CharacterData02.java \
++    java/lang/CharacterData0E.java \
++    java/lang/CharacterDataLatin1.java \
++    java/lang/CharacterDataPrivateUse.java \
++    java/lang/CharacterDataUndefined.java \
+     java/lang/Object.java \
+     java/lang/Class.java \
+     java/lang/Thread.java \
+@@ -135,13 +209,6 @@
+     java/lang/Readable.java \
+     java/lang/Override.java \
+     java/lang/SuppressWarnings.java \
+-    java/lang/ref/Reference.java \
+-        java/lang/ref/SoftReference.java \
+-	java/lang/ref/WeakReference.java \
+-	java/lang/ref/FinalReference.java \
+-	java/lang/ref/PhantomReference.java \
+-    java/lang/ref/ReferenceQueue.java \
+-    java/lang/ref/Finalizer.java \
+     java/util/BitSet.java \
+     java/util/Calendar.java \
+         java/util/GregorianCalendar.java \


From jsumali at redhat.com  Wed Nov  7 08:23:49 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Wed, 07 Nov 2007 16:23:49 +0000
Subject: changeset in /hg/icedtea: 2007-10-31  Joshua Sumali  <jsumali@re...
Message-ID: <hg.101ceeb3c00e.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset 101ceeb3c00e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=101ceeb3c00e
description:
	2007-10-31  Joshua Sumali  <jsumali at redhat.com>

	        * patches/icedtea-sunsrc.patch: Fixed patch to include some missing
	        sources.

diffstat:

2 files changed, 11 insertions(+), 7 deletions(-)
ChangeLog                    |    5 +++++
patches/icedtea-sunsrc.patch |   13 ++++++-------

diffs (41 lines):

diff -r f5f4a0462f74 -r 101ceeb3c00e ChangeLog
--- a/ChangeLog	Tue Oct 30 13:18:22 2007 -0400
+++ b/ChangeLog	Wed Oct 31 16:43:46 2007 -0400
@@ -1,3 +1,8 @@ 2007-10-30  Lillian Angel  <langel at redha
+2007-10-31  Joshua Sumali  <jsumali at redhat.com>
+
+	* patches/icedtea-sunsrc.patch: Fixed patch to include some missing
+	sources.
+
 2007-10-30  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-bytecodeInterpreterWithChecks.patch: New patch to
diff -r f5f4a0462f74 -r 101ceeb3c00e patches/icedtea-sunsrc.patch
--- a/patches/icedtea-sunsrc.patch	Tue Oct 30 13:18:22 2007 -0400
+++ b/patches/icedtea-sunsrc.patch	Wed Oct 31 16:43:46 2007 -0400
@@ -1,5 +1,5 @@
---- openjdk.orig/j2se/make/common/Release.gmk	2007-10-17 16:06:30.000000000 -0400
-+++ openjdk/j2se/make/common/Release.gmk	2007-10-18 14:47:55.000000000 -0400
+--- openjdk.orig/j2se/make/common/Release.gmk	2007-10-26 16:46:41.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-28 18:28:19.000000000 -0400
 @@ -625,6 +625,10 @@
  	    $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
  		-o  $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
@@ -11,13 +11,12 @@
  	@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
  
  # Create the rt.jar file list & non-class files list
-@@ -1002,6 +1006,9 @@
+@@ -1001,6 +1005,8 @@
+ 	    ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
  	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
  	  fi; \
++	  (($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/sun_sources_list ) \
++	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -)) > /dev/null 2>&1 ; \
  	done
-+	($(CD) $(SHARE_SRC)/classes && $(TAR) cf - -T \
-+	    $(ABS_TEMPDIR)/sun_sources_list ) \
-+	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -);
    else
  	for d in $(SOURCE_DIRS); do \
- 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \


From gbenson at redhat.com  Wed Nov  7 08:23:50 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-01  Gary Benson  <gbenson@redh...
Message-ID: <hg.fe120a194ddf.1194452629.-6899778133799504387@icedtea.classpath.org>

changeset fe120a194ddf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fe120a194ddf
description:
	2007-11-01  Gary Benson  <gbenson at redhat.com>

		* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
		* configure: Regenerated.

diffstat:

3 files changed, 5 insertions(+), 8 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |    4 ----
configure    |    4 ----

diffs (40 lines):

diff -r 101ceeb3c00e -r fe120a194ddf ChangeLog
--- a/ChangeLog	Wed Oct 31 16:43:46 2007 -0400
+++ b/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
@@ -1,3 +1,8 @@ 2007-10-31  Joshua Sumali  <jsumali at redh
+2007-11-01  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
+	* configure: Regenerated.
+
 2007-10-31  Joshua Sumali  <jsumali at redhat.com>
 
 	* patches/icedtea-sunsrc.patch: Fixed patch to include some missing
diff -r 101ceeb3c00e -r fe120a194ddf acinclude.m4
--- a/acinclude.m4	Wed Oct 31 16:43:46 2007 -0400
+++ b/acinclude.m4	Thu Nov 01 11:02:51 2007 -0400
@@ -17,10 +17,6 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
diff -r 101ceeb3c00e -r fe120a194ddf configure
--- a/configure	Wed Oct 31 16:43:46 2007 -0400
+++ b/configure	Thu Nov 01 11:02:51 2007 -0400
@@ -4844,10 +4844,6 @@ fi
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       ;;
-    s390*-*-*)
-      BUILD_ARCH_DIR=s390
-      INSTALL_ARCH_DIR=s390
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR


From langel at redhat.com  Wed Nov  7 08:23:50 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Lillian Angel  <langel@red...
Message-ID: <hg.329dde099a8b.1194452630.-6899778133799504387@icedtea.classpath.org>

changeset 329dde099a8b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=329dde099a8b
description:
	2007-11-02  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-libraries.patch: Added patch to remove conflicting
	        definition of uLong. This fixes the build on 64-bit.

diffstat:

2 files changed, 73 insertions(+), 44 deletions(-)
ChangeLog                       |    5 +
patches/icedtea-libraries.patch |  112 +++++++++++++++++++++++----------------

diffs (138 lines):

diff -r fe120a194ddf -r 329dde099a8b ChangeLog
--- a/ChangeLog	Thu Nov 01 11:02:51 2007 -0400
+++ b/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
@@ -1,3 +1,8 @@ 2007-11-01  Gary Benson  <gbenson at redhat
+2007-11-02  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-libraries.patch: Added patch to remove conflicting
+	definition of uLong. This fixes the build on 64-bit.
+
 2007-11-01  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4 (SET_ARCH_DIRS): Remove s390.
diff -r fe120a194ddf -r 329dde099a8b patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Thu Nov 01 11:02:51 2007 -0400
+++ b/patches/icedtea-libraries.patch	Fri Nov 02 15:59:43 2007 -0400
@@ -164,50 +164,6 @@
  
  #
  # Library to compile.
---- openjdk.old/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
-+++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-22 15:08:03.000000000 -0400
-@@ -64,20 +64,18 @@
-   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
- 
-   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
--	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
--
--  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--  OTHER_CXXFLAGS += $(ZINCLUDE)
--  LDDFLAGS += $(ZIPOBJS)
-+            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
-+            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
-+
-+  OTHER_LDLIBS += -lz
- else
-   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
-   OTHER_LDLIBS += $(JVMLIB)
-@@ -101,7 +99,7 @@
-   COMPILER_WARNINGS_FATAL=false
- else
-   LDOUTPUT = -o #Have a space 
--  LDDFLAGS += -lc
-+  LDDFLAGS += -lz -lc
-   OTHER_LDLIBS  += $(LIBCXX)
- # setup the list of libraries to link in...
- ifeq ($(PLATFORM), linux)
 --- openjdk.old/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-12 04:03:46.000000000 -0400
 +++ openjdk/j2se/src/share/native/java/util/zip/Inflater.c	2007-10-22 15:21:32.000000000 -0400
 @@ -35,7 +35,7 @@
@@ -25514,3 +25470,71 @@ diff -ruN openjdk.old/j2se/src/share/nat
      }
  
      if (scale != NULL) {
+--- oldopenjdk/j2se/make/com/sun/java/pack/Makefile	2007-10-12 03:54:04.000000000 -0400
++++ openjdk/j2se/make/com/sun/java/pack/Makefile	2007-11-02 14:59:13.000000000 -0400
+@@ -64,23 +64,21 @@
+   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+ 
+   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+-	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+-
+-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-  OTHER_CXXFLAGS += $(ZINCLUDE)
+-  LDDFLAGS += $(ZIPOBJS)
++            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
++            $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
++
++  OTHER_LDLIBS += -lz
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+-  OTHER_LDLIBS += $(JVMLIB)
++  OTHER_LDLIBS += -lz $(JVMLIB)
+ endif
+ 
+ CXXFLAGS_DBG += -DFULL
+@@ -101,12 +99,12 @@
+   COMPILER_WARNINGS_FATAL=false
+ else
+   LDOUTPUT = -o #Have a space 
+-  LDDFLAGS += -lc
++  LDDFLAGS += -lz -lc
+   OTHER_LDLIBS  += $(LIBCXX)
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
+ ifeq ("$(CC_VER_MAJOR)", "3")
+-  OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
++  OTHER_LDLIBS  += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ endif
+ endif #LINUX
+ endif #PLATFORM
+--- oldopenjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-10-12 04:03:44.000000000 -0400
++++ openjdk/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h	2007-11-02 15:48:45.000000000 -0400
+@@ -87,11 +87,7 @@
+ // bytes and byte arrays
+ 
+ typedef unsigned int uint;
+-#ifdef _LP64
+-typedef unsigned int uLong; // Historical zlib, should be 32-bit.
+-#else
+ typedef unsigned long uLong;
+-#endif
+ #ifdef _MSC_VER 
+ typedef LONGLONG 	jlong;
+ typedef DWORDLONG 	julong;


From jsumali at redhat.com  Wed Nov  7 08:23:50 2007
From: jsumali at redhat.com (Joshua Sumali)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-02  Joshua Sumali  <jsumali@re...
Message-ID: <hg.20436247b1ac.1194452630.-6899778133799504387@icedtea.classpath.org>

changeset 20436247b1ac in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=20436247b1ac
description:
	2007-11-02  Joshua Sumali  <jsumali at redhat.com>

	        * rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
	        now implemented.
	        * rt/com/sun/media/sound/JDK13Services.java: Likewise.
	        * rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDevice.java: Likewise.
	        * rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
	        * rt/com/sun/media/sound/MidiUtils.java: Likewise.
	        * rt/com/sun/media/sound/PortMixer.java: Likewise.
	        * rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
	        * rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.

diffstat:

11 files changed, 14 insertions(+), 533 deletions(-)
ChangeLog                                           |   14 +++
rt/com/sun/media/sound/DataPusher.java              |   62 -----------------
rt/com/sun/media/sound/JDK13Services.java           |   62 -----------------
rt/com/sun/media/sound/JavaSoundAudioClip.java      |   68 -------------------
rt/com/sun/media/sound/MidiInDevice.java            |   45 ------------
rt/com/sun/media/sound/MidiInDeviceProvider.java    |   45 ------------
rt/com/sun/media/sound/MidiOutDeviceProvider.java   |   45 ------------
rt/com/sun/media/sound/MidiUtils.java               |   59 ----------------
rt/com/sun/media/sound/PortMixer.java               |   45 ------------
rt/com/sun/media/sound/PortMixerProvider.java       |   45 ------------
rt/com/sun/media/sound/ReferenceCountingDevice.java |   57 ---------------

diffs (truncated from 594 to 500 lines):

diff -r 329dde099a8b -r 20436247b1ac ChangeLog
--- a/ChangeLog	Fri Nov 02 15:59:43 2007 -0400
+++ b/ChangeLog	Fri Nov 02 12:53:15 2007 -0400
@@ -1,3 +1,17 @@ 2007-11-02  Lillian Angel  <langel at redha
+2007-11-02  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
+	now implemented.
+	* rt/com/sun/media/sound/JDK13Services.java: Likewise.
+	* rt/com/sun/media/sound/JavaSoundAudioClip.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDevice.java: Likewise.
+	* rt/com/sun/media/sound/MidiInDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiOutDeviceProvider.java: Likewise.
+	* rt/com/sun/media/sound/MidiUtils.java: Likewise.
+	* rt/com/sun/media/sound/PortMixer.java: Likewise.
+	* rt/com/sun/media/sound/PortMixerProvider.java: Likewise.
+	* rt/com/sun/media/sound/ReferenceCountingDevice.java: Likewise.
+
 2007-11-02  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-libraries.patch: Added patch to remove conflicting
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/DataPusher.java
--- a/rt/com/sun/media/sound/DataPusher.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* DataPusher.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.SourceDataLine;
-
-public class DataPusher {
-
-	public DataPusher(SourceDataLine sourcedataline, AudioInputStream as) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void start() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/JDK13Services.java
--- a/rt/com/sun/media/sound/JDK13Services.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* JDK13Services.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import java.util.List;
-
-public class JDK13Services {
-
-	public static String getDefaultProviderClassName(Class deviceClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static String getDefaultInstanceName(Class deviceClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static List getProviders(Class providerClass) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/JavaSoundAudioClip.java
--- a/rt/com/sun/media/sound/JavaSoundAudioClip.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/* JavaSoundAudioClip.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import java.applet.AudioClip;
-import java.io.InputStream;
-
-public class JavaSoundAudioClip implements AudioClip {
-
-	public JavaSoundAudioClip(InputStream in) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void loop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void play() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/MidiInDevice.java
--- a/rt/com/sun/media/sound/MidiInDevice.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiInDevice.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class MidiInDevice
-{
-
-}
-
-
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/MidiInDeviceProvider.java
--- a/rt/com/sun/media/sound/MidiInDeviceProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiInDeviceProvider.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class MidiInDeviceProvider
-{
-
-}
-
-
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/MidiOutDeviceProvider.java
--- a/rt/com/sun/media/sound/MidiOutDeviceProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* MidiOutDeviceProvider.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class MidiOutDeviceProvider
-{
-
-}
-
-
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/MidiUtils.java
--- a/rt/com/sun/media/sound/MidiUtils.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/* MidiUtils.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-import javax.sound.midi.MidiMessage;
-import javax.sound.midi.Sequence;
-
-public class MidiUtils {
-
-	public static final byte META_END_OF_TRACK_TYPE = 0;
-
-	public static long tick2microsecond(Sequence sequence, long tickLength, Object object) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static boolean isMetaEndOfTrack(MidiMessage message) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/PortMixer.java
--- a/rt/com/sun/media/sound/PortMixer.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* PortMixer.java -- stub file.
-   Copyright (C) 2007 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 com.sun.media.sound;
-
-public class PortMixer
-{
-
-}
-
-
diff -r 329dde099a8b -r 20436247b1ac rt/com/sun/media/sound/PortMixerProvider.java
--- a/rt/com/sun/media/sound/PortMixerProvider.java	Fri Nov 02 15:59:43 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* PortMixerProvider.java -- stub file.
-   Copyright (C) 2007 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


From gbenson at redhat.com  Wed Nov  7 08:23:50 2007
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Gary Benson  <gbenson@redh...
Message-ID: <hg.b99eec07b171.1194452630.-6899778133799504387@icedtea.classpath.org>

changeset b99eec07b171 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b99eec07b171
description:
	2007-11-07  Gary Benson  <gbenson at redhat.com>

		* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
		* configure: Regenerated.

diffstat:

3 files changed, 5 insertions(+), 16 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |    8 --------
configure    |    8 --------

diffs (48 lines):

diff -r 20436247b1ac -r b99eec07b171 ChangeLog
--- a/ChangeLog	Fri Nov 02 12:53:15 2007 -0400
+++ b/ChangeLog	Wed Nov 07 11:56:25 2007 +0000
@@ -1,3 +1,8 @@ 2007-11-02  Joshua Sumali  <jsumali at redh
+2007-11-07  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
+	* configure: Regenerated.
+
 2007-11-02  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/com/sun/media/sound/DataPusher.java: Removed stub since this is
diff -r 20436247b1ac -r b99eec07b171 acinclude.m4
--- a/acinclude.m4	Fri Nov 02 12:53:15 2007 -0400
+++ b/acinclude.m4	Wed Nov 07 11:56:25 2007 +0000
@@ -8,14 +8,6 @@ AC_DEFUN([SET_ARCH_DIRS],
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
-      ;;
-    powerpc-*-*)
-      BUILD_ARCH_DIR=ppc
-      INSTALL_ARCH_DIR=ppc
-      ;;
-    powerpc64-*-*)
-      BUILD_ARCH_DIR=ppc64
-      INSTALL_ARCH_DIR=ppc64
       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
diff -r 20436247b1ac -r b99eec07b171 configure
--- a/configure	Fri Nov 02 12:53:15 2007 -0400
+++ b/configure	Wed Nov 07 11:56:25 2007 +0000
@@ -4836,14 +4836,6 @@ fi
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       ;;
-    powerpc-*-*)
-      BUILD_ARCH_DIR=ppc
-      INSTALL_ARCH_DIR=ppc
-      ;;
-    powerpc64-*-*)
-      BUILD_ARCH_DIR=ppc64
-      INSTALL_ARCH_DIR=ppc64
-      ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR


From twisti at complang.tuwien.ac.at  Wed Nov  7 08:23:50 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Wed, 07 Nov 2007 16:23:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Christian Thalinger  <twis...
Message-ID: <hg.7ea917aa33ff.1194452630.-6899778133799504387@icedtea.classpath.org>

changeset 7ea917aa33ff in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7ea917aa33ff
description:
	2007-11-07  Christian Thalinger  <twisti at complang.tuwien.ac.at>

		* Makefile.in: Regenerated after transplanting.

diffstat:

2 files changed, 11 insertions(+), 4 deletions(-)
ChangeLog   |    4 ++++
Makefile.in |   11 +++++++----

diffs (39 lines):

diff -r b99eec07b171 -r 7ea917aa33ff ChangeLog
--- a/ChangeLog	Wed Nov 07 11:56:25 2007 +0000
+++ b/ChangeLog	Wed Nov 07 17:23:19 2007 +0100
@@ -1,3 +1,7 @@ 2007-11-07  Gary Benson  <gbenson at redhat
+2007-11-07  Christan Thalinger  <twisti at complang.tuwien.ac.at>
+
+	* Makefile.in: Regenerated after transplanting.
+
 2007-11-07  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
diff -r b99eec07b171 -r 7ea917aa33ff Makefile.in
--- a/Makefile.in	Wed Nov 07 11:56:25 2007 +0000
+++ b/Makefile.in	Wed Nov 07 17:23:19 2007 +0100
@@ -252,9 +252,9 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-paths.patch patches/icedtea-debuginfo.patch \
 	patches/icedtea-ssl.patch \
 	patches/icedtea-license-headers.patch \
-	patches/icedtea-libpng.patch patches/icedtea-plugin.patch \
-	patches/icedtea-rmi_amd64.patch patches/icedtea-tools.patch \
-	patches/icedtea-certbundle.patch patches/icedtea-demos.patch \
+	patches/icedtea-plugin.patch patches/icedtea-rmi_amd64.patch \
+	patches/icedtea-tools.patch patches/icedtea-certbundle.patch \
+	patches/icedtea-demos.patch \
 	patches/icedtea-use-system-tzdata.patch \
 	patches/icedtea-headers.patch patches/icedtea-ant.patch \
 	patches/icedtea-gcc-suffix.patch \
@@ -262,7 +262,10 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-float-double-trailing-zeros.patch \
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch patches/icedtea-xjc.patch \
-	$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_2)
+	patches/icedtea-sunsrc.patch patches/icedtea-libraries.patch \
+	patches/icedtea-bytecodeInterpreterWithChecks.patch \
+	patches/icedtea-javafiles.patch $(FAST_BUILD_PATCH) \
+	$(DISTRIBUTION_PATCHES) $(am__append_2)
 
 # Bootstrap Directory Targets
 # ===========================


From langel at redhat.com  Wed Nov  7 10:59:11 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 18:59:11 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Lillian Angel  <langel@red...
Message-ID: <hg.c3357ed52323.1194461951.-6899778133799504387@icedtea.classpath.org>

changeset c3357ed52323 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c3357ed52323
description:
	2007-11-07  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Re-added ecj targets, added new patches to the list and
	        updated tools.jar.
	        * Makefile.in: Regenerated.
	        * aclocal.m4: Likewise.
	        * configure: Likewise.
	        * configure.ac: Re-added --with-icedtea and --with-icedtea-home
	        options. Also, added --with-gcj-home to specify where gcj is
	        installed- the default is /usr/lib/jvm/java-gcj/.
	        * generated/*.java: Regenerated and added several new sources.
	        * generated/fontconfig/*.bfc: Added generated font files.
	        * javac.in: Re-added. Added support to ignore Werror flags.
	        * javap.in: Re-added.
	        * patches/icedtea-javafiles: Updated to add missing sources to
	        Makefiles.
	        * patches/icedtea-sunrc.patch: Updated.
	        * patches/icedtea-corba.patch: New patch.
	        * patches/icedtea-ecj.patch: New patch to make building with ecj
	        possible.
	        * tools-copy/tools-corba-copy-files.txt: List of corba sources to
	        copy.
	        * tools-copy/tools-j2se-copy-files.txt: List of j2se soures to copy.
	        * tools-copy/tools-jaxws-copy-files.txt: List of jaxws sources to
	        copy.
	        * tools-copy/tools-langtools-copy-files.txt: List of langtools to
	        copy.
	        * patches/icedtea-xjc.patch: Removed. Has been combined with sunrc
	        patch.
	        * tools-copy-files.txt: Removed.

diffstat:

371 files changed, 18936 insertions(+), 265 deletions(-)
.hgignore                                                                     |   30 
ChangeLog                                                                     |   31 
Makefile.am                                                                   |  301 +
Makefile.in                                                                   |  319 +
aclocal.m4                                                                    |    2 
configure                                                                     | 1928 +++++++++-
configure.ac                                                                  |   69 
generated/com/sun/accessibility/internal/resources/accessibility_en.java      |  107 
generated/com/sun/tools/jdi/JDWP.java                                         |   22 
generated/java/lang/CharacterData00.java                                      |    4 
generated/java/lang/CharacterData01.java                                      |    4 
generated/java/lang/CharacterData02.java                                      |    4 
generated/java/lang/CharacterData0E.java                                      |    4 
generated/java/lang/CharacterDataLatin1.java                                  |    4 
generated/java/nio/DirectByteBuffer.java                                      |    1 
generated/java/nio/DirectByteBufferR.java                                     |    1 
generated/java/nio/DirectCharBufferRS.java                                    |    1 
generated/java/nio/DirectCharBufferRU.java                                    |    1 
generated/java/nio/DirectCharBufferS.java                                     |    1 
generated/java/nio/DirectCharBufferU.java                                     |    1 
generated/java/nio/DirectDoubleBufferRS.java                                  |    1 
generated/java/nio/DirectDoubleBufferRU.java                                  |    1 
generated/java/nio/DirectDoubleBufferS.java                                   |    1 
generated/java/nio/DirectDoubleBufferU.java                                   |    1 
generated/java/nio/DirectFloatBufferRS.java                                   |    1 
generated/java/nio/DirectFloatBufferRU.java                                   |    1 
generated/java/nio/DirectFloatBufferS.java                                    |    1 
generated/java/nio/DirectFloatBufferU.java                                    |    1 
generated/java/nio/DirectIntBufferRS.java                                     |    1 
generated/java/nio/DirectIntBufferRU.java                                     |    1 
generated/java/nio/DirectIntBufferS.java                                      |    1 
generated/java/nio/DirectIntBufferU.java                                      |    1 
generated/java/nio/DirectLongBufferRS.java                                    |    1 
generated/java/nio/DirectLongBufferRU.java                                    |    1 
generated/java/nio/DirectLongBufferS.java                                     |    1 
generated/java/nio/DirectLongBufferU.java                                     |    1 
generated/java/nio/DirectShortBufferRS.java                                   |    1 
generated/java/nio/DirectShortBufferRU.java                                   |    1 
generated/java/nio/DirectShortBufferS.java                                    |    1 
generated/java/nio/DirectShortBufferU.java                                    |    1 
generated/java/nio/HeapByteBuffer.java                                        |    1 
generated/java/nio/HeapByteBufferR.java                                       |    1 
generated/java/nio/HeapCharBuffer.java                                        |    1 
generated/java/nio/HeapCharBufferR.java                                       |    1 
generated/java/nio/HeapDoubleBuffer.java                                      |    1 
generated/java/nio/HeapDoubleBufferR.java                                     |    1 
generated/java/nio/HeapFloatBuffer.java                                       |    1 
generated/java/nio/HeapFloatBufferR.java                                      |    1 
generated/java/nio/HeapIntBuffer.java                                         |    1 
generated/java/nio/HeapIntBufferR.java                                        |    1 
generated/java/nio/HeapLongBuffer.java                                        |    1 
generated/java/nio/HeapLongBufferR.java                                       |    1 
generated/java/nio/HeapShortBuffer.java                                       |    1 
generated/java/nio/HeapShortBufferR.java                                      |    1 
generated/org/omg/PortableServer/AdapterActivator.java                        |    2 
generated/org/omg/PortableServer/AdapterActivatorOperations.java              |    2 
generated/org/omg/PortableServer/Current.java                                 |    2 
generated/org/omg/PortableServer/CurrentOperations.java                       |    2 
generated/org/omg/PortableServer/CurrentPackage/NoContext.java                |    2 
generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java          |    2 
generated/org/omg/PortableServer/ForwardRequest.java                          |    2 
generated/org/omg/PortableServer/ForwardRequestHelper.java                    |    2 
generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java                 |    2 
generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java                 |    2 
generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java           |    2 
generated/org/omg/PortableServer/IdAssignmentPolicy.java                      |    2 
generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java            |    2 
generated/org/omg/PortableServer/IdAssignmentPolicyValue.java                 |    2 
generated/org/omg/PortableServer/IdUniquenessPolicy.java                      |    2 
generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java            |    2 
generated/org/omg/PortableServer/IdUniquenessPolicyValue.java                 |    2 
generated/org/omg/PortableServer/ImplicitActivationPolicy.java                |    2 
generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java      |    2 
generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java           |    2 
generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java                      |    2 
generated/org/omg/PortableServer/LifespanPolicy.java                          |    2 
generated/org/omg/PortableServer/LifespanPolicyOperations.java                |    2 
generated/org/omg/PortableServer/LifespanPolicyValue.java                     |    2 
generated/org/omg/PortableServer/POA.java                                     |    2 
generated/org/omg/PortableServer/POAManager.java                              |    2 
generated/org/omg/PortableServer/POAManagerOperations.java                    |    2 
generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java       |    2 
generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java |    2 
generated/org/omg/PortableServer/POAManagerPackage/State.java                 |    2 
generated/org/omg/PortableServer/POAOperations.java                           |    2 
generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java         |    2 
generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java   |    2 
generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java           |    2 
generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java     |    2 
generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java                |    2 
generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java          |    2 
generated/org/omg/PortableServer/POAPackage/NoServant.java                    |    2 
generated/org/omg/PortableServer/POAPackage/NoServantHelper.java              |    2 
generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java          |    2 
generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java    |    2 
generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java              |    2 
generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java        |    2 
generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java         |    2 
generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java   |    2 
generated/org/omg/PortableServer/POAPackage/ServantNotActive.java             |    2 
generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java       |    2 
generated/org/omg/PortableServer/POAPackage/WrongAdapter.java                 |    2 
generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java           |    2 
generated/org/omg/PortableServer/POAPackage/WrongPolicy.java                  |    2 
generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java            |    2 
generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java            |    2 
generated/org/omg/PortableServer/RequestProcessingPolicy.java                 |    2 
generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java       |    2 
generated/org/omg/PortableServer/RequestProcessingPolicyValue.java            |    2 
generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java             |    2 
generated/org/omg/PortableServer/ServantActivator.java                        |    2 
generated/org/omg/PortableServer/ServantActivatorHelper.java                  |    2 
generated/org/omg/PortableServer/ServantActivatorOperations.java              |    2 
generated/org/omg/PortableServer/ServantActivatorPOA.java                     |    2 
generated/org/omg/PortableServer/ServantLocator.java                          |    2 
generated/org/omg/PortableServer/ServantLocatorHelper.java                    |    2 
generated/org/omg/PortableServer/ServantLocatorOperations.java                |    2 
generated/org/omg/PortableServer/ServantLocatorPOA.java                       |    2 
generated/org/omg/PortableServer/ServantManager.java                          |    2 
generated/org/omg/PortableServer/ServantManagerOperations.java                |    2 
generated/org/omg/PortableServer/ServantRetentionPolicy.java                  |    2 
generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java        |    2 
generated/org/omg/PortableServer/ServantRetentionPolicyValue.java             |    2 
generated/org/omg/PortableServer/THREAD_POLICY_ID.java                        |    2 
generated/org/omg/PortableServer/ThreadPolicy.java                            |    2 
generated/org/omg/PortableServer/ThreadPolicyOperations.java                  |    2 
generated/org/omg/PortableServer/ThreadPolicyValue.java                       |    2 
generated/org/omg/PortableServer/_ServantActivatorStub.java                   |    2 
generated/org/omg/PortableServer/_ServantLocatorStub.java                     |    2 
generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java                         |    3 
generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java                         |    3 
generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java                         |    3 
generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java                         |    3 
generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java                         |    3 
generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java                         |    3 
generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java                         |    3 
generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java                         |    3 
generated/sun/awt/X11/generator/sizer.32.c                                    | 1009 +++++
generated/sun/awt/X11/generator/sizes.32                                      |  789 ++++
generated/sun/nio/cs/StandardCharsets.java                                    |   25 
generated/sun/util/resources/CalendarData.java                                |   12 
generated/sun/util/resources/CalendarData_ar.java                             |   12 
generated/sun/util/resources/CalendarData_be.java                             |   10 
generated/sun/util/resources/CalendarData_bg.java                             |   10 
generated/sun/util/resources/CalendarData_ca.java                             |   12 
generated/sun/util/resources/CalendarData_cs.java                             |   12 
generated/sun/util/resources/CalendarData_da.java                             |   12 
generated/sun/util/resources/CalendarData_de.java                             |   12 
generated/sun/util/resources/CalendarData_el.java                             |   12 
generated/sun/util/resources/CalendarData_el_CY.java                          |   11 
generated/sun/util/resources/CalendarData_en.java                             |   10 
generated/sun/util/resources/CalendarData_en_GB.java                          |   12 
generated/sun/util/resources/CalendarData_en_IE.java                          |   12 
generated/sun/util/resources/CalendarData_en_MT.java                          |   11 
generated/sun/util/resources/CalendarData_es.java                             |   12 
generated/sun/util/resources/CalendarData_es_ES.java                          |   12 
generated/sun/util/resources/CalendarData_es_US.java                          |   11 
generated/sun/util/resources/CalendarData_et.java                             |   12 
generated/sun/util/resources/CalendarData_fi.java                             |   12 
generated/sun/util/resources/CalendarData_fr.java                             |   12 
generated/sun/util/resources/CalendarData_fr_CA.java                          |   12 
generated/sun/util/resources/CalendarData_hi.java                             |   10 
generated/sun/util/resources/CalendarData_hr.java                             |   11 
generated/sun/util/resources/CalendarData_hu.java                             |   12 
generated/sun/util/resources/CalendarData_in_ID.java                          |   11 
generated/sun/util/resources/CalendarData_is.java                             |   12 
generated/sun/util/resources/CalendarData_it.java                             |   12 
generated/sun/util/resources/CalendarData_iw.java                             |   10 
generated/sun/util/resources/CalendarData_ja.java                             |   10 
generated/sun/util/resources/CalendarData_ko.java                             |   10 
generated/sun/util/resources/CalendarData_lt.java                             |   12 
generated/sun/util/resources/CalendarData_lv.java                             |   10 
generated/sun/util/resources/CalendarData_mk.java                             |   10 
generated/sun/util/resources/CalendarData_ms_MY.java                          |   11 
generated/sun/util/resources/CalendarData_mt.java                             |   11 
generated/sun/util/resources/CalendarData_mt_MT.java                          |   11 
generated/sun/util/resources/CalendarData_nl.java                             |   12 
generated/sun/util/resources/CalendarData_no.java                             |   12 
generated/sun/util/resources/CalendarData_pl.java                             |   12 
generated/sun/util/resources/CalendarData_pt.java                             |   12 
generated/sun/util/resources/CalendarData_pt_PT.java                          |   12 
generated/sun/util/resources/CalendarData_ro.java                             |   10 
generated/sun/util/resources/CalendarData_ru.java                             |   12 
generated/sun/util/resources/CalendarData_sk.java                             |   12 
generated/sun/util/resources/CalendarData_sl.java                             |   10 
generated/sun/util/resources/CalendarData_sq.java                             |   10 
generated/sun/util/resources/CalendarData_sr.java                             |   11 
generated/sun/util/resources/CalendarData_sv.java                             |   12 
generated/sun/util/resources/CalendarData_th.java                             |   10 
generated/sun/util/resources/CalendarData_tr.java                             |   12 
generated/sun/util/resources/CalendarData_uk.java                             |   12 
generated/sun/util/resources/CalendarData_vi.java                             |   10 
generated/sun/util/resources/CalendarData_zh.java                             |   10 
generated/sun/util/resources/CurrencyNames.java                               |  431 ++
generated/sun/util/resources/CurrencyNames_ar_AE.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_BH.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_DZ.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_EG.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_IQ.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_JO.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_KW.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_LB.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_LY.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_MA.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_OM.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_QA.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_SA.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_SD.java                         |   12 
generated/sun/util/resources/CurrencyNames_ar_SY.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_TN.java                         |   11 
generated/sun/util/resources/CurrencyNames_ar_YE.java                         |   11 
generated/sun/util/resources/CurrencyNames_be_BY.java                         |   11 
generated/sun/util/resources/CurrencyNames_bg_BG.java                         |   11 
generated/sun/util/resources/CurrencyNames_ca_ES.java                         |   12 
generated/sun/util/resources/CurrencyNames_cs_CZ.java                         |   11 
generated/sun/util/resources/CurrencyNames_da_DK.java                         |   12 
generated/sun/util/resources/CurrencyNames_de.java                            |  205 +
generated/sun/util/resources/CurrencyNames_de_AT.java                         |   12 
generated/sun/util/resources/CurrencyNames_de_CH.java                         |   11 
generated/sun/util/resources/CurrencyNames_de_DE.java                         |   12 
generated/sun/util/resources/CurrencyNames_de_GR.java                         |   12 
generated/sun/util/resources/CurrencyNames_de_LU.java                         |   12 
generated/sun/util/resources/CurrencyNames_el_CY.java                         |   12 
generated/sun/util/resources/CurrencyNames_el_GR.java                         |   12 
generated/sun/util/resources/CurrencyNames_en_AU.java                         |   11 
generated/sun/util/resources/CurrencyNames_en_CA.java                         |   11 
generated/sun/util/resources/CurrencyNames_en_GB.java                         |   12 
generated/sun/util/resources/CurrencyNames_en_IE.java                         |   12 
generated/sun/util/resources/CurrencyNames_en_IN.java                         |   11 
generated/sun/util/resources/CurrencyNames_en_MT.java                         |   12 
generated/sun/util/resources/CurrencyNames_en_NZ.java                         |   11 
generated/sun/util/resources/CurrencyNames_en_PH.java                         |   11 
generated/sun/util/resources/CurrencyNames_en_SG.java                         |   11 
generated/sun/util/resources/CurrencyNames_en_US.java                         |   11 
generated/sun/util/resources/CurrencyNames_en_ZA.java                         |   11 
generated/sun/util/resources/CurrencyNames_es.java                            |  214 +
generated/sun/util/resources/CurrencyNames_es_AR.java                         |   12 
generated/sun/util/resources/CurrencyNames_es_BO.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_CL.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_CO.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_CR.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_DO.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_EC.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_ES.java                         |   12 
generated/sun/util/resources/CurrencyNames_es_GT.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_HN.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_MX.java                         |   12 
generated/sun/util/resources/CurrencyNames_es_NI.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_PA.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_PE.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_PR.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_PY.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_SV.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_US.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_UY.java                         |   11 
generated/sun/util/resources/CurrencyNames_es_VE.java                         |   12 
generated/sun/util/resources/CurrencyNames_et_EE.java                         |   11 
generated/sun/util/resources/CurrencyNames_fi_FI.java                         |   12 
generated/sun/util/resources/CurrencyNames_fr.java                            |  209 +
generated/sun/util/resources/CurrencyNames_fr_BE.java                         |   12 
generated/sun/util/resources/CurrencyNames_fr_CA.java                         |   11 
generated/sun/util/resources/CurrencyNames_fr_CH.java                         |   11 
generated/sun/util/resources/CurrencyNames_fr_FR.java                         |   12 
generated/sun/util/resources/CurrencyNames_fr_LU.java                         |   12 
generated/sun/util/resources/CurrencyNames_ga_IE.java                         |   11 
generated/sun/util/resources/CurrencyNames_hi_IN.java                         |   11 
generated/sun/util/resources/CurrencyNames_hr_HR.java                         |   11 
generated/sun/util/resources/CurrencyNames_hu_HU.java                         |   11 
generated/sun/util/resources/CurrencyNames_in_ID.java                         |   11 
generated/sun/util/resources/CurrencyNames_is_IS.java                         |   11 
generated/sun/util/resources/CurrencyNames_it.java                            |  207 +
generated/sun/util/resources/CurrencyNames_it_CH.java                         |   11 
generated/sun/util/resources/CurrencyNames_it_IT.java                         |   12 
generated/sun/util/resources/CurrencyNames_iw_IL.java                         |   11 
generated/sun/util/resources/CurrencyNames_ja.java                            |  206 +
generated/sun/util/resources/CurrencyNames_ja_JP.java                         |   11 
generated/sun/util/resources/CurrencyNames_ko.java                            |  193 +
generated/sun/util/resources/CurrencyNames_ko_KR.java                         |   11 
generated/sun/util/resources/CurrencyNames_lt_LT.java                         |   11 
generated/sun/util/resources/CurrencyNames_lv_LV.java                         |   11 
generated/sun/util/resources/CurrencyNames_mk_MK.java                         |   11 
generated/sun/util/resources/CurrencyNames_ms_MY.java                         |   11 
generated/sun/util/resources/CurrencyNames_mt_MT.java                         |   12 
generated/sun/util/resources/CurrencyNames_nl_BE.java                         |   12 
generated/sun/util/resources/CurrencyNames_nl_NL.java                         |   12 
generated/sun/util/resources/CurrencyNames_no_NO.java                         |   11 
generated/sun/util/resources/CurrencyNames_pl_PL.java                         |   11 
generated/sun/util/resources/CurrencyNames_pt_BR.java                         |   12 
generated/sun/util/resources/CurrencyNames_pt_PT.java                         |   12 
generated/sun/util/resources/CurrencyNames_ro_RO.java                         |   12 
generated/sun/util/resources/CurrencyNames_ru_RU.java                         |   11 
generated/sun/util/resources/CurrencyNames_sk_SK.java                         |   11 
generated/sun/util/resources/CurrencyNames_sl_SI.java                         |   12 
generated/sun/util/resources/CurrencyNames_sq_AL.java                         |   11 
generated/sun/util/resources/CurrencyNames_sr_BA.java                         |   12 
generated/sun/util/resources/CurrencyNames_sr_CS.java                         |   11 
generated/sun/util/resources/CurrencyNames_sr_ME.java                         |   11 
generated/sun/util/resources/CurrencyNames_sv.java                            |  198 +
generated/sun/util/resources/CurrencyNames_sv_SE.java                         |   12 
generated/sun/util/resources/CurrencyNames_th_TH.java                         |   11 
generated/sun/util/resources/CurrencyNames_tr_TR.java                         |   12 
generated/sun/util/resources/CurrencyNames_uk_UA.java                         |   11 
generated/sun/util/resources/CurrencyNames_vi_VN.java                         |   11 
generated/sun/util/resources/CurrencyNames_zh_CN.java                         |  214 +
generated/sun/util/resources/CurrencyNames_zh_TW.java                         |  207 +
generated/sun/util/resources/LocaleNames.java                                 |  449 ++
generated/sun/util/resources/LocaleNames_ar.java                              |   28 
generated/sun/util/resources/LocaleNames_be.java                              |   12 
generated/sun/util/resources/LocaleNames_bg.java                              |   12 
generated/sun/util/resources/LocaleNames_ca.java                              |  348 +
generated/sun/util/resources/LocaleNames_cs.java                              |   12 
generated/sun/util/resources/LocaleNames_da.java                              |   12 
generated/sun/util/resources/LocaleNames_de.java                              |  440 ++
generated/sun/util/resources/LocaleNames_el.java                              |  310 +
generated/sun/util/resources/LocaleNames_el_CY.java                           |  309 +
generated/sun/util/resources/LocaleNames_en.java                              |   10 
generated/sun/util/resources/LocaleNames_en_MT.java                           |   40 
generated/sun/util/resources/LocaleNames_en_PH.java                           |   40 
generated/sun/util/resources/LocaleNames_en_SG.java                           |   40 
generated/sun/util/resources/LocaleNames_es.java                              |  440 ++
generated/sun/util/resources/LocaleNames_es_US.java                           |  131 
generated/sun/util/resources/LocaleNames_et.java                              |   12 
generated/sun/util/resources/LocaleNames_fi.java                              |   63 
generated/sun/util/resources/LocaleNames_fr.java                              |  440 ++
generated/sun/util/resources/LocaleNames_ga.java                              |  343 +
generated/sun/util/resources/LocaleNames_hi.java                              |   14 
generated/sun/util/resources/LocaleNames_hr.java                              |   12 
generated/sun/util/resources/LocaleNames_hu.java                              |   12 
generated/sun/util/resources/LocaleNames_in.java                              |  163 
generated/sun/util/resources/LocaleNames_is.java                              |   12 
generated/sun/util/resources/LocaleNames_it.java                              |  440 ++
generated/sun/util/resources/LocaleNames_iw.java                              |   12 
generated/sun/util/resources/LocaleNames_ja.java                              |  440 ++
generated/sun/util/resources/LocaleNames_ko.java                              |  440 ++
generated/sun/util/resources/LocaleNames_lt.java                              |   12 
generated/sun/util/resources/LocaleNames_lv.java                              |   12 
generated/sun/util/resources/LocaleNames_mk.java                              |   12 
generated/sun/util/resources/LocaleNames_ms.java                              |   79 
generated/sun/util/resources/LocaleNames_mt.java                              |  332 +
generated/sun/util/resources/LocaleNames_nl.java                              |   13 
generated/sun/util/resources/LocaleNames_no.java                              |   14 
generated/sun/util/resources/LocaleNames_pl.java                              |  348 +
generated/sun/util/resources/LocaleNames_pt.java                              |  374 +
generated/sun/util/resources/LocaleNames_pt_BR.java                           |   22 
generated/sun/util/resources/LocaleNames_pt_PT.java                           |   72 
generated/sun/util/resources/LocaleNames_ro.java                              |   12 
generated/sun/util/resources/LocaleNames_ru.java                              |  348 +
generated/sun/util/resources/LocaleNames_sk.java                              |   12 
generated/sun/util/resources/LocaleNames_sl.java                              |   12 
generated/sun/util/resources/LocaleNames_sq.java                              |   12 
generated/sun/util/resources/LocaleNames_sr.java                              |  307 +
generated/sun/util/resources/LocaleNames_sv.java                              |  440 ++
generated/sun/util/resources/LocaleNames_th.java                              |  348 +
generated/sun/util/resources/LocaleNames_tr.java                              |   12 
generated/sun/util/resources/LocaleNames_uk.java                              |   12 
generated/sun/util/resources/LocaleNames_vi.java                              |  257 +
generated/sun/util/resources/LocaleNames_zh.java                              |  440 ++
generated/sun/util/resources/LocaleNames_zh_SG.java                           |  103 
generated/sun/util/resources/LocaleNames_zh_TW.java                           |  440 ++
javac.in                                                                      |   34 
javap.in                                                                      |    3 
patches/icedtea-corba.patch                                                   |   14 
patches/icedtea-ecj.patch                                                     |  800 ++++
patches/icedtea-javafiles.patch                                               |   60 
patches/icedtea-sunsrc.patch                                                  |   57 
patches/icedtea-xjc.patch                                                     |   10 
tools-copy-files.txt                                                          |   45 
tools-copy/tools-corba-copy-files.txt                                         |    6 
tools-copy/tools-j2se-copy-files.txt                                          |   39 
tools-copy/tools-jaxws-copy-files.txt                                         |  101 
tools-copy/tools-langtools-copy-files.txt                                     |   51 

diffs (truncated from 22123 to 500 lines):

diff -r 6117d91ad783 -r c3357ed52323 .hgignore
--- a/.hgignore	Wed Nov 07 11:56:25 2007 +0000
+++ b/.hgignore	Wed Nov 07 13:57:34 2007 -0500
@@ -352,3 +352,33 @@ rt/java/util/Vector.java
 rt/java/util/Vector.java
 rt/java/util/WeakHashMap.java
 rt/java/util/XMLUtils.java
+rt/java/rmi/AccessException.java
+rt/java/rmi/AlreadyBoundException.java
+rt/java/rmi/ConnectException.java
+rt/java/rmi/ConnectIOException.java
+rt/java/rmi/MarshalException.java
+rt/java/rmi/MarshalledObject.java
+rt/java/rmi/Naming.java
+rt/java/rmi/NoSuchObjectException.java
+rt/java/rmi/NotBoundException.java
+rt/java/rmi/RMISecurityException.java
+rt/java/rmi/RMISecurityManager.java
+rt/java/rmi/Remote.java
+rt/java/rmi/RemoteException.java
+rt/java/rmi/ServerError.java
+rt/java/rmi/ServerException.java
+rt/java/rmi/ServerRuntimeException.java
+rt/java/rmi/StubNotFoundException.java
+rt/java/rmi/UnexpectedException.java
+rt/java/rmi/UnknownHostException.java
+rt/java/rmi/UnmarshalException.java
+rt/sun/rmi/rmic/BatchEnvironment.java
+rt/sun/rmi/rmic/Constants.java
+rt/sun/rmi/rmic/Generator.java
+rt/sun/rmi/rmic/IndentingWriter.java
+rt/sun/rmi/rmic/Main.java
+rt/sun/rmi/rmic/Names.java
+rt/sun/rmi/rmic/RMIConstants.java
+rt/sun/rmi/rmic/RMIGenerator.java
+rt/sun/rmi/rmic/RemoteClass.java
+rt/sun/rmi/rmic/Util.java
diff -r 6117d91ad783 -r c3357ed52323 ChangeLog
--- a/ChangeLog	Wed Nov 07 11:56:25 2007 +0000
+++ b/ChangeLog	Wed Nov 07 13:57:34 2007 -0500
@@ -1,3 +1,34 @@ 2007-11-07  Gary Benson  <gbenson at redhat
+2007-11-07  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Re-added ecj targets, added new patches to the list and
+	updated tools.jar.
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* configure.ac: Re-added --with-icedtea and --with-icedtea-home
+	options. Also, added --with-gcj-home to specify where gcj is
+	installed- the default is /usr/lib/jvm/java-gcj/.
+	* generated/*.java: Regenerated and added several new sources.
+	* generated/fontconfig/*.bfc: Added generated font files.
+	* javac.in: Re-added. Added support to ignore Werror flags.
+	* javap.in: Re-added.
+	* patches/icedtea-javafiles: Updated to add missing sources to
+	Makefiles.
+	* patches/icedtea-sunrc.patch: Updated.
+	* patches/icedtea-corba.patch: New patch.
+	* patches/icedtea-ecj.patch: New patch to make building with ecj
+	possible.
+	* tools-copy/tools-corba-copy-files.txt: List of corba sources to
+	copy.
+	* tools-copy/tools-j2se-copy-files.txt: List of j2se soures to copy.
+	* tools-copy/tools-jaxws-copy-files.txt: List of jaxws sources to
+	copy.
+	* tools-copy/tools-langtools-copy-files.txt: List of langtools to
+	copy.
+	* patches/icedtea-xjc.patch: Removed. Has been combined with sunrc
+	patch.
+	* tools-copy-files.txt: Removed.
+
 2007-11-07  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4 (SET_ARCH_DIRS): Remove redundant special cases.
diff -r 6117d91ad783 -r c3357ed52323 Makefile.am
--- a/Makefile.am	Wed Nov 07 11:56:25 2007 +0000
+++ b/Makefile.am	Wed Nov 07 13:57:34 2007 -0500
@@ -12,6 +12,7 @@ distclean-local: clean-copy
 	rm -f rt-source-files.txt tools-source-files.txt
 	rm -rf bootstrap
 	rm -rf lib
+	rm -rf openjdk-ecj
 	rm -rf openjdk
 	rm -rf tools
 	rm -f gcjwebplugin.so
@@ -19,20 +20,22 @@ install:
 install:
 
 .PHONY: \
-	env snapshot clean-download clean-extract clean-patch \
-	clean-bootstrap-directory clean-bootstrap-directory-symlink \
-	icedtea icedtea-debug clean-icedtea icedtea-against-icedtea clean-plugs \
+	env env-ecj snapshot clean-download clean-extract clean-patch \
+	clean-extract-ecj clean-patch-ecj clean-bootstrap-directory \
+	clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
+	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
+	clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
 	clean-tools-jar clean-tools clean-shared-objects \
 	clean-copy clean-rt clean-gcjwebplugin
 
-EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) \
-	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy-files.txt
+EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
+	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy
 
 # OpenJDK build environment.
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
+BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)/
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/
+	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
 ICEDTEA_RT = \
 	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 ICEDTEA_CLS_DIR = \
@@ -40,15 +43,15 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
 ICEDTEA_ENV = \
+	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
-	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+        "BUILD_NUMBER=$(OPENJDK_VERSION)" \
+        "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -57,11 +60,47 @@ ICEDTEA_ENV = \
 	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
+	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
 
 env:
 	@echo 'unset JAVA_HOME'
 	@echo 'export $(ICEDTEA_ENV)'
+
+# OpenJDK ecj build environment.
+ICEDTEA_BUILD_DIR_ECJ = \
+	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+ICEDTEA_CLS_DIR_ECJ = \
+	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+ICEDTEA_ENV_ECJ = \
+	"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
+	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
+	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
+        "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+	"LANG=C" \
+	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
+	"LIBGCJ_JAR=$(LIBGCJ_JAR)" \
+	"ICEDTEA_RT=$(ICEDTEA_RT)" \
+	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
+	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \
+	"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
+	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
+	"BOOTCLASSPATH_CLS_RT=-bootclasspath \
+	  $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
+	"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
+	"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(LIBGCJ_JAR)" \
+	"CLASSPATH=" \
+	"LD_LIBRARY_PATH=" \
+	"GENSRCDIR=$(abs_top_srcdir)/generated" \
+	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
+
+env-ecj:
+	@echo 'unset JAVA_HOME'
+	@echo 'export $(ICEDTEA_ENV_ECJ)'
 
 # Mercurial snapshot.
 snapshot: dist
@@ -97,14 +136,13 @@ clean-download:
 	rm -f stamps/download.stamp
 	rm -f $(OPENJDK_SRC_ZIP)
 
-# Extratc OpenJDK sources.
+# Extract OpenJDK sources.
 stamps/extract.stamp: stamps/download.stamp
 	if ! test -d openjdk ; \
 	then \
 	  $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
 	  chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \
 	     -name sample.makefile.txt` ; \
-	  rm -rf openjdk/jaxws ; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
@@ -143,11 +181,11 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-float-double-trailing-zeros.patch \
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
-	patches/icedtea-xjc.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
+	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
-	patches/icedtea-javafiles.patch \
+	patches/icedtea-corba.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
@@ -176,22 +214,101 @@ clean-patch:
 	  fi ; \
 	done
 
+# OpenJDK ecj Source Preparation Targets
+# ======================================
+
+# Extract OpenJDK sources for ecj.
+stamps/extract-ecj.stamp: stamps/download.stamp
+	if ! test -d openjdk-ecj ; \
+	then \
+	  mkdir tmp-ecj ; \
+	  $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \
+	  mv tmp-ecj/openjdk openjdk-ecj ; \
+	  rmdir tmp-ecj ; \
+	  chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \
+	     -name sample.makefile.txt` ; \
+	  rm -rf openjdk-ecj/jaxws; \
+	fi
+	mkdir -p stamps
+	touch stamps/extract-ecj.stamp
+
+clean-extract-ecj:
+	rm -f stamps/extract-ecj.stamp
+	rm -rf openjdk-ecj
+
+# Patch OpenJDK for plug replacements and ecj.
+ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+
+stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
+	for p in $(ICEDTEA_PATCHES) ; \
+	do \
+	  echo Checking $$p ; \
+	  if $(PATCH) -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
+	  then \
+	    echo Applying $$p ; \
+	    $(PATCH) -p1 -d openjdk-ecj < $$p ; \
+	  fi ; \
+	done
+	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
+	if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+	then \
+	  echo Applying $(ICEDTEA_ECJ_PATCH) ; \
+	  $(PATCH) -p0 < $(ICEDTEA_ECJ_PATCH) ; \
+	fi
+	mkdir -p stamps
+	touch stamps/patch-ecj.stamp
+
+clean-patch-ecj:
+	rm -f stamps/patch-ecj.stamp
+	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
+	if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+	then \
+	  echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
+	  $(PATCH) -p0 -R < $(ICEDTEA_ECJ_PATCH) ; \
+	fi
+	for p in $(ICEDTEA_PATCHES) ; \
+	do \
+	  echo Checking $$p ; \
+	  if $(PATCH) -p1 -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
+	  then \
+	    echo Reverting $$p ; \
+	    $(PATCH) -p1 -d openjdk-ecj -R < $$p ; \
+	  fi ; \
+	done
+
 # Bootstrap Directory Targets
 # ===========================
 
-MEMORY_LIMIT = -J-Xmx512m
+# bootstrap/icedtea.
+stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
+	rm -rf bootstrap/icedtea
+	ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+	mkdir -p stamps
+	touch stamps/bootstrap-directory.stamp
+
+clean-bootstrap-directory:
+	rm -f stamps/bootstrap-directory.stamp
+	rm -rf bootstrap/icedtea
+
+if WITH_ICEDTEA
+  BOOTSTRAP_DIRECTORY_STAMP =
+  ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+else
+  BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
+  ICEDTEA_HOME = icedtea
+endif
 
 # bootstrap/jdk1.6.0 to bootstrap/icedtea symlink.
-stamps/bootstrap-directory-symlink.stamp:
+stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP)
 	mkdir -p bootstrap
 	rm -f bootstrap/jdk1.6.0
-	ln -sf $(SYSTEM_ICEDTEA_DIR) bootstrap/jdk1.6.0
+	ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0
 	if ! bootstrap/jdk1.6.0/bin/java -version ; \
-	  then \
-	    echo "bootstrap/jdk1.6.0/bin/java" \
-		"cannot be found or is corrupted." ; \
-	    exit 1; \
-	fi 
+         then \
+           echo "bootstrap/jdk1.6.0/bin/java" \
+               "cannot be found or is corrupted." ; \
+           exit 1; \
+        fi
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-symlink.stamp
 
@@ -199,10 +316,57 @@ clean-bootstrap-directory-symlink:
 	rm -f stamps/bootstrap-directory-symlink.stamp
 	rm -f bootstrap/jdk1.6.0
 
+# Bootstrap ecj Directory Targets
+# ===============================
+
+# bootstrap/ecj.
+stamps/bootstrap-directory-ecj.stamp:
+	mkdir -p bootstrap/ecj/bin stamps/
+	ln -sf $(JAVA) bootstrap/ecj/bin/java
+	ln -sf $(JAVAH) bootstrap/ecj/bin/javah
+	ln -sf $(RMIC) bootstrap/ecj/bin/rmic
+	ln -sf $(JAR) bootstrap/ecj/bin/jar
+	ln -sf ../../../javac bootstrap/ecj/bin/javac
+	ln -sf ../../../javap bootstrap/ecj/bin/javap
+	mkdir -p bootstrap/ecj/lib/endorsed
+	ln -sf $(XALAN2_JAR) bootstrap/ecj/lib/endorsed/xalan-j2.jar
+	ln -sf $(XALAN2_SERIALIZER_JAR) \
+	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
+	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
+	mkdir -p bootstrap/ecj/jre
+	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/
+	mkdir -p stamps
+	touch stamps/bootstrap-directory-ecj.stamp
+
+clean-bootstrap-directory-ecj:
+	rm -f stamps/bootstrap-directory-ecj.stamp
+	rm -rf bootstrap/ecj
+
+# bootstrap/jdk1.6.0 to bootstrap/ecj symlink.
+stamps/bootstrap-directory-symlink-ecj.stamp: \
+	stamps/bootstrap-directory-ecj.stamp
+	rm -f bootstrap/jdk1.6.0
+	ln -sf ecj bootstrap/jdk1.6.0
+	mkdir -p stamps
+	touch stamps/bootstrap-directory-symlink-ecj.stamp
+
+clean-bootstrap-directory-symlink-ecj:
+	rm -f stamps/bootstrap-directory-symlink-ecj.stamp
+	rm -f bootstrap/jdk1.6.0
+
+
+# OpenJDK Targets
+# ===============
+
+if WITH_ICEDTEA
+  MEMORY_LIMIT = -J-Xmx512m
+else
+  MEMORY_LIMIT =
+endif
+
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: stamps/bootstrap-directory-symlink.stamp stamps/tools.stamp \
-	stamps/plugs.stamp stamps/extract.stamp \
+icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -213,7 +377,7 @@ icedtea: stamps/bootstrap-directory-syml
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
-icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
+icedtea-debug: 	stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
@@ -221,7 +385,7 @@ icedtea-debug: stamps/bootstrap-director
 	  -C openjdk/control/make \
 	  debug_build
 	cp -af gcjwebplugin.so \
-	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	 $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -af gcjwebplugin.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea (debug build) is served:" \
@@ -236,6 +400,31 @@ icedtea-against-icedtea: \
 	stamps/bootstrap-directory-symlink.stamp \
 	icedtea
 
+# OpenJDK ecj Targets
+# ===================
+
+stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
+	stamps/extract-ecj.stamp stamps/patch-ecj.stamp
+	$(MAKE) \
+	  $(ICEDTEA_ENV_ECJ) \
+	  -C openjdk-ecj/control/make
+	@echo "ecj-poured IcedTea is served:" \
+	  openjdk-ecj/control/build/$(LINUX_DIR)
+	mkdir -p stamps
+	touch stamps/icedtea-ecj.stamp
+
+clean-icedtea-ecj: stamps/extract-ecj.stamp
+	rm -f stamps/icedtea-ecj.stamp
+	$(MAKE) \
+	  $(ICEDTEA_ENV_ECJ) \
+	  -C openjdk-ecj/control/make clobber
+
+stamps/icedtea-against-ecj.stamp: \
+	stamps/bootstrap-directory-symlink-ecj.stamp \
+	stamps/icedtea-ecj.stamp
+	mkdir -p stamps
+	touch stamps/icedtea-against-ecj.stamp
+
 # Binary Plugs and Tools Targets
 # ==============================
 
@@ -248,7 +437,8 @@ stamps/tools.stamp: bootstrap/jdk1.7.0/j
 	mkdir -p stamps
 	touch stamps/tools.stamp
 
-clean-plugs: clean-plugs clean-shared-objects clean-copy clean-rt
+clean-plugs: clean-plugs clean-shared-objects \
+	clean-copy clean-rt
 	rm -f stamps/plugs.stamp
 	rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
@@ -286,7 +476,8 @@ ICEDTEA_COPY_DIRS = \
 	com/sun/jdi/request \
 	com/sun/jmx/snmp/agent \
 	com/sun/tools/jdi \
-	java/util
+	java/util \
+	java/rmi
 
 stamps/copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
 	for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
@@ -310,18 +501,41 @@ LANGTOOLS = openjdk/langtools/src/share/
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
 CORBA = openjdk/corba/src/share/classes
+JAXWS = openjdk/jaxws/src/share/classes
 
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA)
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
 
 # tools.jar class files.
 stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
-	for copy_dir in `cat tools-copy-files.txt` ; \
+	for copy_dir in `cat tools-copy/tools-j2se-copy-files.txt` ; \
         do \
           mkdir -p tools/$$copy_dir ; \
 	  cp -arf openjdk/j2se/src/share/classes/$$copy_dir/* \
             tools/$$copy_dir ; \
         done
+	
+	for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
+	do \
+	  mkdir -p tools/$$copy_dir ; \
+	  cp -arf openjdk/langtools/src/share/classes/$$copy_dir/* \
+	    tools/$$copy_dir ; \
+	done
+
+	for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
+	do \
+	  mkdir -p tools/$$copy_dir ; \
+	  cp -arf openjdk/corba/src/share/classes/$$copy_dir/* \
+	    tools/$$copy_dir ; \
+	done
+
+	for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
+	do \
+	  mkdir -p tools/$$copy_dir ; \
+	  cp -arf openjdk/jaxws/src/share/classes/$$copy_dir/* \
+	    tools/$$copy_dir ; \
+	done
+	
 	mkdir -p stamps
 	touch stamps/tools-copy-source-files.stamp
 
@@ -332,8 +546,9 @@ tools-source-files.txt: stamps/extract.s
 


From langel at redhat.com  Wed Nov  7 11:07:06 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 14:07:06 -0500
Subject: Re-implemented ecj support
Message-ID: <47320CDA.90604@redhat.com>

Hi,

I have just added ecj support back into IcedTea.

To build with ecj and bootstrap:
./configure && make

To bootstrap with an old IcedTea build:
./configure --with-icedtea [/usr/lib/jvm/java-icedtea] && make
OR
./configure --with-icedtea-home=/path/to/icedtea && make

Use --with-gcj-home=/path/to/gcj to specify where gcj is installed, 
default location is /usr/lib/jvm/java-gcj. This is needed to link a 
few corba libs using libgcj.


Other than that, everything should work fine. If there are any bugs, 
please contact me asap.

Cheers,
Lillian



From langel at redhat.com  Wed Nov  7 11:50:20 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 14:50:20 -0500
Subject: Re-implemented ecj support
In-Reply-To: <47320CDA.90604@redhat.com>
References: <47320CDA.90604@redhat.com>
Message-ID: <473216FC.4020502@redhat.com>

Be aware that the build is broken on x86_64 because of this bug in b22:
http://bugs.sun.com/view_bug.do?bug_id=6616627

It will be fixed when we upgrade to b23/b24.


Lillian



Lillian Angel wrote:
> Hi,
> 
> I have just added ecj support back into IcedTea.
> 
> To build with ecj and bootstrap:
> ./configure && make
> 
> To bootstrap with an old IcedTea build:
> ./configure --with-icedtea [/usr/lib/jvm/java-icedtea] && make
> OR
> ./configure --with-icedtea-home=/path/to/icedtea && make
> 
> Use --with-gcj-home=/path/to/gcj to specify where gcj is installed, 
> default location is /usr/lib/jvm/java-gcj. This is needed to link a few 
> corba libs using libgcj.
> 
> 
> Other than that, everything should work fine. If there are any bugs, 
> please contact me asap.
> 
> Cheers,
> Lillian
> 


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  7 11:32:46 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 07 Nov 2007 19:32:46 +0000
Subject: [Bug 78] New: Get rid of the code under native/java/util/zip
Message-ID: <E1Ipqdq-0004Jx-Mu@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78

           Summary: Get rid of the code under native/java/util/zip
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: enhancement
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: adam at spicenitz.org


Looks like openjdk is shipping a private (and old) copy of zlib.

First, there should not be a private zlib in java.
Second, java.util.zip shouldn't even be native. Java is fast enough these days
to implement this directly, and zlib has a history of buffer overflows, etc. 

Classpath seems to have a pure Java implementation. Can it be used?

Worst case, at least link against system zlib.


-- 
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 Nov  7 12:53:41 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 07 Nov 2007 20:53:41 +0000
Subject: [Bug 78] Get rid of the code under native/java/util/zip
Message-ID: <E1Ipru9-0004Mg-Fj@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |langel at redhat.com
             Status|NEW                         |RESOLVED
         Resolution|                            |INVALID




------- Comment #1 from langel at redhat.com  2007-11-07 20:53 -------
We already do link to the system zlib. This was added in a week ago.

Closing 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  Wed Nov  7 13:02:07 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 07 Nov 2007 21:02:07 +0000
Subject: [Bug 78] Get rid of the code under native/java/util/zip
Message-ID: <E1Ips2J-0004N3-K3@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #2 from mark at klomp.org  2007-11-07 21:02 -------
Just a random comment (really to test whether the Unassigned user properly
forwards to pkg-distro-dev - the bug is already marked Resolved Invalid) but
when I read the Summary the first time I thought it was about replacing the
native non-java util.zip parts with the pure-java util.zip from GNU Classpath.


-- 
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 Nov  7 13:06:26 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 07 Nov 2007 21:06:26 +0000
Subject: [Bug 78] Get rid of the code under native/java/util/zip
Message-ID: <E1Ips6U-0004Nb-Un@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #3 from langel at redhat.com  2007-11-07 21:06 -------
sure, we could do that, but we are already linking against the system zlib so
it resolves the issue of "openjdk is shipping a private (and old) copy of
zlib".


-- 
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  Wed Nov  7 14:19:09 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 22:19:09 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Lillian Angel  <langel@red...
Message-ID: <hg.c03b4d7d5eb0.1194473949.-6899778133799504387@icedtea.classpath.org>

changeset c03b4d7d5eb0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c03b4d7d5eb0
description:
	2007-11-07  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Added new patch to list.
	        * Makefile.in: Regenerate.
	        * patches/icedtea-docs.patch: New patch to build docs.
	        * generated/*: Removed files that should be ignored.
	        * .hgignore: Updated.

diffstat:

85 files changed, 133 insertions(+), 6203 deletions(-)
.hgignore                                                                     |   81 
ChangeLog                                                                     |    8 
Makefile.am                                                                   |    1 
Makefile.in                                                                   |    1 
generated/java/lang/CharacterData00.java                                      | 1110 ----------
generated/java/lang/CharacterData01.java                                      |  453 ----
generated/java/lang/CharacterData02.java                                      |  357 ---
generated/java/lang/CharacterData0E.java                                      |  361 ---
generated/java/lang/CharacterDataLatin1.java                                  |  287 --
generated/org/omg/PortableServer/AdapterActivator.java                        |   21 
generated/org/omg/PortableServer/AdapterActivatorOperations.java              |   36 
generated/org/omg/PortableServer/Current.java                                 |   32 
generated/org/omg/PortableServer/CurrentOperations.java                       |   56 
generated/org/omg/PortableServer/CurrentPackage/NoContext.java                |   25 
generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java          |   72 
generated/org/omg/PortableServer/ForwardRequest.java                          |   33 
generated/org/omg/PortableServer/ForwardRequestHelper.java                    |   79 
generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java                 |   18 
generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java                 |   18 
generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java           |   18 
generated/org/omg/PortableServer/IdAssignmentPolicy.java                      |   19 
generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java            |   24 
generated/org/omg/PortableServer/IdAssignmentPolicyValue.java                 |   50 
generated/org/omg/PortableServer/IdUniquenessPolicy.java                      |   19 
generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java            |   24 
generated/org/omg/PortableServer/IdUniquenessPolicyValue.java                 |   48 
generated/org/omg/PortableServer/ImplicitActivationPolicy.java                |   18 
generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java      |   23 
generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java           |   50 
generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java                      |   18 
generated/org/omg/PortableServer/LifespanPolicy.java                          |   19 
generated/org/omg/PortableServer/LifespanPolicyOperations.java                |   24 
generated/org/omg/PortableServer/LifespanPolicyValue.java                     |   49 
generated/org/omg/PortableServer/POA.java                                     |   24 
generated/org/omg/PortableServer/POAManager.java                              |   20 
generated/org/omg/PortableServer/POAManagerOperations.java                    |   78 
generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java       |   25 
generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java |   72 
generated/org/omg/PortableServer/POAManagerPackage/State.java                 |   48 
generated/org/omg/PortableServer/POAOperations.java                           |  467 ----
generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java         |   25 
generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java   |   72 
generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java           |   25 
generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java     |   72 
generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java                |   33 
generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java          |   79 
generated/org/omg/PortableServer/POAPackage/NoServant.java                    |   25 
generated/org/omg/PortableServer/POAPackage/NoServantHelper.java              |   72 
generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java          |   25 
generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java    |   72 
generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java              |   25 
generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java        |   72 
generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java         |   25 
generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java   |   72 
generated/org/omg/PortableServer/POAPackage/ServantNotActive.java             |   25 
generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java       |   72 
generated/org/omg/PortableServer/POAPackage/WrongAdapter.java                 |   25 
generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java           |   72 
generated/org/omg/PortableServer/POAPackage/WrongPolicy.java                  |   25 
generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java            |   72 
generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java            |   18 
generated/org/omg/PortableServer/RequestProcessingPolicy.java                 |   19 
generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java       |   24 
generated/org/omg/PortableServer/RequestProcessingPolicyValue.java            |   61 
generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java             |   18 
generated/org/omg/PortableServer/ServantActivator.java                        |   18 
generated/org/omg/PortableServer/ServantActivatorHelper.java                  |   90 
generated/org/omg/PortableServer/ServantActivatorOperations.java              |   60 
generated/org/omg/PortableServer/ServantActivatorPOA.java                     |   59 
generated/org/omg/PortableServer/ServantLocator.java                          |   32 
generated/org/omg/PortableServer/ServantLocatorHelper.java                    |  104 
generated/org/omg/PortableServer/ServantLocatorOperations.java                |   67 
generated/org/omg/PortableServer/ServantLocatorPOA.java                       |   73 
generated/org/omg/PortableServer/ServantManager.java                          |   25 
generated/org/omg/PortableServer/ServantManagerOperations.java                |   25 
generated/org/omg/PortableServer/ServantRetentionPolicy.java                  |   18 
generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java        |   23 
generated/org/omg/PortableServer/ServantRetentionPolicyValue.java             |   49 
generated/org/omg/PortableServer/THREAD_POLICY_ID.java                        |   18 
generated/org/omg/PortableServer/ThreadPolicy.java                            |   19 
generated/org/omg/PortableServer/ThreadPolicyOperations.java                  |   24 
generated/org/omg/PortableServer/ThreadPolicyValue.java                       |   48 
generated/org/omg/PortableServer/_ServantActivatorStub.java                   |  112 -
generated/org/omg/PortableServer/_ServantLocatorStub.java                     |  119 -
patches/icedtea-docs.patch                                                    |   42 

diffs (truncated from 6696 to 500 lines):

diff -r c3357ed52323 -r c03b4d7d5eb0 .hgignore
--- a/.hgignore	Wed Nov 07 13:57:34 2007 -0500
+++ b/.hgignore	Wed Nov 07 17:18:01 2007 -0500
@@ -382,3 +382,84 @@ rt/sun/rmi/rmic/RMIGenerator.java
 rt/sun/rmi/rmic/RMIGenerator.java
 rt/sun/rmi/rmic/RemoteClass.java
 rt/sun/rmi/rmic/Util.java
+generated/java/lang/CharacterData00.java
+generated/java/lang/CharacterData01.java
+generated/java/lang/CharacterData02.java
+generated/java/lang/CharacterData0E.java
+generated/java/lang/CharacterDataLatin1.java
+generated/org/omg/PortableServer/AdapterActivator.java
+generated/org/omg/PortableServer/AdapterActivatorOperations.java
+generated/org/omg/PortableServer/Current.java
+generated/org/omg/PortableServer/CurrentOperations.java
+generated/org/omg/PortableServer/CurrentPackage/NoContext.java
+generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
+generated/org/omg/PortableServer/ForwardRequest.java
+generated/org/omg/PortableServer/ForwardRequestHelper.java
+generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
+generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
+generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
+generated/org/omg/PortableServer/IdAssignmentPolicy.java
+generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java
+generated/org/omg/PortableServer/IdAssignmentPolicyValue.java
+generated/org/omg/PortableServer/IdUniquenessPolicy.java
+generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java
+generated/org/omg/PortableServer/IdUniquenessPolicyValue.java
+generated/org/omg/PortableServer/ImplicitActivationPolicy.java
+generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java
+generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java
+generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java
+generated/org/omg/PortableServer/LifespanPolicy.java
+generated/org/omg/PortableServer/LifespanPolicyOperations.java
+generated/org/omg/PortableServer/LifespanPolicyValue.java
+generated/org/omg/PortableServer/POA.java
+generated/org/omg/PortableServer/POAManager.java
+generated/org/omg/PortableServer/POAManagerOperations.java
+generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
+generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
+generated/org/omg/PortableServer/POAManagerPackage/State.java
+generated/org/omg/PortableServer/POAOperations.java
+generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
+generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
+generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
+generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
+generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java
+generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
+generated/org/omg/PortableServer/POAPackage/NoServant.java
+generated/org/omg/PortableServer/POAPackage/NoServantHelper.java
+generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
+generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
+generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java
+generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
+generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
+generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
+generated/org/omg/PortableServer/POAPackage/ServantNotActive.java
+generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
+generated/org/omg/PortableServer/POAPackage/WrongAdapter.java
+generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
+generated/org/omg/PortableServer/POAPackage/WrongPolicy.java
+generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
+generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java
+generated/org/omg/PortableServer/RequestProcessingPolicy.java
+generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java
+generated/org/omg/PortableServer/RequestProcessingPolicyValue.java
+generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java
+generated/org/omg/PortableServer/ServantActivator.java
+generated/org/omg/PortableServer/ServantActivatorHelper.java
+generated/org/omg/PortableServer/ServantActivatorOperations.java
+generated/org/omg/PortableServer/ServantActivatorPOA.java
+generated/org/omg/PortableServer/ServantLocator.java
+generated/org/omg/PortableServer/ServantLocatorHelper.java
+generated/org/omg/PortableServer/ServantLocatorOperations.java
+generated/org/omg/PortableServer/ServantLocatorPOA.java
+generated/org/omg/PortableServer/ServantManager.java
+generated/org/omg/PortableServer/ServantManagerOperations.java
+generated/org/omg/PortableServer/ServantRetentionPolicy.java
+generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java
+generated/org/omg/PortableServer/ServantRetentionPolicyValue.java
+generated/org/omg/PortableServer/THREAD_POLICY_ID.java
+generated/org/omg/PortableServer/ThreadPolicy.java
+generated/org/omg/PortableServer/ThreadPolicyOperations.java
+generated/org/omg/PortableServer/ThreadPolicyValue.java
+generated/org/omg/PortableServer/_ServantActivatorStub.java
+generated/org/omg/PortableServer/_ServantLocatorStub.java
+generated/sun/awt/X11/generator/sizer.32
diff -r c3357ed52323 -r c03b4d7d5eb0 ChangeLog
--- a/ChangeLog	Wed Nov 07 13:57:34 2007 -0500
+++ b/ChangeLog	Wed Nov 07 17:18:01 2007 -0500
@@ -1,3 +1,11 @@ 2007-11-07  Lillian Angel  <langel at redha
+2007-11-07  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added new patch to list.
+	* Makefile.in: Regenerate.
+	* patches/icedtea-docs.patch: New patch to build docs.
+	* generated/*: Removed files that should be ignored.
+	* .hgignore: Updated.
+
 2007-11-07  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Re-added ecj targets, added new patches to the list and
diff -r c3357ed52323 -r c03b4d7d5eb0 Makefile.am
--- a/Makefile.am	Wed Nov 07 13:57:34 2007 -0500
+++ b/Makefile.am	Wed Nov 07 17:18:01 2007 -0500
@@ -186,6 +186,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
+	patches/icedtea-docs.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r c3357ed52323 -r c03b4d7d5eb0 Makefile.in
--- a/Makefile.in	Wed Nov 07 13:57:34 2007 -0500
+++ b/Makefile.in	Wed Nov 07 17:18:01 2007 -0500
@@ -305,6 +305,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
+	patches/icedtea-docs.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r c3357ed52323 -r c03b4d7d5eb0 generated/java/lang/CharacterData00.java
--- a/generated/java/lang/CharacterData00.java	Wed Nov 07 13:57:34 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1110 +0,0 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
-/*
- * Copyright 2003-2006 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 java.lang;
-
-/** 
- * The CharacterData00 class encapsulates the large tables once found in
- * java.lang.Character
-*/
-
-class CharacterData00 extends CharacterData {
-    /* The character properties are currently encoded into 32 bits in the following manner:
-        1 bit   mirrored property
-        4 bits  directionality property
-        9 bits  signed offset used for converting case
-        1 bit   if 1, adding the signed offset converts the character to lowercase
-        1 bit   if 1, subtracting the signed offset converts the character to uppercase
-        1 bit   if 1, this character has a titlecase equivalent (possibly itself)
-        3 bits  0  may not be part of an identifier
-                1  ignorable control; may continue a Unicode identifier or Java identifier
-                2  may continue a Java identifier but not a Unicode identifier (unused)
-                3  may continue a Unicode identifier or Java identifier
-                4  is a Java whitespace character
-                5  may start or continue a Java identifier;
-                   may continue but not start a Unicode identifier (underscores)
-                6  may start or continue a Java identifier but not a Unicode identifier ($)
-                7  may start or continue a Unicode identifier or Java identifier
-                Thus:
-                   5, 6, 7 may start a Java identifier
-                   1, 2, 3, 5, 6, 7 may continue a Java identifier
-                   7 may start a Unicode identifier
-                   1, 3, 5, 7 may continue a Unicode identifier
-                   1 is ignorable within an identifier
-                   4 is Java whitespace
-        2 bits  0  this character has no numeric property
-                1  adding the digit offset to the character code and then
-                   masking with 0x1F will produce the desired numeric value
-                2  this character has a "strange" numeric value
-                3  a Java supradecimal digit: adding the digit offset to the
-                   character code, then masking with 0x1F, then adding 10
-                   will produce the desired numeric value
-        5 bits  digit offset
-        5 bits  character type
-
-        The encoding of character properties is subject to change at any time.
-     */
-
-    int getProperties(int ch) {
-        char offset = (char)ch;
-        int props = A[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
-        return props;
-    }
-
-    int getType(int ch) {
-        int props = getProperties(ch);
-        return (props & 0x1F);
-    }
-
-    boolean isJavaIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) >= 0x00005000);
-    }
-
-    boolean isJavaIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00003000) != 0);
-    }
-
-    boolean isUnicodeIdentifierStart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00007000);
-    }
-
-    boolean isUnicodeIdentifierPart(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00001000) != 0);
-    }
-
-    boolean isIdentifierIgnorable(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00001000);
-    }
-
-    int toLowerCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00020000) != 0) {
-          if ((val & 0x07FC0000) == 0x07FC0000) {
-            switch(ch) {
-              // map the offset overflow chars
-			case 0x0130 : mapChar = 0x0069; break;
-            case 0x2126 : mapChar = 0x03C9; break;
-            case 0x212A : mapChar = 0x006B; break;
-            case 0x212B : mapChar = 0x00E5; break;
-              // map the titlecase chars with both a 1:M uppercase map
-              // and a lowercase map
-            case 0x1F88 : mapChar = 0x1F80; break;
-            case 0x1F89 : mapChar = 0x1F81; break;
-            case 0x1F8A : mapChar = 0x1F82; break;
-            case 0x1F8B : mapChar = 0x1F83; break;
-            case 0x1F8C : mapChar = 0x1F84; break;
-            case 0x1F8D : mapChar = 0x1F85; break;
-            case 0x1F8E : mapChar = 0x1F86; break;
-            case 0x1F8F : mapChar = 0x1F87; break;
-            case 0x1F98 : mapChar = 0x1F90; break;
-            case 0x1F99 : mapChar = 0x1F91; break;
-            case 0x1F9A : mapChar = 0x1F92; break;
-            case 0x1F9B : mapChar = 0x1F93; break;
-            case 0x1F9C : mapChar = 0x1F94; break;
-            case 0x1F9D : mapChar = 0x1F95; break;
-            case 0x1F9E : mapChar = 0x1F96; break;
-            case 0x1F9F : mapChar = 0x1F97; break;
-            case 0x1FA8 : mapChar = 0x1FA0; break;
-            case 0x1FA9 : mapChar = 0x1FA1; break;
-            case 0x1FAA : mapChar = 0x1FA2; break;
-            case 0x1FAB : mapChar = 0x1FA3; break;
-            case 0x1FAC : mapChar = 0x1FA4; break;
-            case 0x1FAD : mapChar = 0x1FA5; break;
-            case 0x1FAE : mapChar = 0x1FA6; break;
-            case 0x1FAF : mapChar = 0x1FA7; break;
-            case 0x1FBC : mapChar = 0x1FB3; break;
-            case 0x1FCC : mapChar = 0x1FC3; break;
-            case 0x1FFC : mapChar = 0x1FF3; break;
-              // default mapChar is already set, so no
-              // need to redo it here.
-              // default       : mapChar = ch;
-            }
-          }
-          else {
-            int offset = val << 5 >> (5+18);
-            mapChar = ch + offset;
-          }
-        }
-        return mapChar;
-    }
-
-    int toUpperCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00010000) != 0) {
-          if ((val & 0x07FC0000) == 0x07FC0000) {
-            switch(ch) {
-              // map chars with overflow offsets
-            case 0x00B5 : mapChar = 0x039C; break;
-            case 0x017F : mapChar = 0x0053; break;
-            case 0x1FBE : mapChar = 0x0399; break;
-              // map char that have both a 1:1 and 1:M map
-            case 0x1F80 : mapChar = 0x1F88; break;
-            case 0x1F81 : mapChar = 0x1F89; break;
-            case 0x1F82 : mapChar = 0x1F8A; break;
-            case 0x1F83 : mapChar = 0x1F8B; break;
-            case 0x1F84 : mapChar = 0x1F8C; break;
-            case 0x1F85 : mapChar = 0x1F8D; break;
-            case 0x1F86 : mapChar = 0x1F8E; break;
-            case 0x1F87 : mapChar = 0x1F8F; break;
-            case 0x1F90 : mapChar = 0x1F98; break;
-            case 0x1F91 : mapChar = 0x1F99; break;
-            case 0x1F92 : mapChar = 0x1F9A; break;
-            case 0x1F93 : mapChar = 0x1F9B; break;
-            case 0x1F94 : mapChar = 0x1F9C; break;
-            case 0x1F95 : mapChar = 0x1F9D; break;
-            case 0x1F96 : mapChar = 0x1F9E; break;
-            case 0x1F97 : mapChar = 0x1F9F; break;
-            case 0x1FA0 : mapChar = 0x1FA8; break;
-            case 0x1FA1 : mapChar = 0x1FA9; break;
-            case 0x1FA2 : mapChar = 0x1FAA; break;
-            case 0x1FA3 : mapChar = 0x1FAB; break;
-            case 0x1FA4 : mapChar = 0x1FAC; break;
-            case 0x1FA5 : mapChar = 0x1FAD; break;
-            case 0x1FA6 : mapChar = 0x1FAE; break;
-            case 0x1FA7 : mapChar = 0x1FAF; break;
-            case 0x1FB3 : mapChar = 0x1FBC; break;
-            case 0x1FC3 : mapChar = 0x1FCC; break;
-            case 0x1FF3 : mapChar = 0x1FFC; break;
-              // ch must have a 1:M case mapping, but we
-              // can't handle it here. Return ch.
-              // since mapChar is already set, no need
-              // to redo it here.
-              //default       : mapChar = ch;
-            }
-          }
-          else {
-            int offset = val  << 5 >> (5+18);
-            mapChar =  ch - offset;
-          }
-        }
-        return mapChar;
-    }
-
-    int toTitleCase(int ch) {
-        int mapChar = ch;
-        int val = getProperties(ch);
-
-        if ((val & 0x00008000) != 0) {
-            // There is a titlecase equivalent.  Perform further checks:
-            if ((val & 0x00010000) == 0) {
-                // The character does not have an uppercase equivalent, so it must
-                // already be uppercase; so add 1 to get the titlecase form.
-                mapChar = ch + 1;
-            }
-            else if ((val & 0x00020000) == 0) {
-                // The character does not have a lowercase equivalent, so it must
-                // already be lowercase; so subtract 1 to get the titlecase form.
-                mapChar = ch - 1;
-            }
-            // else {
-            // The character has both an uppercase equivalent and a lowercase
-            // equivalent, so it must itself be a titlecase form; return it.
-            // return ch;
-            //}
-        }
-        else if ((val & 0x00010000) != 0) {
-            // This character has no titlecase equivalent but it does have an
-            // uppercase equivalent, so use that (subtract the signed case offset).
-            mapChar = toUpperCase(ch);
-        }
-        return mapChar;
-    }
-
-    int digit(int ch, int radix) {
-        int value = -1;
-        if (radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
-            int val = getProperties(ch);
-            int kind = val & 0x1F;
-            if (kind == Character.DECIMAL_DIGIT_NUMBER) {
-                value = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            }
-            else if ((val & 0xC00) == 0x00000C00) {
-                // Java supradecimal digit
-                value = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            }
-        }
-        return (value < radix) ? value : -1;
-    }
-
-    int getNumericValue(int ch) {
-        int val = getProperties(ch);
-        int retval = -1;
-
-        switch (val & 0xC00) {
-        default: // cannot occur
-        case (0x00000000):         // not numeric
-            retval = -1;
-            break;
-        case (0x00000400):              // simple numeric
-            retval = ch + ((val & 0x3E0) >> 5) & 0x1F;
-            break;
-        case (0x00000800)      :       // "strange" numeric
-            switch (ch) {
-                case 0x0BF1: retval = 100; break;         // TAMIL NUMBER ONE HUNDRED
-                case 0x0BF2: retval = 1000; break;        // TAMIL NUMBER ONE THOUSAND
-                case 0x1375: retval = 40; break;          // ETHIOPIC NUMBER FORTY
-                case 0x1376: retval = 50; break;          // ETHIOPIC NUMBER FIFTY
-                case 0x1377: retval = 60; break;          // ETHIOPIC NUMBER SIXTY
-                case 0x1378: retval = 70; break;          // ETHIOPIC NUMBER SEVENTY
-                case 0x1379: retval = 80; break;          // ETHIOPIC NUMBER EIGHTY
-                case 0x137A: retval = 90; break;          // ETHIOPIC NUMBER NINETY
-                case 0x137B: retval = 100; break;         // ETHIOPIC NUMBER HUNDRED
-                case 0x137C: retval = 10000; break;       // ETHIOPIC NUMBER TEN THOUSAND
-                case 0x215F: retval = 1; break;           // FRACTION NUMERATOR ONE
-                case 0x216C: retval = 50; break;          // ROMAN NUMERAL FIFTY
-                case 0x216D: retval = 100; break;         // ROMAN NUMERAL ONE HUNDRED
-                case 0x216E: retval = 500; break;         // ROMAN NUMERAL FIVE HUNDRED
-                case 0x216F: retval = 1000; break;        // ROMAN NUMERAL ONE THOUSAND
-                case 0x217C: retval = 50; break;          // SMALL ROMAN NUMERAL FIFTY
-                case 0x217D: retval = 100; break;         // SMALL ROMAN NUMERAL ONE HUNDRED
-                case 0x217E: retval = 500; break;         // SMALL ROMAN NUMERAL FIVE HUNDRED
-                case 0x217F: retval = 1000; break;        // SMALL ROMAN NUMERAL ONE THOUSAND
-                case 0x2180: retval = 1000; break;        // ROMAN NUMERAL ONE THOUSAND C D
-                case 0x2181: retval = 5000; break;        // ROMAN NUMERAL FIVE THOUSAND
-                case 0x2182: retval = 10000; break;       // ROMAN NUMERAL TEN THOUSAND
-
-                case 0x325C: retval = 32; break;
-
-                case 0x325D: retval = 33; break;          // CIRCLED NUMBER THIRTY THREE
-                case 0x325E: retval = 34; break;          // CIRCLED NUMBER THIRTY FOUR
-                case 0x325F: retval = 35; break;          // CIRCLED NUMBER THIRTY FIVE
-                case 0x32B1: retval = 36; break;          // CIRCLED NUMBER THIRTY SIX
-                case 0x32B2: retval = 37; break;          // CIRCLED NUMBER THIRTY SEVEN
-                case 0x32B3: retval = 38; break;          // CIRCLED NUMBER THIRTY EIGHT
-                case 0x32B4: retval = 39; break;          // CIRCLED NUMBER THIRTY NINE
-                case 0x32B5: retval = 40; break;          // CIRCLED NUMBER FORTY
-                case 0x32B6: retval = 41; break;          // CIRCLED NUMBER FORTY ONE
-                case 0x32B7: retval = 42; break;          // CIRCLED NUMBER FORTY TWO
-                case 0x32B8: retval = 43; break;          // CIRCLED NUMBER FORTY THREE
-                case 0x32B9: retval = 44; break;          // CIRCLED NUMBER FORTY FOUR
-                case 0x32BA: retval = 45; break;          // CIRCLED NUMBER FORTY FIVE
-                case 0x32BB: retval = 46; break;          // CIRCLED NUMBER FORTY SIX
-                case 0x32BC: retval = 47; break;          // CIRCLED NUMBER FORTY SEVEN
-                case 0x32BD: retval = 48; break;          // CIRCLED NUMBER FORTY EIGHT
-                case 0x32BE: retval = 49; break;          // CIRCLED NUMBER FORTY NINE
-                case 0x32BF: retval = 50; break;          // CIRCLED NUMBER FIFTY
-
-                default:       retval = -2; break;
-            }
-            break;
-        case (0x00000C00):           // Java supradecimal
-            retval = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
-            break;
-        }
-        return retval;
-    }
-
-    boolean isWhitespace(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x00007000) == 0x00004000);
-    }
-
-    byte getDirectionality(int ch) {
-        int val = getProperties(ch);
-        byte directionality = (byte)((val & 0x78000000) >> 27);
-        if (directionality == 0xF ) {
-            switch(ch) {
-                case 0x202A :
-                    // This is the only char with LRE
-                    directionality = Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING;
-                    break;
-                case 0x202B :
-                    // This is the only char with RLE
-                    directionality = Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING;
-                    break;
-                case 0x202C :
-                    // This is the only char with PDF
-                    directionality = Character.DIRECTIONALITY_POP_DIRECTIONAL_FORMAT;
-                    break;
-                case 0x202D :
-                    // This is the only char with LRO
-                    directionality = Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE;
-                    break;
-                case 0x202E :
-                    // This is the only char with RLO
-                    directionality = Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE;
-                    break;
-                default :
-                    directionality = Character.DIRECTIONALITY_UNDEFINED;
-                    break;
-            }
-        }
-        return directionality;
-    }
-
-    boolean isMirrored(int ch) {
-        int props = getProperties(ch);
-        return ((props & 0x80000000) != 0);
-    }
-


From langel at redhat.com  Wed Nov  7 14:30:29 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 07 Nov 2007 22:30:29 +0000
Subject: changeset in /hg/icedtea: Added back files accidentally removed....
Message-ID: <hg.f9a0a601f0dc.1194474629.-6899778133799504387@icedtea.classpath.org>

changeset f9a0a601f0dc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f9a0a601f0dc
description:
	Added back files accidentally removed. Updated ChangeLog.

diffstat:

81 files changed, 6203 insertions(+), 1 deletion(-)
ChangeLog                                                                     |    1 
generated/java/lang/CharacterData00.java                                      | 1110 ++++++++++
generated/java/lang/CharacterData01.java                                      |  453 ++++
generated/java/lang/CharacterData02.java                                      |  357 +++
generated/java/lang/CharacterData0E.java                                      |  361 +++
generated/java/lang/CharacterDataLatin1.java                                  |  287 ++
generated/org/omg/PortableServer/AdapterActivator.java                        |   21 
generated/org/omg/PortableServer/AdapterActivatorOperations.java              |   36 
generated/org/omg/PortableServer/Current.java                                 |   32 
generated/org/omg/PortableServer/CurrentOperations.java                       |   56 
generated/org/omg/PortableServer/CurrentPackage/NoContext.java                |   25 
generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java          |   72 
generated/org/omg/PortableServer/ForwardRequest.java                          |   33 
generated/org/omg/PortableServer/ForwardRequestHelper.java                    |   79 
generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java                 |   18 
generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java                 |   18 
generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java           |   18 
generated/org/omg/PortableServer/IdAssignmentPolicy.java                      |   19 
generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java            |   24 
generated/org/omg/PortableServer/IdAssignmentPolicyValue.java                 |   50 
generated/org/omg/PortableServer/IdUniquenessPolicy.java                      |   19 
generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java            |   24 
generated/org/omg/PortableServer/IdUniquenessPolicyValue.java                 |   48 
generated/org/omg/PortableServer/ImplicitActivationPolicy.java                |   18 
generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java      |   23 
generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java           |   50 
generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java                      |   18 
generated/org/omg/PortableServer/LifespanPolicy.java                          |   19 
generated/org/omg/PortableServer/LifespanPolicyOperations.java                |   24 
generated/org/omg/PortableServer/LifespanPolicyValue.java                     |   49 
generated/org/omg/PortableServer/POA.java                                     |   24 
generated/org/omg/PortableServer/POAManager.java                              |   20 
generated/org/omg/PortableServer/POAManagerOperations.java                    |   78 
generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java       |   25 
generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java |   72 
generated/org/omg/PortableServer/POAManagerPackage/State.java                 |   48 
generated/org/omg/PortableServer/POAOperations.java                           |  467 ++++
generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java         |   25 
generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java   |   72 
generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java           |   25 
generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java     |   72 
generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java                |   33 
generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java          |   79 
generated/org/omg/PortableServer/POAPackage/NoServant.java                    |   25 
generated/org/omg/PortableServer/POAPackage/NoServantHelper.java              |   72 
generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java          |   25 
generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java    |   72 
generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java              |   25 
generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java        |   72 
generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java         |   25 
generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java   |   72 
generated/org/omg/PortableServer/POAPackage/ServantNotActive.java             |   25 
generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java       |   72 
generated/org/omg/PortableServer/POAPackage/WrongAdapter.java                 |   25 
generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java           |   72 
generated/org/omg/PortableServer/POAPackage/WrongPolicy.java                  |   25 
generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java            |   72 
generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java            |   18 
generated/org/omg/PortableServer/RequestProcessingPolicy.java                 |   19 
generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java       |   24 
generated/org/omg/PortableServer/RequestProcessingPolicyValue.java            |   61 
generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java             |   18 
generated/org/omg/PortableServer/ServantActivator.java                        |   18 
generated/org/omg/PortableServer/ServantActivatorHelper.java                  |   90 
generated/org/omg/PortableServer/ServantActivatorOperations.java              |   60 
generated/org/omg/PortableServer/ServantActivatorPOA.java                     |   59 
generated/org/omg/PortableServer/ServantLocator.java                          |   32 
generated/org/omg/PortableServer/ServantLocatorHelper.java                    |  104 
generated/org/omg/PortableServer/ServantLocatorOperations.java                |   67 
generated/org/omg/PortableServer/ServantLocatorPOA.java                       |   73 
generated/org/omg/PortableServer/ServantManager.java                          |   25 
generated/org/omg/PortableServer/ServantManagerOperations.java                |   25 
generated/org/omg/PortableServer/ServantRetentionPolicy.java                  |   18 
generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java        |   23 
generated/org/omg/PortableServer/ServantRetentionPolicyValue.java             |   49 
generated/org/omg/PortableServer/THREAD_POLICY_ID.java                        |   18 
generated/org/omg/PortableServer/ThreadPolicy.java                            |   19 
generated/org/omg/PortableServer/ThreadPolicyOperations.java                  |   24 
generated/org/omg/PortableServer/ThreadPolicyValue.java                       |   48 
generated/org/omg/PortableServer/_ServantActivatorStub.java                   |  112 +
generated/org/omg/PortableServer/_ServantLocatorStub.java                     |  119 +

diffs (truncated from 6536 to 500 lines):

diff -r c03b4d7d5eb0 -r f9a0a601f0dc ChangeLog
--- a/ChangeLog	Wed Nov 07 17:18:01 2007 -0500
+++ b/ChangeLog	Wed Nov 07 17:29:12 2007 -0500
@@ -3,7 +3,6 @@ 2007-11-07  Lillian Angel  <langel at redha
 	* Makefile.am: Added new patch to list.
 	* Makefile.in: Regenerate.
 	* patches/icedtea-docs.patch: New patch to build docs.
-	* generated/*: Removed files that should be ignored.
 	* .hgignore: Updated.
 
 2007-11-07  Lillian Angel  <langel at redhat.com>
diff -r c03b4d7d5eb0 -r f9a0a601f0dc generated/java/lang/CharacterData00.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/java/lang/CharacterData00.java	Wed Nov 07 17:29:12 2007 -0500
@@ -0,0 +1,1110 @@
+// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
+/*
+ * Copyright 2003-2006 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 java.lang;
+
+/** 
+ * The CharacterData00 class encapsulates the large tables once found in
+ * java.lang.Character
+*/
+
+class CharacterData00 extends CharacterData {
+    /* The character properties are currently encoded into 32 bits in the following manner:
+        1 bit   mirrored property
+        4 bits  directionality property
+        9 bits  signed offset used for converting case
+        1 bit   if 1, adding the signed offset converts the character to lowercase
+        1 bit   if 1, subtracting the signed offset converts the character to uppercase
+        1 bit   if 1, this character has a titlecase equivalent (possibly itself)
+        3 bits  0  may not be part of an identifier
+                1  ignorable control; may continue a Unicode identifier or Java identifier
+                2  may continue a Java identifier but not a Unicode identifier (unused)
+                3  may continue a Unicode identifier or Java identifier
+                4  is a Java whitespace character
+                5  may start or continue a Java identifier;
+                   may continue but not start a Unicode identifier (underscores)
+                6  may start or continue a Java identifier but not a Unicode identifier ($)
+                7  may start or continue a Unicode identifier or Java identifier
+                Thus:
+                   5, 6, 7 may start a Java identifier
+                   1, 2, 3, 5, 6, 7 may continue a Java identifier
+                   7 may start a Unicode identifier
+                   1, 3, 5, 7 may continue a Unicode identifier
+                   1 is ignorable within an identifier
+                   4 is Java whitespace
+        2 bits  0  this character has no numeric property
+                1  adding the digit offset to the character code and then
+                   masking with 0x1F will produce the desired numeric value
+                2  this character has a "strange" numeric value
+                3  a Java supradecimal digit: adding the digit offset to the
+                   character code, then masking with 0x1F, then adding 10
+                   will produce the desired numeric value
+        5 bits  digit offset
+        5 bits  character type
+
+        The encoding of character properties is subject to change at any time.
+     */
+
+    int getProperties(int ch) {
+        char offset = (char)ch;
+        int props = A[Y[X[offset>>5]|((offset>>1)&0xF)]|(offset&0x1)];
+        return props;
+    }
+
+    int getType(int ch) {
+        int props = getProperties(ch);
+        return (props & 0x1F);
+    }
+
+    boolean isJavaIdentifierStart(int ch) {
+        int props = getProperties(ch);
+        return ((props & 0x00007000) >= 0x00005000);
+    }
+
+    boolean isJavaIdentifierPart(int ch) {
+        int props = getProperties(ch);
+        return ((props & 0x00003000) != 0);
+    }
+
+    boolean isUnicodeIdentifierStart(int ch) {
+        int props = getProperties(ch);
+        return ((props & 0x00007000) == 0x00007000);
+    }
+
+    boolean isUnicodeIdentifierPart(int ch) {
+        int props = getProperties(ch);
+        return ((props & 0x00001000) != 0);
+    }
+
+    boolean isIdentifierIgnorable(int ch) {
+        int props = getProperties(ch);
+        return ((props & 0x00007000) == 0x00001000);
+    }
+
+    int toLowerCase(int ch) {
+        int mapChar = ch;
+        int val = getProperties(ch);
+
+        if ((val & 0x00020000) != 0) {
+          if ((val & 0x07FC0000) == 0x07FC0000) {
+            switch(ch) {
+              // map the offset overflow chars
+			case 0x0130 : mapChar = 0x0069; break;
+            case 0x2126 : mapChar = 0x03C9; break;
+            case 0x212A : mapChar = 0x006B; break;
+            case 0x212B : mapChar = 0x00E5; break;
+              // map the titlecase chars with both a 1:M uppercase map
+              // and a lowercase map
+            case 0x1F88 : mapChar = 0x1F80; break;
+            case 0x1F89 : mapChar = 0x1F81; break;
+            case 0x1F8A : mapChar = 0x1F82; break;
+            case 0x1F8B : mapChar = 0x1F83; break;
+            case 0x1F8C : mapChar = 0x1F84; break;
+            case 0x1F8D : mapChar = 0x1F85; break;
+            case 0x1F8E : mapChar = 0x1F86; break;
+            case 0x1F8F : mapChar = 0x1F87; break;
+            case 0x1F98 : mapChar = 0x1F90; break;
+            case 0x1F99 : mapChar = 0x1F91; break;
+            case 0x1F9A : mapChar = 0x1F92; break;
+            case 0x1F9B : mapChar = 0x1F93; break;
+            case 0x1F9C : mapChar = 0x1F94; break;
+            case 0x1F9D : mapChar = 0x1F95; break;
+            case 0x1F9E : mapChar = 0x1F96; break;
+            case 0x1F9F : mapChar = 0x1F97; break;
+            case 0x1FA8 : mapChar = 0x1FA0; break;
+            case 0x1FA9 : mapChar = 0x1FA1; break;
+            case 0x1FAA : mapChar = 0x1FA2; break;
+            case 0x1FAB : mapChar = 0x1FA3; break;
+            case 0x1FAC : mapChar = 0x1FA4; break;
+            case 0x1FAD : mapChar = 0x1FA5; break;
+            case 0x1FAE : mapChar = 0x1FA6; break;
+            case 0x1FAF : mapChar = 0x1FA7; break;
+            case 0x1FBC : mapChar = 0x1FB3; break;
+            case 0x1FCC : mapChar = 0x1FC3; break;
+            case 0x1FFC : mapChar = 0x1FF3; break;
+              // default mapChar is already set, so no
+              // need to redo it here.
+              // default       : mapChar = ch;
+            }
+          }
+          else {
+            int offset = val << 5 >> (5+18);
+            mapChar = ch + offset;
+          }
+        }
+        return mapChar;
+    }
+
+    int toUpperCase(int ch) {
+        int mapChar = ch;
+        int val = getProperties(ch);
+
+        if ((val & 0x00010000) != 0) {
+          if ((val & 0x07FC0000) == 0x07FC0000) {
+            switch(ch) {
+              // map chars with overflow offsets
+            case 0x00B5 : mapChar = 0x039C; break;
+            case 0x017F : mapChar = 0x0053; break;
+            case 0x1FBE : mapChar = 0x0399; break;
+              // map char that have both a 1:1 and 1:M map
+            case 0x1F80 : mapChar = 0x1F88; break;
+            case 0x1F81 : mapChar = 0x1F89; break;
+            case 0x1F82 : mapChar = 0x1F8A; break;
+            case 0x1F83 : mapChar = 0x1F8B; break;
+            case 0x1F84 : mapChar = 0x1F8C; break;
+            case 0x1F85 : mapChar = 0x1F8D; break;
+            case 0x1F86 : mapChar = 0x1F8E; break;
+            case 0x1F87 : mapChar = 0x1F8F; break;
+            case 0x1F90 : mapChar = 0x1F98; break;
+            case 0x1F91 : mapChar = 0x1F99; break;
+            case 0x1F92 : mapChar = 0x1F9A; break;
+            case 0x1F93 : mapChar = 0x1F9B; break;
+            case 0x1F94 : mapChar = 0x1F9C; break;
+            case 0x1F95 : mapChar = 0x1F9D; break;
+            case 0x1F96 : mapChar = 0x1F9E; break;
+            case 0x1F97 : mapChar = 0x1F9F; break;
+            case 0x1FA0 : mapChar = 0x1FA8; break;
+            case 0x1FA1 : mapChar = 0x1FA9; break;
+            case 0x1FA2 : mapChar = 0x1FAA; break;
+            case 0x1FA3 : mapChar = 0x1FAB; break;
+            case 0x1FA4 : mapChar = 0x1FAC; break;
+            case 0x1FA5 : mapChar = 0x1FAD; break;
+            case 0x1FA6 : mapChar = 0x1FAE; break;
+            case 0x1FA7 : mapChar = 0x1FAF; break;
+            case 0x1FB3 : mapChar = 0x1FBC; break;
+            case 0x1FC3 : mapChar = 0x1FCC; break;
+            case 0x1FF3 : mapChar = 0x1FFC; break;
+              // ch must have a 1:M case mapping, but we
+              // can't handle it here. Return ch.
+              // since mapChar is already set, no need
+              // to redo it here.
+              //default       : mapChar = ch;
+            }
+          }
+          else {
+            int offset = val  << 5 >> (5+18);
+            mapChar =  ch - offset;
+          }
+        }
+        return mapChar;
+    }
+
+    int toTitleCase(int ch) {
+        int mapChar = ch;
+        int val = getProperties(ch);
+
+        if ((val & 0x00008000) != 0) {
+            // There is a titlecase equivalent.  Perform further checks:
+            if ((val & 0x00010000) == 0) {
+                // The character does not have an uppercase equivalent, so it must
+                // already be uppercase; so add 1 to get the titlecase form.
+                mapChar = ch + 1;
+            }
+            else if ((val & 0x00020000) == 0) {
+                // The character does not have a lowercase equivalent, so it must
+                // already be lowercase; so subtract 1 to get the titlecase form.
+                mapChar = ch - 1;
+            }
+            // else {
+            // The character has both an uppercase equivalent and a lowercase
+            // equivalent, so it must itself be a titlecase form; return it.
+            // return ch;
+            //}
+        }
+        else if ((val & 0x00010000) != 0) {
+            // This character has no titlecase equivalent but it does have an
+            // uppercase equivalent, so use that (subtract the signed case offset).
+            mapChar = toUpperCase(ch);
+        }
+        return mapChar;
+    }
+
+    int digit(int ch, int radix) {
+        int value = -1;
+        if (radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX) {
+            int val = getProperties(ch);
+            int kind = val & 0x1F;
+            if (kind == Character.DECIMAL_DIGIT_NUMBER) {
+                value = ch + ((val & 0x3E0) >> 5) & 0x1F;
+            }
+            else if ((val & 0xC00) == 0x00000C00) {
+                // Java supradecimal digit
+                value = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
+            }
+        }
+        return (value < radix) ? value : -1;
+    }
+
+    int getNumericValue(int ch) {
+        int val = getProperties(ch);
+        int retval = -1;
+
+        switch (val & 0xC00) {
+        default: // cannot occur
+        case (0x00000000):         // not numeric
+            retval = -1;
+            break;
+        case (0x00000400):              // simple numeric
+            retval = ch + ((val & 0x3E0) >> 5) & 0x1F;
+            break;
+        case (0x00000800)      :       // "strange" numeric
+            switch (ch) {
+                case 0x0BF1: retval = 100; break;         // TAMIL NUMBER ONE HUNDRED
+                case 0x0BF2: retval = 1000; break;        // TAMIL NUMBER ONE THOUSAND
+                case 0x1375: retval = 40; break;          // ETHIOPIC NUMBER FORTY
+                case 0x1376: retval = 50; break;          // ETHIOPIC NUMBER FIFTY
+                case 0x1377: retval = 60; break;          // ETHIOPIC NUMBER SIXTY
+                case 0x1378: retval = 70; break;          // ETHIOPIC NUMBER SEVENTY
+                case 0x1379: retval = 80; break;          // ETHIOPIC NUMBER EIGHTY
+                case 0x137A: retval = 90; break;          // ETHIOPIC NUMBER NINETY
+                case 0x137B: retval = 100; break;         // ETHIOPIC NUMBER HUNDRED
+                case 0x137C: retval = 10000; break;       // ETHIOPIC NUMBER TEN THOUSAND
+                case 0x215F: retval = 1; break;           // FRACTION NUMERATOR ONE
+                case 0x216C: retval = 50; break;          // ROMAN NUMERAL FIFTY
+                case 0x216D: retval = 100; break;         // ROMAN NUMERAL ONE HUNDRED
+                case 0x216E: retval = 500; break;         // ROMAN NUMERAL FIVE HUNDRED
+                case 0x216F: retval = 1000; break;        // ROMAN NUMERAL ONE THOUSAND
+                case 0x217C: retval = 50; break;          // SMALL ROMAN NUMERAL FIFTY
+                case 0x217D: retval = 100; break;         // SMALL ROMAN NUMERAL ONE HUNDRED
+                case 0x217E: retval = 500; break;         // SMALL ROMAN NUMERAL FIVE HUNDRED
+                case 0x217F: retval = 1000; break;        // SMALL ROMAN NUMERAL ONE THOUSAND
+                case 0x2180: retval = 1000; break;        // ROMAN NUMERAL ONE THOUSAND C D
+                case 0x2181: retval = 5000; break;        // ROMAN NUMERAL FIVE THOUSAND
+                case 0x2182: retval = 10000; break;       // ROMAN NUMERAL TEN THOUSAND
+
+                case 0x325C: retval = 32; break;
+
+                case 0x325D: retval = 33; break;          // CIRCLED NUMBER THIRTY THREE
+                case 0x325E: retval = 34; break;          // CIRCLED NUMBER THIRTY FOUR
+                case 0x325F: retval = 35; break;          // CIRCLED NUMBER THIRTY FIVE
+                case 0x32B1: retval = 36; break;          // CIRCLED NUMBER THIRTY SIX
+                case 0x32B2: retval = 37; break;          // CIRCLED NUMBER THIRTY SEVEN
+                case 0x32B3: retval = 38; break;          // CIRCLED NUMBER THIRTY EIGHT
+                case 0x32B4: retval = 39; break;          // CIRCLED NUMBER THIRTY NINE
+                case 0x32B5: retval = 40; break;          // CIRCLED NUMBER FORTY
+                case 0x32B6: retval = 41; break;          // CIRCLED NUMBER FORTY ONE
+                case 0x32B7: retval = 42; break;          // CIRCLED NUMBER FORTY TWO
+                case 0x32B8: retval = 43; break;          // CIRCLED NUMBER FORTY THREE
+                case 0x32B9: retval = 44; break;          // CIRCLED NUMBER FORTY FOUR
+                case 0x32BA: retval = 45; break;          // CIRCLED NUMBER FORTY FIVE
+                case 0x32BB: retval = 46; break;          // CIRCLED NUMBER FORTY SIX
+                case 0x32BC: retval = 47; break;          // CIRCLED NUMBER FORTY SEVEN
+                case 0x32BD: retval = 48; break;          // CIRCLED NUMBER FORTY EIGHT
+                case 0x32BE: retval = 49; break;          // CIRCLED NUMBER FORTY NINE
+                case 0x32BF: retval = 50; break;          // CIRCLED NUMBER FIFTY
+
+                default:       retval = -2; break;
+            }
+            break;
+        case (0x00000C00):           // Java supradecimal
+            retval = (ch + ((val & 0x3E0) >> 5) & 0x1F) + 10;
+            break;
+        }
+        return retval;
+    }
+
+    boolean isWhitespace(int ch) {
+        int props = getProperties(ch);
+        return ((props & 0x00007000) == 0x00004000);
+    }
+
+    byte getDirectionality(int ch) {
+        int val = getProperties(ch);
+        byte directionality = (byte)((val & 0x78000000) >> 27);
+        if (directionality == 0xF ) {
+            switch(ch) {
+                case 0x202A :
+                    // This is the only char with LRE
+                    directionality = Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING;
+                    break;
+                case 0x202B :
+                    // This is the only char with RLE
+                    directionality = Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING;
+                    break;
+                case 0x202C :
+                    // This is the only char with PDF
+                    directionality = Character.DIRECTIONALITY_POP_DIRECTIONAL_FORMAT;
+                    break;
+                case 0x202D :
+                    // This is the only char with LRO
+                    directionality = Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE;
+                    break;
+                case 0x202E :
+                    // This is the only char with RLO
+                    directionality = Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE;
+                    break;
+                default :
+                    directionality = Character.DIRECTIONALITY_UNDEFINED;
+                    break;
+            }
+        }
+        return directionality;
+    }
+
+    boolean isMirrored(int ch) {
+        int props = getProperties(ch);
+        return ((props & 0x80000000) != 0);
+    }
+
+    int toUpperCaseEx(int ch) {
+        int mapChar = ch;
+        int val = getProperties(ch);
+
+        if ((val & 0x00010000) != 0) {
+            if ((val & 0x07FC0000) != 0x07FC0000) {
+                int offset = val  << 5 >> (5+18);
+                mapChar =  ch - offset;
+            }
+            else {
+                switch(ch) {
+                    // map overflow characters
+                    case 0x00B5 : mapChar = 0x039C; break;
+                    case 0x017F : mapChar = 0x0053; break;
+                    case 0x1FBE : mapChar = 0x0399; break;
+                    default       : mapChar = Character.ERROR; break;
+                }
+            }
+        }
+        return mapChar;
+    }
+
+    char[] toUpperCaseCharArray(int ch) {
+        char[] upperMap = {(char)ch};
+        int location = findInCharMap(ch);
+        if (location != -1) {
+            upperMap = charMap[location][1];
+        }
+        return upperMap;
+    }
+
+
+    /**
+     * Finds the character in the uppercase mapping table.
+     *
+     * @param ch the <code>char</code> to search
+     * @return the index location ch in the table or -1 if not found
+     * @since 1.4
+     */
+     int findInCharMap(int ch) {
+        if (charMap == null || charMap.length == 0) {
+            return -1;
+        }
+        int top, bottom, current;
+        bottom = 0;
+        top = charMap.length;
+        current = top/2;
+        // invariant: top > current >= bottom && ch >= CharacterData.charMap[bottom][0]
+        while (top - bottom > 1) {
+            if (ch >= charMap[current][0][0]) {
+                bottom = current;
+            } else {
+                top = current;
+            }
+            current = (top + bottom) / 2;
+        }
+        if (ch == charMap[current][0][0]) return current;
+        else return -1;
+    }
+
+    static final CharacterData00 instance = new CharacterData00();
+    private CharacterData00() {};
+
+    // The following tables and code generated using:
+  // java GenerateCharacter -plane 0 -template ../../tools/GenerateCharacter/CharacterData00.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -o /notnfs/langel/icedtea-ecj/generated/java/lang/CharacterData00.java -string -usecharforbyte 11 4 1
+      static final char[][][] charMap;
+// The X table has 2048 entries for a total of 4096 bytes.
+
+  static final char X[] = (
+    "\000\020\040\060\100\120\140\160\200\220\240\260\300\320\340\360\200\u0100"+
+    "\u0110\u0120\u0130\u0140\u0150\u0160\u0170\u0170\u0180\u0190\u01A0\u01B0\u01C0"+
+    "\u01D0\u01E0\u01F0\u0200\200\u0210\200\u0220\u0230\u0240\u0250\u0260\u0270"+
+    "\u0280\u0290\u02A0\u02B0\u02C0\u02D0\u02E0\u02F0\u0300\u0300\u0310\u0320\u0330"+
+    "\u0340\u0350\u0360\u0300\u0370\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360"+
+    "\u0360\u0360\u0380\u0390\u03A0\u03B0\u03C0\u03D0\u03E0\u03F0\u0400\u0410\u0420"+
+    "\u0430\u0440\u0450\u0460\u0470\u03C0\u0480\u0490\u04A0\u04B0\u04C0\u04D0\u04E0"+
+    "\u04F0\u0500\u0510\u0520\u0530\u0540\u0550\u0520\u0530\u0560\u0570\u0520\u0580"+
+    "\u0590\u05A0\u05B0\u05C0\u05D0\u05E0\u0360\u05F0\u0600\u0610\u0360\u0620\u0630"+
+    "\u0640\u0650\u0660\u0670\u0680\u0360\u0690\u06A0\u06B0\u0360\u0360\u06C0\u06D0"+
+    "\u06E0\u0690\u0690\u06F0\u0690\u0690\u0700\u0690\u0710\u0720\u0690\u0730\u0690"+
+    "\u0740\u0750\u0760\u0770\u0750\u0690\u0780\u0790\u0360\u0690\u0690\u07A0\u05C0"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u07B0\u07C0\u0690\u0690\u07D0\u07E0\u07F0\u0800"+
+    "\u0810\u0690\u0820\u0830\u0840\u0850\u0690\u0860\u0870\u0690\u0880\u0360\u0360"+
+    "\u0890\u08A0\u08B0\u08C0\u0360\u0360\u0360\u08D0\u0360\u0360\u0360\u0360\u0360"+
+    "\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360"+
+    "\u0360\u0360\u0360\u0360\u0360\u0360\u08E0\u08F0\u0900\u0910\u0360\u0360\u0360"+
+    "\u0360\200\200\200\200\u0920\200\200\u0930\u0940\u0950\u0960\u0970\u0980\u0990"+
+    "\u09A0\u09B0\u09C0\u09D0\u09E0\u09F0\u0A00\u0A10\u0A20\u0A30\u0A40\u0A50\u0A60"+
+    "\u0A70\u0A80\u0A90\u0AA0\u0AB0\u0AC0\u0AD0\u0AE0\u0AF0\u0B00\u0B10\u0B20\u0B30"+
+    "\u0B40\u0B50\u0B60\u0B70\u0B80\u0B90\u0BA0\u0360\u08D0\u0BB0\u0BC0\u0BD0\u0BE0"+
+    "\u0BF0\u0C00\u0C10\u08D0\u08D0\u08D0\u08D0\u08D0\u0C20\u0C30\u0C40\u0C50\u08D0"+
+    "\u08D0\u0C60\u0C70\u0C80\u0360\u0360\u0C90\u0CA0\u0CB0\u0CC0\u0CD0\u0CE0\u0CF0"+
+    "\u0D00\u08D0\u08D0\u08D0\u08D0\u08D0\u08D0\u08D0\u08D0\u0D10\u0D10\u0D10\u0D10"+
+    "\u0D20\u0D30\u0D40\u0D50\u0D60\u0D70\u0D80\u0D90\u0DA0\u0DB0\u0DC0\u0DD0\u0DE0"+
+    "\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360"+
+    "\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360\u0360"+
+    "\u0360\u0DF0\u08D0\u08D0\u0E00\u08D0\u08D0\u08D0\u08D0\u08D0\u08D0\u0E10\u0E20"+
+    "\u0E30\u0E40\u05C0\u0690\u0E50\u0E60\u0690\u0E70\u0E80\u0E90\u0690\u0690\u0EA0"+
+    "\u0870\u0360\u0EB0\u0EC0\u0ED0\u0EE0\u0EF0\u0ED0\u0F00\u0F10\u0F20\u0B60\u0B60"+
+    "\u0B60\u0F30\u0B60\u0B60\u0F40\u0F50\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+
+    "\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690\u0690"+


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  7 15:38:32 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 07 Nov 2007 23:38:32 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1IpuTg-0004S3-OR@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78


adam at spicenitz.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |REOPENED
         Resolution|INVALID                     |
            Summary|Get rid of the code under   |Use pure Java implementation
                   |native/java/util/zip        |of zlib from Classpath
                   |                            |instead of zlib for
                   |                            |java.util.zip




------- Comment #4 from adam at spicenitz.org  2007-11-07 23:38 -------
Ok, glad system zlib is being used.

I still think getting rid of native zlib usage (system or otherwise) is a good
idea. (Thus "enhancement" severity.) I'll clarify the summary.

It's also a good idea to not trust C code for jpeg and png decoding, and
basically anything else that has to read untrusted datastreams. (But that's a
story for other bugs.)


-- 
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 Nov  7 16:03:38 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 08 Nov 2007 00:03:38 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1Ipury-0004Sz-IL@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #5 from linuxhippy at gmail.com  2007-11-08 00:03 -------
Well, quite often performance does matter especially for large workloads
(compression often means a lot of processing) and there is as far as I know no
java-only zip implementation that performs as well as the native one.


-- 
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 Nov  7 19:42:07 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 08 Nov 2007 03:42:07 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1IpyHP-0004aE-EZ@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #6 from langel at redhat.com  2007-11-08 03:42 -------
I definitely think we should stick to the native implementation especially for
performance reasons.


-- 
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 Nov  7 20:00:28 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 08 Nov 2007 04:00:28 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1IpyZA-0004aa-QV@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #7 from adam at spicenitz.org  2007-11-08 04:00 -------
I've run some simple performance tests. "z.tar" was generated from the Linux
kernel source:
$ git archive --format=tar --verbose v2.6.23 > z.tar

$ java -version
java version "1.7.0"
IcedTea Runtime Environment (build 1.7.0-b21)
IcedTea 64-Bit Server VM (build 1.7.0-b21, mixed mode)


$ pv z.tar  | java TestDeflate gnu > z.tar.zz
using classpath.zip.DeflaterOutputStream
 252MB 0:01:02 [4.02MB/s]
[============================================================>] 100%            


$ pv z.tar  | java TestDeflate sun > z.tar.zz
using java.util.zip.DeflaterOutputStream
 252MB 0:00:53 [4.76MB/s]
[============================================================>] 100%            


$ pv z.tar.zz  | java TestInflate gnu > /dev/null
using classpath.zip.InflaterInputStream
54.7MB 0:00:04 [13.4MB/s]
[============================================================>] 100%            


$ pv z.tar.zz  | java TestInflate sun > /dev/null
using java.util.zip.InflaterInputStream
54.7MB 0:00:03 [15.2MB/s]
[============================================================>] 100%            



Not as good as native, but not too bad? Plus, these are short runs, so hotspot
presumably would improve performance a bit more over time. It's definitely a
performance hit, but is it bad enough to forget the idea? (How bad is selinux?
How about -D_FORTIFY_SOURCE=2?) And won't we all be a bit pleased when the next
zlib vulnerability is found.

It's probably not such a big deal, but I just spent the week reading the
libtiff source code, and I've become pretty skeptical of any compression code
written in C. So ignore me if I'm too crazy. :-)


-- 
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 Nov  7 20:01:26 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 08 Nov 2007 04:01:26 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1Ipya6-0004aj-Pj@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #8 from adam at spicenitz.org  2007-11-08 04:01 -------
Created an attachment (id=29)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=29&action=view)
Code for performance comparisons


-- 
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 aph at redhat.com  Thu Nov  8 02:35:29 2007
From: aph at redhat.com (Andrew Haley)
Date: Thu, 8 Nov 2007 10:35:29 +0000
Subject: Re-implemented ecj support
In-Reply-To: <473216FC.4020502@redhat.com>
References: <47320CDA.90604@redhat.com>
	<473216FC.4020502@redhat.com>
Message-ID: <18226.58993.418594.310673@zebedee.pink>

Lillian Angel writes:
 > Be aware that the build is broken on x86_64 because of this bug in b22:
 > http://bugs.sun.com/view_bug.do?bug_id=6616627
 > 
 > It will be fixed when we upgrade to b23/b24.

How come we didn't notice this before now?

Andrew.

-- 
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903


From twisti at complang.tuwien.ac.at  Thu Nov  8 02:41:03 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Thu, 08 Nov 2007 11:41:03 +0100
Subject: FYI: transplanting changsets (aka. rebase)
Message-ID: <1194518463.29693.11.camel@c1.complang.tuwien.ac.at>

Hi!

The last email flood (yesterday) was my second transplanting of the
changesets from the default branch to the cacao branch.  I'll do this
from time to time to keep the cacao branch up to date for later merging
back to the default branch (if that will ever happen).

transplant is a Mercurial extension that is enabled by default.  As for
other commands

$ hg help transplant

gives you a help screen.

Here's a quick overview of how I transplant the changesets:

- Switch to the cacao branch.  You can check this with:

$ hg branch
cacao

- Transplant all changesets from the default branch to the cacao branch
(this is also called rebase):

$ hg transplant --branch default --all

As the help states:

    hg transplant --branch REVISION --all will rebase the selected branch
    (up to the named revision) onto your current working directory.

Most likely a transplant will give you some merge conflicts, but
Mercurial will tell you what to do (hint: hg transplant --continue).

Maybe Mark can stop the email flooding...

- twisti


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  8 04:18:13 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 08 Nov 2007 12:18:13 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1Iq6Kr-0005HS-RI@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #9 from aph at redhat.com  2007-11-08 12:18 -------
I'm skeptical about this idea.  Java having private copies of things is in
general a bad idea, as the problems when updating tzdata showed.  If we use
system libraries, we get updates as required with the OS.  Also, this would be
a divergence from upstream OpenJDK.  Finally, there's no reason to believe that
system zlib will have any more bugs than Classpath's.

Any divergences from upstream OpenJDK have to be justified by strong arguemnts.
 "But it's written in C!" is a religious argument, not a technical one.


-- 
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 Nov  8 04:22:35 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 08 Nov 2007 12:22:35 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1Iq6P5-0005Hh-W9@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78





------- Comment #10 from linuxhippy at gmail.com  2007-11-08 12:22 -------
>  "But it's written in C!" is a religious argument, not a technical one.
Although my opinion is that the native zlib is a good idea, I don't think that
"written in C" is only an religious argument.
Bugs happen everywhere, be it with C or Java - but buggy code in Java just
won't work (exception, ...) whereas bad written C code allows to get evil code
in.
The examples with the AWT secuirty hohles in history just prooves 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 twisti at complang.tuwien.ac.at  Thu Nov  8 04:25:19 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Thu, 08 Nov 2007 13:25:19 +0100
Subject: changeset in /hg/icedtea: 2007-11-01 Gary Benson <gbenson@redh...
In-Reply-To: <20071107115807.GB3656@redhat.com>
References: <hg.fb428e9dbfa6.1193929384.-6899778133799504387@icedtea.classpath.org>
	<1194014083.15194.0.camel@localhost.localdomain>
	<20071102145053.GA3733@redhat.com>
	<1194259580.16845.6.camel@c1.complang.tuwien.ac.at>
	<20071106124443.GB3734@redhat.com>
	<1194432357.32318.0.camel@localhost.localdomain>
	<20071107110415.GA3656@redhat.com>
	<1194434291.32318.5.camel@localhost.localdomain>
	<20071107115807.GB3656@redhat.com>
Message-ID: <1194524719.29693.15.camel@c1.complang.tuwien.ac.at>

On Wed, 2007-11-07 at 11:58 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Wed, 2007-11-07 at 11:04 +0000, Gary Benson wrote:
> > > Christian Thalinger wrote:
> > > > On Tue, 2007-11-06 at 12:44 +0000, Gary Benson wrote:
> > > > > Oh, I didn't realise what you meant by that, but it just
> > > > > dawned on me that the ppc cases are also redundant in that
> > > > > they do exactly what the default case does.  Mind if I remove
> > > > > them too?
> > > > 
> > > > No, that not true.  The PowerPC cases map powerpc to ppc and
> > > > powerpc64 to ppc64.  We need them.
> > > 
> > > The default case handles that mapping though:
> > > 
> > >   case "${host}" in
> > >     x86_64-*-*)
> > >       BUILD_ARCH_DIR=amd64
> > >       INSTALL_ARCH_DIR=amd64
> > >       ;;
> > >     i?86-*-*)
> > >       BUILD_ARCH_DIR=i586
> > >       INSTALL_ARCH_DIR=i386
> > >       ;;
> > >     *)
> > >       BUILD_ARCH_DIR=`uname -m`
> > >       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
> > >       ;;
> > >   esac
> > > 
> > > This is what I'm using at the moment.
> > 
> > Ahh, I missed that we're using `uname -m' and not the host triplet.
> > Sorry.  Yes, then we can remove it.
> 
> Done :)

Thanks, works.

- twisti


From gbenson at redhat.com  Thu Nov  8 04:47:22 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 8 Nov 2007 12:47:22 +0000
Subject: IcedTea PPC patches: ok to commit?
Message-ID: <20071108124722.GB3697@redhat.com>

Hi all,

Would anyone object to my committing these patches to IcedTea?
The final PPC port isn't ready but twisti and I are chasing each
others' tails with this stuff, and I'd like to stop duplicating
work.

Cheers,
Gary
-------------- next part --------------
diff -r b3238230c1ef openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:14:32 2007 +0000
+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:15:45 2007 +0000
@@ -63,7 +63,6 @@ union frame_manager_message {
 };
 
 class BytecodeInterpreter : StackObj {
-friend class SharedRuntime;
 friend class AbstractInterpreterGenerator;
 friend class CppInterpreterGenerator;
 friend class InterpreterGenerator;
diff -r bae119bcbcd0 openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:08:47 2007 +0000
+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:21:08 2007 +0000
@@ -521,16 +521,16 @@ BytecodeInterpreter::run(interpreterStat
 
 /* 0xC0 */ &&opc_checkcast,   &&opc_instanceof,     &&opc_monitorenter, &&opc_monitorexit,
 /* 0xC4 */ &&opc_wide,        &&opc_multianewarray, &&opc_ifnull,       &&opc_ifnonnull,
-/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_fast_igetfield,
-/* 0xCC */ &&opc_fastagetfield,&&opc_fast_aload_0,  &&opc_fast_iaccess_0, &&opc__fast_aaccess_0,
-
-/* 0xD0 */ &&opc_fast_linearswitch, &&opc_fast_binaryswitch, &&opc_return_register_finalizer,      &&opc_default,
+/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_default,
+/* 0xCC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+
+/* 0xD0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
 /* 0xD4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
 /* 0xD8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
 /* 0xDC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
 
 /* 0xE0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
-/* 0xE4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+/* 0xE4 */ &&opc_default,     &&opc_return_register_finalizer, &&opc_default, &&opc_default,
 /* 0xE8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
 /* 0xEC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
 
-------------- next part --------------
diff -r ee6af95bc459 openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp
--- openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp	Fri Nov 02 09:42:25 2007 +0000
+++ openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp	Fri Nov 02 09:44:37 2007 +0000
@@ -284,7 +284,7 @@ class MaskFillerForNative: public Native
  public:
   void pass_int()                                { /* ignore */ }
   void pass_long()                               { /* ignore */ }
-#ifdef _LP64
+#if defined(_LP64) || defined(PPC)
   void pass_float()                              { /* ignore */ }
 #endif
   void pass_double()                             { /* ignore */ }
diff -r ee6af95bc459 openjdk/hotspot/src/share/vm/runtime/signature.hpp
--- openjdk/hotspot/src/share/vm/runtime/signature.hpp	Fri Nov 02 09:42:25 2007 +0000
+++ openjdk/hotspot/src/share/vm/runtime/signature.hpp	Fri Nov 02 09:48:28 2007 +0000
@@ -278,11 +278,14 @@ class NativeSignatureIterator: public Si
 
   void do_bool  ()                     { pass_int();    _jni_offset++; _offset++;       }
   void do_char  ()                     { pass_int();    _jni_offset++; _offset++;       }
+#if defined(_LP64) || defined(PPC)
+  void do_float ()                     { pass_float();  _jni_offset++; _offset++;       }
+#else
+  void do_float ()                     { pass_int();    _jni_offset++; _offset++;       }
+#endif  
 #ifdef _LP64
-  void do_float ()                     { pass_float();  _jni_offset++; _offset++;       }
   void do_double()                     { pass_double(); _jni_offset++; _offset += 2;    }
 #else
-  void do_float ()                     { pass_int();    _jni_offset++; _offset++;       }
   void do_double()                     { pass_double(); _jni_offset += 2; _offset += 2; }
 #endif
   void do_byte  ()                     { pass_int();    _jni_offset++; _offset++;       }
@@ -306,8 +309,10 @@ class NativeSignatureIterator: public Si
   virtual void pass_int()              = 0;
   virtual void pass_long()             = 0;
   virtual void pass_object()           = 0;
+#if defined(_LP64) || defined(PPC)
+  virtual void pass_float()            = 0;
+#endif
 #ifdef _LP64
-  virtual void pass_float()            = 0;
   virtual void pass_double()           = 0;
 #else
   virtual void pass_double()           { pass_long(); }  // may be same as long
-------------- next part --------------
diff -r 9523b5ae0184 openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp
--- openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp	Fri Nov 02 09:26:45 2007 +0000
+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp	Fri Nov 02 09:39:12 2007 +0000
@@ -84,7 +84,7 @@ class CodeSection VALUE_OBJ_CLASS_SPEC {
   address     _locs_point;      // last relocated position (grows upward)
   bool        _locs_own;        // did I allocate the locs myself?
   bool        _frozen;          // no more expansion of this section
-  char        _index;           // my section number (SECT_INST, etc.)
+  signed char _index;           // my section number (SECT_INST, etc.)
   CodeBuffer* _outer;           // enclosing CodeBuffer
 
   // (Note:  _locs_point used to be called _last_reloc_offset.)
diff -r 9523b5ae0184 openjdk/hotspot/src/share/vm/utilities/ostream.cpp
--- openjdk/hotspot/src/share/vm/utilities/ostream.cpp	Fri Nov 02 09:26:45 2007 +0000
+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp	Fri Nov 02 09:37:53 2007 +0000
@@ -832,7 +832,7 @@ bool networkStream::connect(const char *
   server.sin_port = htons(port);
 
   server.sin_addr.s_addr = inet_addr(ip);
-  if (server.sin_addr.s_addr == (unsigned long)-1) {
+  if (server.sin_addr.s_addr == (in_addr_t)-1) {
 #ifdef _WINDOWS
     struct hostent* host = hpi::get_host_by_name((char*)ip);
 #else
-------------- next part --------------
diff -r d384f5a5bd0c hotspot/src/share/vm/prims/jni.cpp
--- openjdk/hotspot/src/share/vm/prims/jni.cpp	Mon Aug 06 13:11:51 2007 +0100
+++ openjdk/hotspot/src/share/vm/prims/jni.cpp	Fri Sep 14 09:58:33 2007 +0100
@@ -3212,6 +3212,21 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_
   jint result = JNI_ERR;
   DT_RETURN_MARK(CreateJavaVM, jint, (const jint&)result);
 
+  // We're about to use Atomic::xchg for locking.  On Aztec platforms
+  // this is implemented using the GCC builtin __sync_lock_test_and_set
+  // which is not guaranteed to do what we're using it for on all
+  // platforms.  So we check it works before doing anything else.
+#ifdef ASSERT
+  {
+    jint a = 0xCAFEBABE;
+    jint b = Atomic::xchg(0xC0FFEE, &a);
+    void *c = &a;
+    void *d = Atomic::xchg_ptr(&b, &c);
+    assert(a == 0xC0FFEE && b == (jint) 0xCAFEBABE, "Atomic::xchg() works");
+    assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
+  }
+#endif // ASSERT
+  
   // At the moment it's only possible to have one Java VM,
   // since some of the runtime state is in global variables.
 
-------------- next part --------------
diff -ru openjdk.orig/control/make/hotspot-rules.gmk openjdk/control/make/hotspot-rules.gmk
--- openjdk.orig/control/make/hotspot-rules.gmk	2007-10-12 08:45:09.000000000 +0100
+++ openjdk/control/make/hotspot-rules.gmk	2007-11-08 09:40:57.000000000 +0000
@@ -75,6 +75,11 @@
   HOTSPOT_TARGET = all_fastdebug
 endif
 
+# Use the special build targets on PPC for now
+ifneq ($(findstring ppc,$(ARCH)),)
+  HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
+endif
+
 HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
 HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
 HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
diff -ru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
--- openjdk.orig/hotspot/make/Makefile	2007-10-12 08:45:12.000000000 +0100
+++ openjdk/hotspot/make/Makefile	2007-11-08 09:40:57.000000000 +0000
@@ -91,6 +91,15 @@
 all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
 all_optimized: optimized optimized1 optimizedkernel docs export_optimized
 
+# Core (non-compiler) targets made available with this Makefile
+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
+
+allcore:           all_productcore all_fastdebugcore
+all_productcore:   productcore docs export_product
+all_fastdebugcore: fastdebugcore docs export_fastdebug
+all_debugcore:     jvmgcore docs export_debug
+all_optimizedcore: optimizedcore docs export_optimized
+
 # Do everything
 world:         all create_jdk
 
@@ -117,6 +126,10 @@
 	$(CD) $(GAMMADIR)/make; \
 	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
 
+$(CORE_VM_TARGETS):
+	$(CD) $(GAMMADIR)/make; \
+	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
+
 # Build compiler1 (client) rule, different for platforms
 generic_build1:
 	$(MKDIR) -p $(OUTPUTDIR)
@@ -207,17 +220,24 @@
 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
 KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
+CORE_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
+CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR)
 
-# Misc files and generated files need to come from C1 or C2 area
-ifeq ($(ARCH_DATA_MODEL), 32)
-  MISC_DIR=$(C1_DIR)
-  GEN_DIR=$(C1_BASE_DIR)/generated
+# Misc files and generated files need to come from the correct area
+ifneq ($(findstring ppc,$(ARCH)),)
+  MISC_DIR=$(CORE_DIR)
+  GEN_DIR=$(CORE_BASE_DIR)/generated
 else
-  MISC_DIR=$(C2_DIR)
-  GEN_DIR=$(C2_BASE_DIR)/generated
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    MISC_DIR=$(C1_DIR)
+    GEN_DIR=$(C1_BASE_DIR)/generated
+  else
+    MISC_DIR=$(C2_DIR)
+    GEN_DIR=$(C2_BASE_DIR)/generated
+  endif
 endif
 
 # Bin files (windows)
@@ -268,8 +288,13 @@
 	$(install-file)
 $(EXPORT_CLIENT_DIR)/64/%.so:    $(C1_DIR)/%.so
 	$(install-file)
+ifneq ($(findstring ppc,$(ARCH)),)
+$(EXPORT_SERVER_DIR)/%.so:       $(CORE_DIR)/%.so
+	$(install-file)
+else
 $(EXPORT_SERVER_DIR)/%.so:       $(C2_DIR)/%.so
 	$(install-file)
+endif
 $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
 	$(install-file)
 endif
diff -ru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2007-10-12 08:46:18.000000000 +0100
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 09:40:57.000000000 +0000
@@ -95,8 +95,12 @@
 #ifdef TIERED
   #define VMTYPE "Server"
 #else
+#if defined(COMPILER1) || defined(COMPILER2)
   #define VMTYPE COMPILER1_PRESENT("Client")   \
                  COMPILER2_PRESENT("Server")   
+#else
+  #define VMTYPE "Core"
+#endif // COMPILER1 || COMPILER2
 #endif // TIERED
 #endif // KERNEL
 
diff -ru openjdk.orig/j2se/make/java/redist/Makefile openjdk/j2se/make/java/redist/Makefile
--- openjdk.orig/j2se/make/java/redist/Makefile	2007-10-12 08:54:05.000000000 +0100
+++ openjdk/j2se/make/java/redist/Makefile	2007-11-08 09:40:57.000000000 +0000
@@ -94,8 +94,14 @@
   endif
 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)
   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
 endif
@@ -119,8 +125,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
@@ -158,10 +163,11 @@
   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
 endif 
 
-ifeq ($(ARCH_DATA_MODEL), 32)
-
-IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
+ifeq ($(INCLUDE_CLIENT), true)
+  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
+endif
 
+ifeq ($(ARCH_DATA_MODEL), 32)
 ifeq ($(PLATFORM), solaris)
 #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
 
-------------- next part --------------
diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
--- openjdk.orig/corba/make/common/Defs-linux.gmk	2007-11-08 10:52:39.000000000 +0000
+++ openjdk/corba/make/common/Defs-linux.gmk	2007-11-08 10:55:41.000000000 +0000
@@ -196,7 +196,11 @@
 
 EXTRA_LIBS += -lc
 
-LDFLAGS_DEFS_OPTION  = -z defs
+ifneq ($(findstring ppc,$(ARCH)),)
+  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
+else
+  LDFLAGS_DEFS_OPTION  = -z defs
+endif
 LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
 
 #
diff -ru openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-11-08 10:52:39.000000000 +0000
+++ openjdk/j2se/make/common/Defs-linux.gmk	2007-11-08 10:55:41.000000000 +0000
@@ -204,7 +204,11 @@
 
 EXTRA_LIBS += -lc
 
-LDFLAGS_DEFS_OPTION  = -z defs
+ifneq ($(findstring ppc,$(ARCH)),)
+  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
+else
+  LDFLAGS_DEFS_OPTION  = -z defs
+endif
 LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
 
 #
diff -ru openjdk.orig/j2se/make/common/Program.gmk openjdk/j2se/make/common/Program.gmk
--- openjdk.orig/j2se/make/common/Program.gmk	2007-11-08 10:52:39.000000000 +0000
+++ openjdk/j2se/make/common/Program.gmk	2007-11-08 10:55:41.000000000 +0000
@@ -85,7 +85,11 @@
 	endif
     endif
     ifeq ($(PLATFORM), linux)
-	LDFLAGS += -lz -z origin
+	ifneq ($(findstring ppc,$(ARCH)),)
+	    LDFLAGS += -lz -Wl,-z -Wl,origin
+	else
+	    LDFLAGS += -lz -z origin
+	endif
 	LDFLAGS += -Wl,--allow-shlib-undefined
 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
diff -ru openjdk.orig/j2se/make/java/instrument/Makefile openjdk/j2se/make/java/instrument/Makefile
--- openjdk.orig/j2se/make/java/instrument/Makefile	2007-11-08 10:52:39.000000000 +0000
+++ openjdk/j2se/make/java/instrument/Makefile	2007-11-08 10:55:41.000000000 +0000
@@ -109,7 +109,11 @@
     LDFLAGS += -R \$$ORIGIN/jli
   endif
   ifeq ($(PLATFORM), linux)
-    LDFLAGS += -z origin
+    ifneq ($(findstring ppc,$(ARCH)),)
+      LDFLAGS += -Wl,-z -Wl,origin
+    else
+      LDFLAGS += -z origin
+    endif
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
   endif
-------------- next part --------------
diff -ru openjdk.orig/hotspot/build/linux/makefiles/buildtree.make openjdk/hotspot/build/linux/makefiles/buildtree.make
--- openjdk.orig/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:36:15.000000000 +0000
@@ -317,6 +317,8 @@
 DATA_MODE/sparcv9 = 64
 DATA_MODE/amd64   = 64
 DATA_MODE/ia64    = 64
+DATA_MODE/ppc     = 32
+DATA_MODE/ppc64   = 64
 
 JAVA_FLAG/32 = -d32
 JAVA_FLAG/64 = -d64
diff -ru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
--- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/build/linux/makefiles/defs.make	2007-11-08 11:36:15.000000000 +0000
@@ -87,6 +87,21 @@
   HS_ARCH          = x86
 endif
 
+# ppc and ppc64
+ifneq ($(findstring ppc,$(ARCH)),)
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    ARCH_DATA_MODEL  = 64
+    MAKE_ARGS        += LP64=1
+    PLATFORM         = linux-ppc64
+    VM_PLATFORM      = linux_ppc64
+  else
+    ARCH_DATA_MODEL  = 32
+    PLATFORM         = linux-ppc
+    VM_PLATFORM      = linux_ppc
+  endif
+  HS_ARCH            = ppc
+endif
+
 JDK_INCLUDE_SUBDIR=linux
 
 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
@@ -94,20 +109,16 @@
 
 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-ifeq ($(ARCH_DATA_MODEL), 32)
-  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
+ifneq ($(HS_ARCH), ppc)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
+  endif
   EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
   EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
-else
-  ifeq ($(ARCH),ia64)
-    else
-      EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
-      EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
-    endif
 endif
diff -ru openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
--- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-11-08 11:36:15.000000000 +0000
@@ -73,6 +73,8 @@
 ARCHFLAG/ia64    =
 ARCHFLAG/sparc   = -m32 -mcpu=v9
 ARCHFLAG/sparcv9 = -m64 -mcpu=v9
+ARCHFLAG/ppc     = -m32
+ARCHFLAG/ppc64   = -m64
 
 CFLAGS     += $(ARCHFLAG)
 AOUT_FLAGS += $(ARCHFLAG)
diff -ru openjdk.orig/hotspot/build/linux/makefiles/sa.make openjdk/hotspot/build/linux/makefiles/sa.make
--- openjdk.orig/hotspot/build/linux/makefiles/sa.make	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/build/linux/makefiles/sa.make	2007-11-08 11:36:15.000000000 +0000
@@ -51,10 +51,10 @@
 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
 
 # if $(AGENT_DIR) does not exist, we don't build SA
-# also, we don't build SA on Itanium.
+# also, we don't build SA on Itanium or PPC.
 
 all: 
-	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
+	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "ppc" ] ; then \
 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
 	fi
 
diff -ru openjdk.orig/hotspot/build/linux/makefiles/saproc.make openjdk/hotspot/build/linux/makefiles/saproc.make
--- openjdk.orig/hotspot/build/linux/makefiles/saproc.make	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/build/linux/makefiles/saproc.make	2007-11-08 11:36:15.000000000 +0000
@@ -44,10 +44,10 @@
 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
 
 # if $(AGENT_DIR) does not exist, we don't build SA
-# also, we don't build SA on Itanium.
+# also, we don't build SA on Itanium or PPC.
 
 checkAndBuildSA:
-	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
+	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "ppc" ] ; then \
 	   $(MAKE) -f vm.make $(LIBSAPROC); \
 	fi
 
diff -ru openjdk.orig/hotspot/make/defs.make openjdk/hotspot/make/defs.make
--- openjdk.orig/hotspot/make/defs.make	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/make/defs.make	2007-11-08 11:36:15.000000000 +0000
@@ -191,15 +191,17 @@
 
   # Use uname output for SRCARCH, but deal with platform differences. If ARCH
   # is not explicitly listed below, it is treated as x86. 
-  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64,$(ARCH)))
+  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64,$(ARCH)))
   ARCH/       = x86
   ARCH/sparc  = sparc
   ARCH/sparc64= sparc
   ARCH/ia64   = ia64
   ARCH/amd64  = x86
   ARCH/x86_64 = x86
+  ARCH/ppc    = ppc
+  ARCH/ppc64  = ppc
 
-  # BUILDARCH is usually the same as SRCARCH, except for sparcv9
+  # BUILDARCH is usually the same as SRCARCH, except for sparcv9 and ppc64
   BUILDARCH = $(SRCARCH)
   ifeq ($(BUILDARCH), x86)
     ifdef LP64
@@ -208,10 +210,13 @@
       BUILDARCH = i486
     endif
   endif
-  ifeq ($(BUILDARCH), sparc)
-    ifdef LP64
+  ifdef LP64
+    ifeq ($(BUILDARCH), sparc)
       BUILDARCH = sparcv9
     endif
+    ifeq ($(BUILDARCH), ppc)
+      BUILDARCH = ppc64
+    endif
   endif
 
   # LIBARCH is 1:1 mapping from BUILDARCH
@@ -221,8 +226,10 @@
   LIBARCH/sparc   = sparc
   LIBARCH/sparcv9 = sparcv9
   LIBARCH/ia64    = ia64
+  LIBARCH/ppc     = ppc
+  LIBARCH/ppc64   = ppc64
 
-  LP64_ARCH = sparcv9 amd64 ia64
+  LP64_ARCH = sparcv9 amd64 ia64 ppc64
 endif
 
 # Required make macro settings for all platforms
diff -ru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-11-08 11:36:15.000000000 +0000
@@ -174,6 +174,12 @@
 #  else
 static char cpu_arch[] = "sparc";
 #  endif
+#elif defined(PPC)
+#  ifdef _LP64
+static char cpu_arch[] = "ppc64";
+#  else
+static char cpu_arch[] = "ppc";
+#  endif
 #else
 #error Add appropriate cpu_arch setting
 #endif
@@ -2375,7 +2381,8 @@
     // format has been changed), we'll use the largest page size supported by
     // the processor.
 
-    _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M);
+    _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M)
+      SPARC_ONLY(4 * M) PPC_ONLY(16 * M);
 
     FILE *fp = fopen("/proc/meminfo", "r");
     if (fp) {
diff -ru openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp openjdk/hotspot/src/share/vm/runtime/mutex.hpp
--- openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:36:15.000000000 +0000
@@ -64,19 +64,15 @@
 } ; 
 
 // Endian-ness ... index of least-significant byte in SplitWord.Bytes[]
-#ifdef AMD64        // little
+#if defined(IA32) || defined(AMD64) || defined(IA64) // little
  #define _LSBINDEX 0
 #else
-#if IA32            // little
- #define _LSBINDEX 0
-#else
-#ifdef SPARC        // big
+#if defined(SPARC) || defined(PPC) // big
  #define _LSBINDEX (sizeof(intptr_t)-1)
 #else
  #error "unknown architecture"
 #endif
 #endif
-#endif
 
 class ParkEvent ;  
 
diff -ru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 11:36:15.000000000 +0000
@@ -150,7 +150,8 @@
 #define CPU      IA32_ONLY("x86")                \
                  IA64_ONLY("ia64")               \
                  AMD64_ONLY("amd64")             \
-                 SPARC_ONLY("sparc")
+                 SPARC_ONLY("sparc")             \
+                 PPC_ONLY("ppc")
 
 const char *Abstract_VM_Version::vm_platform_string() {
   return OS "-" CPU;
diff -ru openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp openjdk/hotspot/src/share/vm/utilities/macros.hpp
--- openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/src/share/vm/utilities/macros.hpp	2007-11-08 11:36:15.000000000 +0000
@@ -179,6 +179,14 @@
 #define NOT_SPARC(code) code
 #endif
 
+#ifdef PPC
+#define PPC_ONLY(code) code
+#define NOT_PPC(code)
+#else
+#define PPC_ONLY(code)
+#define NOT_PPC(code) code
+#endif
+
 #define FIX_THIS(code) report_assertion_failure("FIX_THIS",__FILE__, __LINE__, "")
 
 #define define_pd_global(type, name, value) const type pd_##name = value;
diff -ru openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-11-08 11:35:35.000000000 +0000
+++ openjdk/j2se/make/common/Defs-linux.gmk	2007-11-08 11:36:15.000000000 +0000
@@ -109,6 +109,10 @@
 LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
 CFLAGS_REQUIRED_sparc   += -m32 -mcpu=v9
 LDFLAGS_COMMON_sparc    += -m32 -mcpu=v9
+CFLAGS_REQUIRED_ppc     += -m32
+LDFLAGS_COMMON_ppc      += -m32
+CFLAGS_REQUIRED_ppc64   += -m64
+LDFLAGS_COMMON_ppc64    += -m64
 CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
 LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
 
diff -ru openjdk.orig/j2se/make/common/shared/Compiler-gcc.gmk openjdk/j2se/make/common/shared/Compiler-gcc.gmk
--- openjdk.orig/j2se/make/common/shared/Compiler-gcc.gmk	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/j2se/make/common/shared/Compiler-gcc.gmk	2007-11-08 11:36:15.000000000 +0000
@@ -74,13 +74,13 @@
     # sparc or sparcv9
     REQUIRED_CC_VER = 4.0
     REQUIRED_GCC_VER = 4.0.*
-  else
-  ifeq ($(ARCH_DATA_MODEL), 32)
+  endif
+  ifeq ($(ARCH), i586)
     # i586
     REQUIRED_CC_VER = 3.2
     REQUIRED_GCC_VER = 3.2.1*
     REQUIRED_GCC_VER_INT = 3.2.1-7a
-  else
+  endif
   ifeq ($(ARCH), amd64)
     # amd64
     REQUIRED_CC_VER = 3.2
@@ -91,7 +91,10 @@
     REQUIRED_CC_VER = 3.2
     REQUIRED_GCC_VER = 2.9[56789].*
   endif
-  endif
+  ifneq ("$(findstring ppc,$(ARCH))", "")
+    # ppc or ppc64
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
   endif
   # Option used to create a shared library
   SHARED_LIBRARY_FLAG = -shared -mimpure-text
diff -ru openjdk.orig/j2se/make/common/shared/Platform.gmk openjdk/j2se/make/common/shared/Platform.gmk
--- openjdk.orig/j2se/make/common/shared/Platform.gmk	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/j2se/make/common/shared/Platform.gmk	2007-11-08 11:36:15.000000000 +0000
@@ -203,6 +203,9 @@
                 sparc*) \
                     echo sparc \
                     ;; \
+                ppc*) \
+                    echo ppc \
+                    ;; \
                 *) \
                     echo $(mach) \
                     ;; \
@@ -211,19 +214,25 @@
   ARCH_FAMILY := $(ARCH)
 
   # Linux builds may be 32-bit or 64-bit data model.
-  ifeq ($(ARCH), sparc)
-    # Linux sparc build can be either 32-bit or 64-bit.
+  ifneq ($(filter sparc ppc,$(ARCH)),)
+    # Linux sparc and ppc builds can be either 32-bit or 64-bit.
     #   Default to 32, but allow explicit setting to 32 or 64.
     ifndef ARCH_DATA_MODEL
       ARCH_DATA_MODEL=32
     endif
-    ifeq ($(ARCH_DATA_MODEL), 32)
-      ARCH=sparc
-    else
-      ARCH=sparcv9
+    ifeq ($(ARCH_DATA_MODEL), 64)
+      archExpr = case "$(ARCH)" in \
+                   sparc) \
+                       echo sparcv9 \
+                       ;; \
+                   ppc) \
+                       echo ppc64 \
+                       ;; \
+                 esac
+      ARCH := $(shell $(archExpr))
     endif
   else
-    # i586 is 32-bit, amd64 is 64-bit
+    # i586 is 32-bit, amd64 and ia64 are 64-bit
     ifndef ARCH_DATA_MODEL
       ifeq ($(ARCH), i586)
         ARCH_DATA_MODEL=32
diff -ru openjdk.orig/j2se/make/javax/sound/SoundDefs.gmk openjdk/j2se/make/javax/sound/SoundDefs.gmk
--- openjdk.orig/j2se/make/javax/sound/SoundDefs.gmk	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/j2se/make/javax/sound/SoundDefs.gmk	2007-11-08 11:36:15.000000000 +0000
@@ -71,6 +71,10 @@
   CPPFLAGS += -DX_ARCH=X_AMD64
 endif # ARCH amd64
 
+ifeq ($(ARCH), ppc)
+  CPPFLAGS += -DX_ARCH=X_PPC
+endif # ARCH ppc
+
 
 # files needed for MIDI i/o
 MIDIFILES_c = \
diff -ru openjdk.orig/j2se/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/j2se/src/share/native/com/sun/media/sound/SoundDefs.h
--- openjdk.orig/j2se/src/share/native/com/sun/media/sound/SoundDefs.h	2007-11-08 11:34:54.000000000 +0000
+++ openjdk/j2se/src/share/native/com/sun/media/sound/SoundDefs.h	2007-11-08 11:36:15.000000000 +0000
@@ -38,6 +38,7 @@
 #define X_SPARCV9       3
 #define X_IA64          4
 #define X_AMD64         5
+#define X_PPC           6
 
 // **********************************
 // Make sure you set X_PLATFORM and X_ARCH defines correctly.

From gnu_andrew at member.fsf.org  Thu Nov  8 04:58:08 2007
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 8 Nov 2007 12:58:08 +0000
Subject: Re-implemented ecj support
In-Reply-To: <47320CDA.90604@redhat.com>
References: <47320CDA.90604@redhat.com>
Message-ID: <17c6771e0711080458v3deb8cefwe8af9fe5dc15b2a2@mail.gmail.com>

On 07/11/2007, Lillian Angel <langel at redhat.com> wrote:
>
> Hi,
>
> I have just added ecj support back into IcedTea.
>
> To build with ecj and bootstrap:
> ./configure && make
>
> To bootstrap with an old IcedTea build:
> ./configure --with-icedtea [/usr/lib/jvm/java-icedtea] && make
> OR
> ./configure --with-icedtea-home=/path/to/icedtea && make
>
> Use --with-gcj-home=/path/to/gcj to specify where gcj is installed,
> default location is /usr/lib/jvm/java-gcj. This is needed to link a
> few corba libs using libgcj.
>
>
> Other than that, everything should work fine. If there are any bugs,
> please contact me asap.
>
> Cheers,
> Lillian
>
>

Many thanks for all the hard work on this by you and the other IcedTea
developers!
-- 
Andrew :-)

Help end the Java Trap!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071108/4dc9403f/attachment.html 

From langel at redhat.com  Thu Nov  8 05:08:20 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 08 Nov 2007 08:08:20 -0500
Subject: Re-implemented ecj support
In-Reply-To: <18226.58993.418594.310673@zebedee.pink>
References: <47320CDA.90604@redhat.com>	<473216FC.4020502@redhat.com>
	<18226.58993.418594.310673@zebedee.pink>
Message-ID: <47330A44.3010100@redhat.com>

Andrew Haley wrote:
> Lillian Angel writes:
>  > Be aware that the build is broken on x86_64 because of this bug in b22:
>  > http://bugs.sun.com/view_bug.do?bug_id=6616627
>  > 
>  > It will be fixed when we upgrade to b23/b24.
>
> How come we didn't notice this before now?
>   

The bug was only introduced in b22,  I have built on x86_64 since then, 
but never tried bootstrapping with itself.  Berhard Rosenkraenzer did 
encounter this: See mail with subject "Re: bootstrapping icedtea with 
gcj 4.3" from Oct 23.

Lillian


From twisti at complang.tuwien.ac.at  Thu Nov  8 05:11:07 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Thu, 08 Nov 2007 14:11:07 +0100
Subject: IcedTea PPC patches: ok to commit?
In-Reply-To: <20071108124722.GB3697@redhat.com>
References: <20071108124722.GB3697@redhat.com>
Message-ID: <1194527467.29693.22.camel@c1.complang.tuwien.ac.at>

On Thu, 2007-11-08 at 12:47 +0000, Gary Benson wrote:
> diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk
> openjdk/corba/make/common/Defs-linux.gmk
> --- openjdk.orig/corba/make/common/Defs-linux.gmk       2007-11-08
> 10:52:39.000000000 +0000
> +++ openjdk/corba/make/common/Defs-linux.gmk    2007-11-08
> 10:55:41.000000000 +0000
> @@ -196,7 +196,11 @@
>  
>  EXTRA_LIBS += -lc
>  
> -LDFLAGS_DEFS_OPTION  = -z defs
> +ifneq ($(findstring ppc,$(ARCH)),)
> +  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
> +else
> +  LDFLAGS_DEFS_OPTION  = -z defs
> +endif

As I already said on IRC I'd prefer to use -Xlinker instead of -Wl, but
I'm not an expert here.

The thing I want to mention is, we need this on more architectures than
ppc.  So doing a findstring is not optimal.  Wouldn't it be better to
use -Xlinker/-Wl on all architectures?

Same applies to the following ones.

>  LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
>  
>  #
> diff -ru openjdk.orig/j2se/make/common/Defs-linux.gmk
> openjdk/j2se/make/common/Defs-linux.gmk
> --- openjdk.orig/j2se/make/common/Defs-linux.gmk        2007-11-08
> 10:52:39.000000000 +0000
> +++ openjdk/j2se/make/common/Defs-linux.gmk     2007-11-08
> 10:55:41.000000000 +0000
> @@ -204,7 +204,11 @@
>  
>  EXTRA_LIBS += -lc
>  
> -LDFLAGS_DEFS_OPTION  = -z defs
> +ifneq ($(findstring ppc,$(ARCH)),)
> +  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
> +else
> +  LDFLAGS_DEFS_OPTION  = -z defs
> +endif
>  LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
>  
>  #
> diff -ru openjdk.orig/j2se/make/common/Program.gmk
> openjdk/j2se/make/common/Program.gmk
> --- openjdk.orig/j2se/make/common/Program.gmk   2007-11-08
> 10:52:39.000000000 +0000
> +++ openjdk/j2se/make/common/Program.gmk        2007-11-08
> 10:55:41.000000000 +0000
> @@ -85,7 +85,11 @@
>         endif
>      endif
>      ifeq ($(PLATFORM), linux)
> -       LDFLAGS += -lz -z origin
> +       ifneq ($(findstring ppc,$(ARCH)),)
> +           LDFLAGS += -lz -Wl,-z -Wl,origin
> +       else
> +           LDFLAGS += -lz -z origin
> +       endif
>         LDFLAGS += -Wl,--allow-shlib-undefined
>         LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
>         LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
> diff -ru openjdk.orig/j2se/make/java/instrument/Makefile
> openjdk/j2se/make/java/instrument/Makefile
> --- openjdk.orig/j2se/make/java/instrument/Makefile     2007-11-08
> 10:52:39.000000000 +0000
> +++ openjdk/j2se/make/java/instrument/Makefile  2007-11-08
> 10:55:41.000000000 +0000
> @@ -109,7 +109,11 @@
>      LDFLAGS += -R \$$ORIGIN/jli
>    endif
>    ifeq ($(PLATFORM), linux)
> -    LDFLAGS += -z origin
> +    ifneq ($(findstring ppc,$(ARCH)),)
> +      LDFLAGS += -Wl,-z -Wl,origin
> +    else
> +      LDFLAGS += -z origin
> +    endif
>      LDFLAGS += -Wl,--allow-shlib-undefined
>      LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
>    endif 

- twisti


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  8 05:18:43 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 08 Nov 2007 13:18:43 +0000
Subject: [Bug 78] Use pure Java implementation of zlib from Classpath instead
	of zlib for java.util.zip
Message-ID: <E1Iq7HP-0005JY-1i@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=78


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|REOPENED                    |RESOLVED
         Resolution|                            |WONTFIX




------- Comment #11 from langel at redhat.com  2007-11-08 13:18 -------
Closing this bug again.

We don't want to use a different version of zlib, only that required by the OS.
It doesn't make sense for us to start using a different version. This was the
reason we switched in the first place.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From gbenson at redhat.com  Thu Nov  8 05:21:51 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 8 Nov 2007 13:21:51 +0000
Subject: IcedTea PPC patches: ok to commit?
In-Reply-To: <1194527467.29693.22.camel@c1.complang.tuwien.ac.at>
References: <20071108124722.GB3697@redhat.com>
	<1194527467.29693.22.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071108132151.GC3697@redhat.com>

Christian Thalinger wrote:
> On Thu, 2007-11-08 at 12:47 +0000, Gary Benson wrote:
> > diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk
> > openjdk/corba/make/common/Defs-linux.gmk
> > --- openjdk.orig/corba/make/common/Defs-linux.gmk       2007-11-08
> > 10:52:39.000000000 +0000
> > +++ openjdk/corba/make/common/Defs-linux.gmk    2007-11-08
> > 10:55:41.000000000 +0000
> > @@ -196,7 +196,11 @@
> >  
> >  EXTRA_LIBS += -lc
> >  
> > -LDFLAGS_DEFS_OPTION  = -z defs
> > +ifneq ($(findstring ppc,$(ARCH)),)
> > +  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
> > +else
> > +  LDFLAGS_DEFS_OPTION  = -z defs
> > +endif
> 
> As I already said on IRC I'd prefer to use -Xlinker instead of -Wl,
> but I'm not an expert here.

I was actually going to change to -Xlinker, but when I went to edit
the files I found that almost all of them were using -Wl, in the same
command line.  I thought it looked neater to use the same option.

> The thing I want to mention is, we need this on more architectures
> than ppc.  So doing a findstring is not optimal.  Wouldn't it be
> better to use -Xlinker/-Wl on all architectures?

I have no objection to this, but might it break things?
I'm no expert here either...

Cheers,
Gary


From twisti at complang.tuwien.ac.at  Thu Nov  8 05:24:52 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Thu, 08 Nov 2007 14:24:52 +0100
Subject: IcedTea PPC patches: ok to commit?
In-Reply-To: <20071108132151.GC3697@redhat.com>
References: <20071108124722.GB3697@redhat.com>
	<1194527467.29693.22.camel@c1.complang.tuwien.ac.at>
	<20071108132151.GC3697@redhat.com>
Message-ID: <1194528292.29693.29.camel@c1.complang.tuwien.ac.at>

On Thu, 2007-11-08 at 13:21 +0000, Gary Benson wrote:
> Christian Thalinger wrote:
> > On Thu, 2007-11-08 at 12:47 +0000, Gary Benson wrote:
> > > diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk
> > > openjdk/corba/make/common/Defs-linux.gmk
> > > --- openjdk.orig/corba/make/common/Defs-linux.gmk       2007-11-08
> > > 10:52:39.000000000 +0000
> > > +++ openjdk/corba/make/common/Defs-linux.gmk    2007-11-08
> > > 10:55:41.000000000 +0000
> > > @@ -196,7 +196,11 @@
> > >  
> > >  EXTRA_LIBS += -lc
> > >  
> > > -LDFLAGS_DEFS_OPTION  = -z defs
> > > +ifneq ($(findstring ppc,$(ARCH)),)
> > > +  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
> > > +else
> > > +  LDFLAGS_DEFS_OPTION  = -z defs
> > > +endif
> > 
> > As I already said on IRC I'd prefer to use -Xlinker instead of -Wl,
> > but I'm not an expert here.
> 
> I was actually going to change to -Xlinker, but when I went to edit
> the files I found that almost all of them were using -Wl, in the same
> command line.  I thought it looked neater to use the same option.

I see.  I don't know then...

> 
> > The thing I want to mention is, we need this on more architectures
> > than ppc.  So doing a findstring is not optimal.  Wouldn't it be
> > better to use -Xlinker/-Wl on all architectures?
> 
> I have no objection to this, but might it break things?
> I'm no expert here either...

It did not break anything for me on i386 and x86_64.

- twisti


From gbenson at redhat.com  Thu Nov  8 05:39:39 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 8 Nov 2007 13:39:39 +0000
Subject: IcedTea PPC patches: ok to commit?
In-Reply-To: <1194528292.29693.29.camel@c1.complang.tuwien.ac.at>
References: <20071108124722.GB3697@redhat.com>
	<1194527467.29693.22.camel@c1.complang.tuwien.ac.at>
	<20071108132151.GC3697@redhat.com>
	<1194528292.29693.29.camel@c1.complang.tuwien.ac.at>
Message-ID: <20071108133939.GD3697@redhat.com>

Christian Thalinger wrote:
> On Thu, 2007-11-08 at 13:21 +0000, Gary Benson wrote:
> > Christian Thalinger wrote:
> > > The thing I want to mention is, we need this on more
> > > architectures than ppc.  So doing a findstring is not optimal.
> > > Wouldn't it be better to use -Xlinker/-Wl on all architectures?
> > 
> > I have no objection to this, but might it break things?
> > I'm no expert here either...
> 
> It did not break anything for me on i386 and x86_64.

Ah, cool, I'll remake that patch without the conditionals.

Cheers,
Gary


From gbenson at redhat.com  Thu Nov  8 05:53:59 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 8 Nov 2007 13:53:59 +0000
Subject: IcedTea PPC patches: ok to commit?
In-Reply-To: <20071108133939.GD3697@redhat.com>
References: <20071108124722.GB3697@redhat.com>
	<1194527467.29693.22.camel@c1.complang.tuwien.ac.at>
	<20071108132151.GC3697@redhat.com>
	<1194528292.29693.29.camel@c1.complang.tuwien.ac.at>
	<20071108133939.GD3697@redhat.com>
Message-ID: <20071108135359.GE3697@redhat.com>

Gary Benson wrote:
> Christian Thalinger wrote:
> > On Thu, 2007-11-08 at 13:21 +0000, Gary Benson wrote:
> > > Christian Thalinger wrote:
> > > > The thing I want to mention is, we need this on more
> > > > architectures than ppc.  So doing a findstring is not optimal.
> > > > Wouldn't it be better to use -Xlinker/-Wl on all architectures?
> > > 
> > > I have no objection to this, but might it break things?
> > > I'm no expert here either...
> > 
> > It did not break anything for me on i386 and x86_64.
> 
> Ah, cool, I'll remake that patch without the conditionals.

Ok, attached is my replacement for icedtea-zorigin.patch from my
initial mail.  I removed the conditionals, and changed it to use
-Xlinker or -Wl, depending on the command it is being inserted
into.  I also renamed the patch, since it no longer contains just
-z origin fixes.

Cheers,
Gary
-------------- next part --------------
diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
--- openjdk.orig/corba/make/common/Defs-linux.gmk	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/corba/make/common/Defs-linux.gmk	2007-11-08 13:44:13.000000000 +0000
@@ -196,7 +196,7 @@
 
 EXTRA_LIBS += -lc
 
-LDFLAGS_DEFS_OPTION  = -z defs
+LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
 LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
 
 #
diff -ru openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/j2se/make/common/Defs-linux.gmk	2007-11-08 13:43:52.000000000 +0000
@@ -204,7 +204,7 @@
 
 EXTRA_LIBS += -lc
 
-LDFLAGS_DEFS_OPTION  = -z defs
+LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
 LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
 
 #
diff -ru openjdk.orig/j2se/make/common/Program.gmk openjdk/j2se/make/common/Program.gmk
--- openjdk.orig/j2se/make/common/Program.gmk	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/j2se/make/common/Program.gmk	2007-11-08 13:42:44.000000000 +0000
@@ -85,7 +85,7 @@
 	endif
     endif
     ifeq ($(PLATFORM), linux)
-	LDFLAGS += -lz -z origin
+	LDFLAGS += -lz -Wl,-z -Wl,origin
 	LDFLAGS += -Wl,--allow-shlib-undefined
 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
diff -ru openjdk.orig/j2se/make/java/instrument/Makefile openjdk/j2se/make/java/instrument/Makefile
--- openjdk.orig/j2se/make/java/instrument/Makefile	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/j2se/make/java/instrument/Makefile	2007-11-08 13:42:25.000000000 +0000
@@ -109,7 +109,7 @@
     LDFLAGS += -R \$$ORIGIN/jli
   endif
   ifeq ($(PLATFORM), linux)
-    LDFLAGS += -z origin
+    LDFLAGS += -Wl,-z -Wl,origin
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
   endif

From twisti at complang.tuwien.ac.at  Thu Nov  8 06:19:50 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Thu, 08 Nov 2007 15:19:50 +0100
Subject: IcedTea PPC patches: ok to commit?
In-Reply-To: <20071108135359.GE3697@redhat.com>
References: <20071108124722.GB3697@redhat.com>
	<1194527467.29693.22.camel@c1.complang.tuwien.ac.at>
	<20071108132151.GC3697@redhat.com>
	<1194528292.29693.29.camel@c1.complang.tuwien.ac.at>
	<20071108133939.GD3697@redhat.com> <20071108135359.GE3697@redhat.com>
Message-ID: <1194531590.29693.36.camel@c1.complang.tuwien.ac.at>

On Thu, 2007-11-08 at 13:53 +0000, Gary Benson wrote:
> Ok, attached is my replacement for icedtea-zorigin.patch from my
> initial mail.  I removed the conditionals, and changed it to use
> -Xlinker or -Wl, depending on the command it is being inserted
> into.  I also renamed the patch, since it no longer contains just
> -z origin fixes.

That one looks very good to me.  Please commit! :-)

- twisti


From twisti at complang.tuwien.ac.at  Thu Nov  8 07:19:53 2007
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Thu, 08 Nov 2007 16:19:53 +0100
Subject: FYI: transplanting changsets (aka. rebase)
In-Reply-To: <1194518463.29693.11.camel@c1.complang.tuwien.ac.at>
References: <1194518463.29693.11.camel@c1.complang.tuwien.ac.at>
Message-ID: <1194535193.29693.41.camel@c1.complang.tuwien.ac.at>

On Thu, 2007-11-08 at 11:41 +0100, Christian Thalinger wrote:
> transplant is a Mercurial extension that is enabled by default.  As for

Sorry, typo.  It's _shipped_ with Mercurial but it's not enabled.  You
need to enable it via:

[extensions]
hgext.transplant =

- twisti


From langel at redhat.com  Thu Nov  8 07:46:15 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 08 Nov 2007 15:46:15 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Lillian Angel  <langel@red...
Message-ID: <hg.2a1d80a4c7b4.1194536775.-6899778133799504387@icedtea.classpath.org>

changeset 2a1d80a4c7b4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2a1d80a4c7b4
description:
	2007-11-07  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Removed docs patch.
	        * Makefile.in: Regenerate.
	        * patches/icedtea-docs.patch: Removed. Causing out of memory errors
	        because jaxws is not built.

diffstat:

3 files changed, 44 deletions(-)
Makefile.am                |    1 -
Makefile.in                |    1 -
patches/icedtea-docs.patch |   42 ------------------------------------------

diffs (68 lines):

diff -r f9a0a601f0dc -r 2a1d80a4c7b4 Makefile.am
--- a/Makefile.am	Wed Nov 07 17:29:12 2007 -0500
+++ b/Makefile.am	Thu Nov 08 10:45:26 2007 -0500
@@ -186,7 +186,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
-	patches/icedtea-docs.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r f9a0a601f0dc -r 2a1d80a4c7b4 Makefile.in
--- a/Makefile.in	Wed Nov 07 17:29:12 2007 -0500
+++ b/Makefile.in	Thu Nov 08 10:45:26 2007 -0500
@@ -305,7 +305,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
-	patches/icedtea-docs.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r f9a0a601f0dc -r 2a1d80a4c7b4 patches/icedtea-docs.patch
--- a/patches/icedtea-docs.patch	Wed Nov 07 17:29:12 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
---- ../openjdk/control/make/j2se-rules.gmk	2007-10-12 03:45:09.000000000 -0400
-+++ openjdk/control/make/j2se-rules.gmk	2007-11-07 17:05:36.000000000 -0500
-@@ -36,37 +36,9 @@
-   IMAGES_TARGET = images
- endif
- 
--# No DOCS build when JDK_UPDATE_VERSION set
--ifdef JDK_UPDATE_VERSION
--  DOCS_TARGET =
--else
--  DOCS_TARGET = docs
--endif
--
--# NO_DOCS may be set in conjunction with DEV_ONLY
--ifdef NO_DOCS
--  DOCS_TARGET =
--endif
-+DOCS_TARGET = docs
- 
--# If langtools not being built, full jdk javadoc is not possible
--ifneq ($(BUILD_LANGTOOLS), true)
--  DOCS_TARGET =
--endif
--ifneq ($(BUILD_CORBA), true)
--  DOCS_TARGET =
--endif
--ifneq ($(BUILD_JAXP), true)
--  DOCS_TARGET =
--endif
--ifneq ($(BUILD_JAXWS), true)
--  DOCS_TARGET =
--endif
--
--ifndef DEV_ONLY
--  J2SE_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
--else
--  J2SE_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
--endif
-+J2SE_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
- 
- J2SE_CLOBBER_TARGETS = clobber
- 


From langel at redhat.com  Thu Nov  8 07:58:48 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 08 Nov 2007 15:58:48 +0000
Subject: changeset in /hg/icedtea: Commit Changelog
Message-ID: <hg.cd2a405502f1.1194537528.-6899778133799504387@icedtea.classpath.org>

changeset cd2a405502f1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cd2a405502f1
description:
	Commit Changelog

diffstat:

1 file changed, 7 insertions(+)
ChangeLog |    7 +++++++

diffs (14 lines):

diff -r 2a1d80a4c7b4 -r cd2a405502f1 ChangeLog
--- a/ChangeLog	Thu Nov 08 10:45:26 2007 -0500
+++ b/ChangeLog	Thu Nov 08 10:57:58 2007 -0500
@@ -1,3 +1,10 @@ 2007-11-07  Lillian Angel  <langel at redha
+2007-11-07  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Removed docs patch.
+	* Makefile.in: Regenerate.
+	* patches/icedtea-docs.patch: Removed. Causing out of memory errors
+	because jaxws is not built.
+
 2007-11-07  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Added new patch to list.


From amitksaha at netbeans.org  Thu Nov  8 09:30:37 2007
From: amitksaha at netbeans.org (Amit Kumar Saha)
Date: Thu, 8 Nov 2007 23:00:37 +0530
Subject: Newbie Query
Message-ID: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>

Hi all!

I am just trying to understand IcedTea better. I came across these
lines in the FAQ

"IcedTea is a build harness for the OpenJDK that provides stubs and
GNU Classpath replacements for the encumbered binary plugs, and allows
the OpenJDK to be bootstrapped against GCJ. It is not a fork of the
OpenJDK, and doesn't contain the OpenJDK source code. "

Could someone here please tell me what exactly do they mean? I am
aware of the encumbrances in Open JDK and I also have an idea about
GNU Classpath. If it does not contain Open JDK source code, whose
source code is it using for the non-encumbered portion?

Looking forward to hear from you.

Regards,
Amit

-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com


From gbenson at redhat.com  Thu Nov  8 09:38:06 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 08 Nov 2007 17:38:06 +0000
Subject: changeset in /hg/icedtea: 2007-11-07  Gary Benson  <gbenson@redh...
Message-ID: <hg.7130794f3f47.1194543485.-6899778133799504387@icedtea.classpath.org>

changeset 7130794f3f47 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7130794f3f47
description:
	2007-11-07  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-bytecodeInterpreter.patch: New file.
		* patches/icedtea-signature-iterator.patch: Likewise.
		* patches/icedtea-signed-types.patch: Likewise.
		* patches/icedtea-test-atomic-operations.patch: Likewise.
		* patches/icedtea-core-build.patch: Likewise.
		* patches/icedtea-linker-options.patch: Likewise.
		* patches/icedtea-ports.patch: Likewise.
		* Makefile.am (ICEDTEA_PATCHES): Added the above.
		* Makefile.in: Regenerated.

diffstat:

10 files changed, 713 insertions(+)
ChangeLog                                    |   12 
Makefile.am                                  |    7 
Makefile.in                                  |    7 
patches/icedtea-bytecodeInterpreter.patch    |   36 ++
patches/icedtea-core-build.patch             |  151 ++++++++++
patches/icedtea-linker-options.patch         |   48 +++
patches/icedtea-ports.patch                  |  359 ++++++++++++++++++++++++++
patches/icedtea-signature-iterator.patch     |   44 +++
patches/icedtea-signed-types.patch           |   24 +
patches/icedtea-test-atomic-operations.patch |   25 +

diffs (truncated from 768 to 500 lines):

diff -r cd2a405502f1 -r 7130794f3f47 ChangeLog
--- a/ChangeLog	Thu Nov 08 10:57:58 2007 -0500
+++ b/ChangeLog	Thu Nov 08 17:37:58 2007 +0000
@@ -1,3 +1,15 @@ 2007-11-07  Lillian Angel  <langel at redha
+2007-11-07  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-bytecodeInterpreter.patch: New file.
+	* patches/icedtea-signature-iterator.patch: Likewise.
+	* patches/icedtea-signed-types.patch: Likewise.
+	* patches/icedtea-test-atomic-operations.patch: Likewise.
+	* patches/icedtea-core-build.patch: Likewise.
+	* patches/icedtea-linker-options.patch: Likewise.
+	* patches/icedtea-ports.patch: Likewise.
+	* Makefile.am (ICEDTEA_PATCHES): Added the above.
+	* Makefile.in: Regenerated.
+
 2007-11-07  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Removed docs patch.
diff -r cd2a405502f1 -r 7130794f3f47 Makefile.am
--- a/Makefile.am	Thu Nov 08 10:57:58 2007 -0500
+++ b/Makefile.am	Thu Nov 08 17:37:58 2007 +0000
@@ -186,6 +186,13 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
+	patches/icedtea-bytecodeInterpreter.patch \
+	patches/icedtea-signature-iterator.patch \
+	patches/icedtea-signed-types.patch \
+	patches/icedtea-test-atomic-operations.patch \
+	patches/icedtea-core-build.patch \
+	patches/icedtea-linker-options.patch \
+	patches/icedtea-ports.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r cd2a405502f1 -r 7130794f3f47 Makefile.in
--- a/Makefile.in	Thu Nov 08 10:57:58 2007 -0500
+++ b/Makefile.in	Thu Nov 08 17:37:58 2007 +0000
@@ -305,6 +305,13 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
+	patches/icedtea-bytecodeInterpreter.patch \
+	patches/icedtea-signature-iterator.patch \
+	patches/icedtea-signed-types.patch \
+	patches/icedtea-test-atomic-operations.patch \
+	patches/icedtea-core-build.patch \
+	patches/icedtea-linker-options.patch \
+	patches/icedtea-ports.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r cd2a405502f1 -r 7130794f3f47 patches/icedtea-bytecodeInterpreter.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-bytecodeInterpreter.patch	Thu Nov 08 17:37:58 2007 +0000
@@ -0,0 +1,36 @@
+diff -r b3238230c1ef openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:14:32 2007 +0000
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:15:45 2007 +0000
+@@ -63,7 +63,6 @@ union frame_manager_message {
+ };
+ 
+ class BytecodeInterpreter : StackObj {
+-friend class SharedRuntime;
+ friend class AbstractInterpreterGenerator;
+ friend class CppInterpreterGenerator;
+ friend class InterpreterGenerator;
+diff -r bae119bcbcd0 openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:08:47 2007 +0000
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:21:08 2007 +0000
+@@ -521,16 +521,16 @@ BytecodeInterpreter::run(interpreterStat
+ 
+ /* 0xC0 */ &&opc_checkcast,   &&opc_instanceof,     &&opc_monitorenter, &&opc_monitorexit,
+ /* 0xC4 */ &&opc_wide,        &&opc_multianewarray, &&opc_ifnull,       &&opc_ifnonnull,
+-/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_fast_igetfield,
+-/* 0xCC */ &&opc_fastagetfield,&&opc_fast_aload_0,  &&opc_fast_iaccess_0, &&opc__fast_aaccess_0,
+-
+-/* 0xD0 */ &&opc_fast_linearswitch, &&opc_fast_binaryswitch, &&opc_return_register_finalizer,      &&opc_default,
++/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_default,
++/* 0xCC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
++
++/* 0xD0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xD4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xD8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xDC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ 
+ /* 0xE0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+-/* 0xE4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
++/* 0xE4 */ &&opc_default,     &&opc_return_register_finalizer, &&opc_default, &&opc_default,
+ /* 0xE8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xEC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ 
diff -r cd2a405502f1 -r 7130794f3f47 patches/icedtea-core-build.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-core-build.patch	Thu Nov 08 17:37:58 2007 +0000
@@ -0,0 +1,151 @@
+diff -ru openjdk.orig/control/make/hotspot-rules.gmk openjdk/control/make/hotspot-rules.gmk
+--- openjdk.orig/control/make/hotspot-rules.gmk	2007-10-12 08:45:09.000000000 +0100
++++ openjdk/control/make/hotspot-rules.gmk	2007-11-08 09:40:57.000000000 +0000
+@@ -75,6 +75,11 @@
+   HOTSPOT_TARGET = all_fastdebug
+ endif
+ 
++# Use the special build targets on PPC for now
++ifneq ($(findstring ppc,$(ARCH)),)
++  HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
++endif
++
+ HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
+diff -ru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
+--- openjdk.orig/hotspot/make/Makefile	2007-10-12 08:45:12.000000000 +0100
++++ openjdk/hotspot/make/Makefile	2007-11-08 09:40:57.000000000 +0000
+@@ -91,6 +91,15 @@
+ all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
+ all_optimized: optimized optimized1 optimizedkernel docs export_optimized
+ 
++# Core (non-compiler) targets made available with this Makefile
++CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
++
++allcore:           all_productcore all_fastdebugcore
++all_productcore:   productcore docs export_product
++all_fastdebugcore: fastdebugcore docs export_fastdebug
++all_debugcore:     jvmgcore docs export_debug
++all_optimizedcore: optimizedcore docs export_optimized
++
+ # Do everything
+ world:         all create_jdk
+ 
+@@ -117,6 +126,10 @@
+ 	$(CD) $(GAMMADIR)/make; \
+ 	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
+ 
++$(CORE_VM_TARGETS):
++	$(CD) $(GAMMADIR)/make; \
++	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
++
+ # Build compiler1 (client) rule, different for platforms
+ generic_build1:
+ 	$(MKDIR) -p $(OUTPUTDIR)
+@@ -207,17 +220,24 @@
+ C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
+ C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
+ KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
++CORE_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
+ C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
+ C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
+ KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
++CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR)
+ 
+-# Misc files and generated files need to come from C1 or C2 area
+-ifeq ($(ARCH_DATA_MODEL), 32)
+-  MISC_DIR=$(C1_DIR)
+-  GEN_DIR=$(C1_BASE_DIR)/generated
++# Misc files and generated files need to come from the correct area
++ifneq ($(findstring ppc,$(ARCH)),)
++  MISC_DIR=$(CORE_DIR)
++  GEN_DIR=$(CORE_BASE_DIR)/generated
+ else
+-  MISC_DIR=$(C2_DIR)
+-  GEN_DIR=$(C2_BASE_DIR)/generated
++  ifeq ($(ARCH_DATA_MODEL), 32)
++    MISC_DIR=$(C1_DIR)
++    GEN_DIR=$(C1_BASE_DIR)/generated
++  else
++    MISC_DIR=$(C2_DIR)
++    GEN_DIR=$(C2_BASE_DIR)/generated
++  endif
+ endif
+ 
+ # Bin files (windows)
+@@ -268,8 +288,13 @@
+ 	$(install-file)
+ $(EXPORT_CLIENT_DIR)/64/%.so:    $(C1_DIR)/%.so
+ 	$(install-file)
++ifneq ($(findstring ppc,$(ARCH)),)
++$(EXPORT_SERVER_DIR)/%.so:       $(CORE_DIR)/%.so
++	$(install-file)
++else
+ $(EXPORT_SERVER_DIR)/%.so:       $(C2_DIR)/%.so
+ 	$(install-file)
++endif
+ $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
+ 	$(install-file)
+ endif
+diff -ru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2007-10-12 08:46:18.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 09:40:57.000000000 +0000
+@@ -95,8 +95,12 @@
+ #ifdef TIERED
+   #define VMTYPE "Server"
+ #else
++#if defined(COMPILER1) || defined(COMPILER2)
+   #define VMTYPE COMPILER1_PRESENT("Client")   \
+                  COMPILER2_PRESENT("Server")   
++#else
++  #define VMTYPE "Core"
++#endif // COMPILER1 || COMPILER2
+ #endif // TIERED
+ #endif // KERNEL
+ 
+diff -ru openjdk.orig/j2se/make/java/redist/Makefile openjdk/j2se/make/java/redist/Makefile
+--- openjdk.orig/j2se/make/java/redist/Makefile	2007-10-12 08:54:05.000000000 +0100
++++ openjdk/j2se/make/java/redist/Makefile	2007-11-08 09:40:57.000000000 +0000
+@@ -94,8 +94,14 @@
+   endif
+ 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)
+   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
+                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
+ endif
+@@ -119,8 +125,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
+@@ -158,10 +163,11 @@
+   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
+ endif 
+ 
+-ifeq ($(ARCH_DATA_MODEL), 32)
+-
+-IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
++ifeq ($(INCLUDE_CLIENT), true)
++  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
++endif
+ 
++ifeq ($(ARCH_DATA_MODEL), 32)
+ ifeq ($(PLATFORM), solaris)
+ #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
+ 
diff -r cd2a405502f1 -r 7130794f3f47 patches/icedtea-linker-options.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-linker-options.patch	Thu Nov 08 17:37:58 2007 +0000
@@ -0,0 +1,48 @@
+diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
+--- openjdk.orig/corba/make/common/Defs-linux.gmk	2007-11-08 13:45:46.000000000 +0000
++++ openjdk/corba/make/common/Defs-linux.gmk	2007-11-08 13:44:13.000000000 +0000
+@@ -196,7 +196,7 @@
+ 
+ EXTRA_LIBS += -lc
+ 
+-LDFLAGS_DEFS_OPTION  = -z defs
++LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
+ LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
+ 
+ #
+diff -ru openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
+--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-11-08 13:45:46.000000000 +0000
++++ openjdk/j2se/make/common/Defs-linux.gmk	2007-11-08 13:43:52.000000000 +0000
+@@ -204,7 +204,7 @@
+ 
+ EXTRA_LIBS += -lc
+ 
+-LDFLAGS_DEFS_OPTION  = -z defs
++LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
+ LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
+ 
+ #
+diff -ru openjdk.orig/j2se/make/common/Program.gmk openjdk/j2se/make/common/Program.gmk
+--- openjdk.orig/j2se/make/common/Program.gmk	2007-11-08 13:45:46.000000000 +0000
++++ openjdk/j2se/make/common/Program.gmk	2007-11-08 13:42:44.000000000 +0000
+@@ -85,7 +85,7 @@
+ 	endif
+     endif
+     ifeq ($(PLATFORM), linux)
+-	LDFLAGS += -lz -z origin
++	LDFLAGS += -lz -Wl,-z -Wl,origin
+ 	LDFLAGS += -Wl,--allow-shlib-undefined
+ 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
+ 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
+diff -ru openjdk.orig/j2se/make/java/instrument/Makefile openjdk/j2se/make/java/instrument/Makefile
+--- openjdk.orig/j2se/make/java/instrument/Makefile	2007-11-08 13:45:46.000000000 +0000
++++ openjdk/j2se/make/java/instrument/Makefile	2007-11-08 13:42:25.000000000 +0000
+@@ -109,7 +109,7 @@
+     LDFLAGS += -R \$$ORIGIN/jli
+   endif
+   ifeq ($(PLATFORM), linux)
+-    LDFLAGS += -z origin
++    LDFLAGS += -Wl,-z -Wl,origin
+     LDFLAGS += -Wl,--allow-shlib-undefined
+     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
+   endif
diff -r cd2a405502f1 -r 7130794f3f47 patches/icedtea-ports.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ports.patch	Thu Nov 08 17:37:58 2007 +0000
@@ -0,0 +1,359 @@
+diff -ru openjdk.orig/hotspot/build/linux/makefiles/buildtree.make openjdk/hotspot/build/linux/makefiles/buildtree.make
+--- openjdk.orig/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:36:15.000000000 +0000
+@@ -317,6 +317,8 @@
+ DATA_MODE/sparcv9 = 64
+ DATA_MODE/amd64   = 64
+ DATA_MODE/ia64    = 64
++DATA_MODE/ppc     = 32
++DATA_MODE/ppc64   = 64
+ 
+ JAVA_FLAG/32 = -d32
+ JAVA_FLAG/64 = -d64
+diff -ru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2007-11-08 11:36:15.000000000 +0000
+@@ -87,6 +87,21 @@
+   HS_ARCH          = x86
+ endif
+ 
++# ppc and ppc64
++ifneq ($(findstring ppc,$(ARCH)),)
++  ifeq ($(ARCH_DATA_MODEL), 64)
++    ARCH_DATA_MODEL  = 64
++    MAKE_ARGS        += LP64=1
++    PLATFORM         = linux-ppc64
++    VM_PLATFORM      = linux_ppc64
++  else
++    ARCH_DATA_MODEL  = 32
++    PLATFORM         = linux-ppc
++    VM_PLATFORM      = linux_ppc
++  endif
++  HS_ARCH            = ppc
++endif
++
+ JDK_INCLUDE_SUBDIR=linux
+ 
+ # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
+@@ -94,20 +109,16 @@
+ 
+ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
+ EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
++EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+-ifeq ($(ARCH_DATA_MODEL), 32)
+-  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
+-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
++ifneq ($(HS_ARCH), ppc)
++  ifeq ($(ARCH_DATA_MODEL), 32)
++    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
++    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
++    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
++  endif
+   EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+   EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
+-else
+-  ifeq ($(ARCH),ia64)
+-    else
+-      EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+-      EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+-    endif
+ endif
+diff -ru openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-11-08 11:36:15.000000000 +0000
+@@ -73,6 +73,8 @@
+ ARCHFLAG/ia64    =
+ ARCHFLAG/sparc   = -m32 -mcpu=v9
+ ARCHFLAG/sparcv9 = -m64 -mcpu=v9
++ARCHFLAG/ppc     = -m32
++ARCHFLAG/ppc64   = -m64
+ 
+ CFLAGS     += $(ARCHFLAG)
+ AOUT_FLAGS += $(ARCHFLAG)
+diff -ru openjdk.orig/hotspot/build/linux/makefiles/sa.make openjdk/hotspot/build/linux/makefiles/sa.make
+--- openjdk.orig/hotspot/build/linux/makefiles/sa.make	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/sa.make	2007-11-08 11:36:15.000000000 +0000
+@@ -51,10 +51,10 @@
+ SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
+ 
+ # if $(AGENT_DIR) does not exist, we don't build SA
+-# also, we don't build SA on Itanium.
++# also, we don't build SA on Itanium or PPC.
+ 
+ all: 
+-	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
++	if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "ppc" ] ; then \
+ 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
+ 	fi
+ 
+diff -ru openjdk.orig/hotspot/build/linux/makefiles/saproc.make openjdk/hotspot/build/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/build/linux/makefiles/saproc.make	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/saproc.make	2007-11-08 11:36:15.000000000 +0000
+@@ -44,10 +44,10 @@
+ DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+ 
+ # if $(AGENT_DIR) does not exist, we don't build SA
+-# also, we don't build SA on Itanium.
++# also, we don't build SA on Itanium or PPC.
+ 
+ checkAndBuildSA:
+-	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
++	$(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "ppc" ] ; then \
+ 	   $(MAKE) -f vm.make $(LIBSAPROC); \
+ 	fi
+ 
+diff -ru openjdk.orig/hotspot/make/defs.make openjdk/hotspot/make/defs.make
+--- openjdk.orig/hotspot/make/defs.make	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/make/defs.make	2007-11-08 11:36:15.000000000 +0000
+@@ -191,15 +191,17 @@
+ 
+   # Use uname output for SRCARCH, but deal with platform differences. If ARCH
+   # is not explicitly listed below, it is treated as x86. 
+-  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64,$(ARCH)))
++  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64,$(ARCH)))
+   ARCH/       = x86
+   ARCH/sparc  = sparc
+   ARCH/sparc64= sparc
+   ARCH/ia64   = ia64
+   ARCH/amd64  = x86
+   ARCH/x86_64 = x86
++  ARCH/ppc    = ppc
++  ARCH/ppc64  = ppc
+ 
+-  # BUILDARCH is usually the same as SRCARCH, except for sparcv9
++  # BUILDARCH is usually the same as SRCARCH, except for sparcv9 and ppc64
+   BUILDARCH = $(SRCARCH)
+   ifeq ($(BUILDARCH), x86)
+     ifdef LP64
+@@ -208,10 +210,13 @@
+       BUILDARCH = i486
+     endif
+   endif
+-  ifeq ($(BUILDARCH), sparc)
+-    ifdef LP64
++  ifdef LP64
++    ifeq ($(BUILDARCH), sparc)
+       BUILDARCH = sparcv9
+     endif
++    ifeq ($(BUILDARCH), ppc)
++      BUILDARCH = ppc64
++    endif
+   endif
+ 
+   # LIBARCH is 1:1 mapping from BUILDARCH
+@@ -221,8 +226,10 @@
+   LIBARCH/sparc   = sparc
+   LIBARCH/sparcv9 = sparcv9
+   LIBARCH/ia64    = ia64
++  LIBARCH/ppc     = ppc
++  LIBARCH/ppc64   = ppc64
+ 
+-  LP64_ARCH = sparcv9 amd64 ia64
++  LP64_ARCH = sparcv9 amd64 ia64 ppc64
+ endif
+ 
+ # Required make macro settings for all platforms
+diff -ru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-11-08 11:36:15.000000000 +0000
+@@ -174,6 +174,12 @@
+ #  else
+ static char cpu_arch[] = "sparc";
+ #  endif
++#elif defined(PPC)
++#  ifdef _LP64
++static char cpu_arch[] = "ppc64";
++#  else
++static char cpu_arch[] = "ppc";
++#  endif
+ #else
+ #error Add appropriate cpu_arch setting
+ #endif
+@@ -2375,7 +2381,8 @@
+     // format has been changed), we'll use the largest page size supported by
+     // the processor.
+ 
+-    _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M);
++    _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M)
++      SPARC_ONLY(4 * M) PPC_ONLY(16 * M);
+ 
+     FILE *fp = fopen("/proc/meminfo", "r");
+     if (fp) {
+diff -ru openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp openjdk/hotspot/src/share/vm/runtime/mutex.hpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:36:15.000000000 +0000
+@@ -64,19 +64,15 @@
+ } ; 
+ 
+ // Endian-ness ... index of least-significant byte in SplitWord.Bytes[]
+-#ifdef AMD64        // little
++#if defined(IA32) || defined(AMD64) || defined(IA64) // little
+  #define _LSBINDEX 0


From aph at redhat.com  Thu Nov  8 09:37:59 2007
From: aph at redhat.com (Andrew Haley)
Date: Thu, 8 Nov 2007 17:37:59 +0000
Subject: Newbie Query
In-Reply-To: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>
References: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>
Message-ID: <18227.18807.531071.651254@zebedee.pink>

Amit Kumar Saha writes:
 > Hi all!
 > 
 > I am just trying to understand IcedTea better. I came across these
 > lines in the FAQ
 > 
 > "IcedTea is a build harness for the OpenJDK that provides stubs and
 > GNU Classpath replacements for the encumbered binary plugs, and allows
 > the OpenJDK to be bootstrapped against GCJ. It is not a fork of the
 > OpenJDK, and doesn't contain the OpenJDK source code. "
 > 
 > Could someone here please tell me what exactly do they mean? I am
 > aware of the encumbrances in Open JDK and I also have an idea about
 > GNU Classpath. If it does not contain Open JDK source code, whose
 > source code is it using for the non-encumbered portion?

When you build IcedTea you have to download OpenJDK from Sun.

Andrew.

-- 
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903


From amitsaha.in at gmail.com  Thu Nov  8 09:29:13 2007
From: amitsaha.in at gmail.com (Amit Kumar Saha)
Date: Thu, 8 Nov 2007 22:59:13 +0530
Subject: Newbie Query
Message-ID: <547db2260711080929v48746792m3968db7ebf36fcec@mail.gmail.com>

Hi all!

I am just trying to understand IcedTea better. I came across these
lines in the FAQ

"IcedTea is a build harness for the OpenJDK that provides stubs and
GNU Classpath replacements for the encumbered binary plugs, and allows
the OpenJDK to be bootstrapped against GCJ. It is not a fork of the
OpenJDK, and doesn't contain the OpenJDK source code. "

Could someone here please tell me what exactly do they mean? I am
aware of the encumbrances in Open JDK and I also have an idea about
GNU Classpath. If it does not contain Open JDK source code, whose
source code is it using for the non-encumbered portion?

Looking forward to hear from you.

Regards,
Amit
-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com


From langel at redhat.com  Thu Nov  8 10:24:50 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 08 Nov 2007 18:24:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-08  Lillian Angel  <langel@red...
Message-ID: <hg.460ca073dc80.1194546290.-6899778133799504387@icedtea.classpath.org>

changeset 460ca073dc80 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=460ca073dc80
description:
	2007-11-08  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 17 insertions(+), 6 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    9 ++++++---
Makefile.in |    9 ++++++---

diffs (64 lines):

diff -r 7130794f3f47 -r 460ca073dc80 ChangeLog
--- a/ChangeLog	Thu Nov 08 17:37:58 2007 +0000
+++ b/ChangeLog	Thu Nov 08 13:24:05 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-07  Gary Benson  <gbenson at redhat
+2007-11-08  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
+	* Makefile.in: Regenerated.
+
 2007-11-07  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-bytecodeInterpreter.patch: New file.
diff -r 7130794f3f47 -r 460ca073dc80 Makefile.am
--- a/Makefile.am	Thu Nov 08 17:37:58 2007 +0000
+++ b/Makefile.am	Thu Nov 08 13:24:05 2007 -0500
@@ -340,8 +340,8 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XALAN2_SERIALIZER_JAR) \
 	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
-	mkdir -p bootstrap/ecj/jre
-	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/
+	mkdir -p bootstrap/ecj/jre/lib
+	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 
@@ -599,7 +599,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
 	  -C lib/rt javax -C lib/rt sun
-	mkdir -p bootstrap/jdk1.6.0/jre/lib/
+	if test -d bootstrap/ecj/jre/lib ; \
+	then \
+	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
+	fi
 
 # gcjwebplugin.so.
 gcjwebplugin.so: gcjwebplugin.cc
diff -r 7130794f3f47 -r 460ca073dc80 Makefile.in
--- a/Makefile.in	Thu Nov 08 17:37:58 2007 +0000
+++ b/Makefile.in	Thu Nov 08 13:24:05 2007 -0500
@@ -833,8 +833,8 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XALAN2_SERIALIZER_JAR) \
 	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
-	mkdir -p bootstrap/ecj/jre
-	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/
+	mkdir -p bootstrap/ecj/jre/lib
+	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 
@@ -1052,7 +1052,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
 	  -C lib/rt javax -C lib/rt sun
-	mkdir -p bootstrap/jdk1.6.0/jre/lib/
+	if test -d bootstrap/ecj/jre/lib ; \
+	then \
+	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
+	fi
 
 # gcjwebplugin.so.
 gcjwebplugin.so: gcjwebplugin.cc


From gnu_andrew at member.fsf.org  Thu Nov  8 11:31:48 2007
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 8 Nov 2007 19:31:48 +0000
Subject: Newbie Query
In-Reply-To: <18227.18807.531071.651254@zebedee.pink>
References: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>
	<18227.18807.531071.651254@zebedee.pink>
Message-ID: <17c6771e0711081131v1c4648dau7378bf3488ce86dd@mail.gmail.com>

On 08/11/2007, Andrew Haley <aph at redhat.com> wrote:
>
> Amit Kumar Saha writes:
> > Hi all!
> >
> > I am just trying to understand IcedTea better. I came across these
> > lines in the FAQ
> >
> > "IcedTea is a build harness for the OpenJDK that provides stubs and
> > GNU Classpath replacements for the encumbered binary plugs, and allows
> > the OpenJDK to be bootstrapped against GCJ. It is not a fork of the
> > OpenJDK, and doesn't contain the OpenJDK source code. "
> >
> > Could someone here please tell me what exactly do they mean? I am
> > aware of the encumbrances in Open JDK and I also have an idea about
> > GNU Classpath. If it does not contain Open JDK source code, whose
> > source code is it using for the non-encumbered portion?
>
> When you build IcedTea you have to download OpenJDK from Sun.
>
> Andrew.
>
> --
> Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor,
> Berkshire, SL4 1TE, UK
> Registered in England and Wales No. 3798903
>

Andrew, doesn't IcedTea still download the OpenJDK for you?  That was my
experience.


-- 
Andrew :-)

Help end the Java Trap!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071108/57d8b938/attachment.html 

From aph at redhat.com  Thu Nov  8 11:35:30 2007
From: aph at redhat.com (Andrew Haley)
Date: Thu, 8 Nov 2007 19:35:30 +0000
Subject: Newbie Query
In-Reply-To: <17c6771e0711081131v1c4648dau7378bf3488ce86dd@mail.gmail.com>
References: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>
	<18227.18807.531071.651254@zebedee.pink>
	<17c6771e0711081131v1c4648dau7378bf3488ce86dd@mail.gmail.com>
Message-ID: <18227.25858.838299.613448@zebedee.pink>

Andrew John Hughes writes:
 > On 08/11/2007, Andrew Haley <aph at redhat.com> wrote:
 > >
 > > Amit Kumar Saha writes:
 > > > Hi all!
 > > >
 > > > I am just trying to understand IcedTea better. I came across these
 > > > lines in the FAQ
 > > >
 > > > "IcedTea is a build harness for the OpenJDK that provides stubs and
 > > > GNU Classpath replacements for the encumbered binary plugs, and allows
 > > > the OpenJDK to be bootstrapped against GCJ. It is not a fork of the
 > > > OpenJDK, and doesn't contain the OpenJDK source code. "
 > > >
 > > > Could someone here please tell me what exactly do they mean? I am
 > > > aware of the encumbrances in Open JDK and I also have an idea about
 > > > GNU Classpath. If it does not contain Open JDK source code, whose
 > > > source code is it using for the non-encumbered portion?
 > >
 > > When you build IcedTea you have to download OpenJDK from Sun.
 > 
 > Andrew, doesn't IcedTea still download the OpenJDK for you?  That was my
 > experience.

Yes, your computer does it for you when you run the IcedTea build
script.

Andrew.

-- 
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903


From gbenson at redhat.com  Thu Nov  8 12:24:47 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 8 Nov 2007 20:24:47 +0000
Subject: changeset in /hg/icedtea: 2007-11-08 Lillian Angel <langel@red...
In-Reply-To: <hg.460ca073dc80.1194546290.-6899778133799504387@icedtea.classpath.org>
References: <hg.460ca073dc80.1194546290.-6899778133799504387@icedtea.classpath.org>
Message-ID: <20071108202447.GA15733@redhat.com>

There's i386s in that patch.

Cheers,
Gary

Lillian Angel wrote:
> changeset 460ca073dc80 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=460ca073dc80
> description:
> 	2007-11-08  Lillian Angel  <langel at redhat.com>
> 
> 	        * Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
> 	        * Makefile.in: Regenerated.
> 
> diffstat:
> 
> 3 files changed, 17 insertions(+), 6 deletions(-)
> ChangeLog   |    5 +++++
> Makefile.am |    9 ++++++---
> Makefile.in |    9 ++++++---
> 
> diffs (64 lines):
> 
> diff -r 7130794f3f47 -r 460ca073dc80 ChangeLog
> --- a/ChangeLog	Thu Nov 08 17:37:58 2007 +0000
> +++ b/ChangeLog	Thu Nov 08 13:24:05 2007 -0500
> @@ -1,3 +1,8 @@ 2007-11-07  Gary Benson  <gbenson at redhat
> +2007-11-08  Lillian Angel  <langel at redhat.com>
> +
> +	* Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
> +	* Makefile.in: Regenerated.
> +
>  2007-11-07  Gary Benson  <gbenson at redhat.com>
>  
>  	* patches/icedtea-bytecodeInterpreter.patch: New file.
> diff -r 7130794f3f47 -r 460ca073dc80 Makefile.am
> --- a/Makefile.am	Thu Nov 08 17:37:58 2007 +0000
> +++ b/Makefile.am	Thu Nov 08 13:24:05 2007 -0500
> @@ -340,8 +340,8 @@ stamps/bootstrap-directory-ecj.stamp:
>  	ln -sf $(XALAN2_SERIALIZER_JAR) \
>  	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
>  	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
> -	mkdir -p bootstrap/ecj/jre
> -	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/
> +	mkdir -p bootstrap/ecj/jre/lib
> +	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
>  	mkdir -p stamps
>  	touch stamps/bootstrap-directory-ecj.stamp
>  
> @@ -599,7 +599,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
>  	mkdir -p bootstrap/jdk1.7.0/jre/lib
>  	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
>  	  -C lib/rt javax -C lib/rt sun
> -	mkdir -p bootstrap/jdk1.6.0/jre/lib/
> +	if test -d bootstrap/ecj/jre/lib ; \
> +	then \
> +	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
> +	fi
>  
>  # gcjwebplugin.so.
>  gcjwebplugin.so: gcjwebplugin.cc
> diff -r 7130794f3f47 -r 460ca073dc80 Makefile.in
> --- a/Makefile.in	Thu Nov 08 17:37:58 2007 +0000
> +++ b/Makefile.in	Thu Nov 08 13:24:05 2007 -0500
> @@ -833,8 +833,8 @@ stamps/bootstrap-directory-ecj.stamp:
>  	ln -sf $(XALAN2_SERIALIZER_JAR) \
>  	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
>  	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
> -	mkdir -p bootstrap/ecj/jre
> -	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/
> +	mkdir -p bootstrap/ecj/jre/lib
> +	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
>  	mkdir -p stamps
>  	touch stamps/bootstrap-directory-ecj.stamp
>  
> @@ -1052,7 +1052,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
>  	mkdir -p bootstrap/jdk1.7.0/jre/lib
>  	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
>  	  -C lib/rt javax -C lib/rt sun
> -	mkdir -p bootstrap/jdk1.6.0/jre/lib/
> +	if test -d bootstrap/ecj/jre/lib ; \
> +	then \
> +	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
> +	fi
>  
>  # gcjwebplugin.so.
>  gcjwebplugin.so: gcjwebplugin.cc
> 
> 


From langel at redhat.com  Thu Nov  8 12:18:46 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 08 Nov 2007 20:18:46 +0000
Subject: changeset in /hg/icedtea: Fixed Typo
Message-ID: <hg.d12cd64f7a2c.1194553126.-6899778133799504387@icedtea.classpath.org>

changeset d12cd64f7a2c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d12cd64f7a2c
description:
	Fixed Typo

diffstat:

2 files changed, 2 insertions(+), 2 deletions(-)
Makefile.am |    2 +-
Makefile.in |    2 +-

diffs (24 lines):

diff -r 460ca073dc80 -r d12cd64f7a2c Makefile.am
--- a/Makefile.am	Thu Nov 08 13:24:05 2007 -0500
+++ b/Makefile.am	Thu Nov 08 15:18:01 2007 -0500
@@ -341,7 +341,7 @@ stamps/bootstrap-directory-ecj.stamp:
 	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
-	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
+	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 
diff -r 460ca073dc80 -r d12cd64f7a2c Makefile.in
--- a/Makefile.in	Thu Nov 08 13:24:05 2007 -0500
+++ b/Makefile.in	Thu Nov 08 15:18:01 2007 -0500
@@ -834,7 +834,7 @@ stamps/bootstrap-directory-ecj.stamp:
 	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
-	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
+	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 


From langel at redhat.com  Thu Nov  8 12:20:15 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 08 Nov 2007 15:20:15 -0500
Subject: changeset in /hg/icedtea: 2007-11-08 Lillian Angel <langel@red...
In-Reply-To: <20071108202447.GA15733@redhat.com>
References: <hg.460ca073dc80.1194546290.-6899778133799504387@icedtea.classpath.org>
	<20071108202447.GA15733@redhat.com>
Message-ID: <47336F7F.5010201@redhat.com>

Gary Benson wrote:
> There's i386s in that patch.
>   

Yep, sorry. Just fixed it.

Lillian

> Cheers,
> Gary
>
> Lillian Angel wrote:
>   
>> changeset 460ca073dc80 in /hg/icedtea
>> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=460ca073dc80
>> description:
>> 	2007-11-08  Lillian Angel  <langel at redhat.com>
>>
>> 	        * Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
>> 	        * Makefile.in: Regenerated.
>>
>> diffstat:
>>
>> 3 files changed, 17 insertions(+), 6 deletions(-)
>> ChangeLog   |    5 +++++
>> Makefile.am |    9 ++++++---
>> Makefile.in |    9 ++++++---
>>
>> diffs (64 lines):
>>
>> diff -r 7130794f3f47 -r 460ca073dc80 ChangeLog
>> --- a/ChangeLog	Thu Nov 08 17:37:58 2007 +0000
>> +++ b/ChangeLog	Thu Nov 08 13:24:05 2007 -0500
>> @@ -1,3 +1,8 @@ 2007-11-07  Gary Benson  <gbenson at redhat
>> +2007-11-08  Lillian Angel  <langel at redhat.com>
>> +
>> +	* Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
>> +	* Makefile.in: Regenerated.
>> +
>>  2007-11-07  Gary Benson  <gbenson at redhat.com>
>>  
>>  	* patches/icedtea-bytecodeInterpreter.patch: New file.
>> diff -r 7130794f3f47 -r 460ca073dc80 Makefile.am
>> --- a/Makefile.am	Thu Nov 08 17:37:58 2007 +0000
>> +++ b/Makefile.am	Thu Nov 08 13:24:05 2007 -0500
>> @@ -340,8 +340,8 @@ stamps/bootstrap-directory-ecj.stamp:
>>  	ln -sf $(XALAN2_SERIALIZER_JAR) \
>>  	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
>>  	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
>> -	mkdir -p bootstrap/ecj/jre
>> -	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/
>> +	mkdir -p bootstrap/ecj/jre/lib
>> +	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
>>  	mkdir -p stamps
>>  	touch stamps/bootstrap-directory-ecj.stamp
>>  
>> @@ -599,7 +599,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
>>  	mkdir -p bootstrap/jdk1.7.0/jre/lib
>>  	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
>>  	  -C lib/rt javax -C lib/rt sun
>> -	mkdir -p bootstrap/jdk1.6.0/jre/lib/
>> +	if test -d bootstrap/ecj/jre/lib ; \
>> +	then \
>> +	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
>> +	fi
>>  
>>  # gcjwebplugin.so.
>>  gcjwebplugin.so: gcjwebplugin.cc
>> diff -r 7130794f3f47 -r 460ca073dc80 Makefile.in
>> --- a/Makefile.in	Thu Nov 08 17:37:58 2007 +0000
>> +++ b/Makefile.in	Thu Nov 08 13:24:05 2007 -0500
>> @@ -833,8 +833,8 @@ stamps/bootstrap-directory-ecj.stamp:
>>  	ln -sf $(XALAN2_SERIALIZER_JAR) \
>>  	  bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
>>  	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
>> -	mkdir -p bootstrap/ecj/jre
>> -	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/
>> +	mkdir -p bootstrap/ecj/jre/lib
>> +	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/
>>  	mkdir -p stamps
>>  	touch stamps/bootstrap-directory-ecj.stamp
>>  
>> @@ -1052,7 +1052,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
>>  	mkdir -p bootstrap/jdk1.7.0/jre/lib
>>  	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
>>  	  -C lib/rt javax -C lib/rt sun
>> -	mkdir -p bootstrap/jdk1.6.0/jre/lib/
>> +	if test -d bootstrap/ecj/jre/lib ; \
>> +	then \
>> +	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
>> +	fi
>>  
>>  # gcjwebplugin.so.
>>  gcjwebplugin.so: gcjwebplugin.cc
>>
>>
>>     



From gbenson at redhat.com  Thu Nov  8 13:49:02 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 8 Nov 2007 21:49:02 +0000
Subject: changeset in /hg/icedtea: 2007-11-08 Lillian Angel <langel@red...
In-Reply-To: <47336F7F.5010201@redhat.com>
References: <hg.460ca073dc80.1194546290.-6899778133799504387@icedtea.classpath.org>
	<20071108202447.GA15733@redhat.com> <47336F7F.5010201@redhat.com>
Message-ID: <20071108214902.GB16021@redhat.com>

Lillian Angel wrote:
> Gary Benson wrote:
> > There's i386s in that patch.
> 
> Yep, sorry. Just fixed it.

Ta

Cheers,
Gary


From amitsaha.in at gmail.com  Thu Nov  8 23:54:29 2007
From: amitsaha.in at gmail.com (Amit Kumar Saha)
Date: Fri, 9 Nov 2007 13:24:29 +0530
Subject: Newbie Query
In-Reply-To: <18227.18807.531071.651254@zebedee.pink>
References: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>
	<18227.18807.531071.651254@zebedee.pink>
Message-ID: <547db2260711082354le27a0c0k5c0faef1bc8500dc@mail.gmail.com>

On Nov 8, 2007 11:07 PM, Andrew Haley <aph at redhat.com> wrote:
>
> When you build IcedTea you have to download OpenJDK from Sun.

Does it work something like this:

1. IcedTea builds Open JDK , but only when it has replaced the
encumbered code by relevant GNU Classpath packages.

2. IcedTea uses 'gcj' for the compilation process.


Thanks,
Amit
-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com


From amitksaha at netbeans.org  Thu Nov  8 23:56:41 2007
From: amitksaha at netbeans.org (Amit Kumar Saha)
Date: Fri, 9 Nov 2007 13:26:41 +0530
Subject: Newbie Query
In-Reply-To: <18227.18807.531071.651254@zebedee.pink>
References: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>
	<18227.18807.531071.651254@zebedee.pink>
Message-ID: <547db2260711082356g5d774172va3c9512721e7370d@mail.gmail.com>

On Nov 8, 2007 11:07 PM, Andrew Haley <aph at redhat.com> wrote:
>
> When you build IcedTea you have to download OpenJDK from Sun.

Does it work something like this:

1. IcedTea builds Open JDK , but only when it has replaced the
encumbered code by relevant GNU Classpath packages.

2. IcedTea uses 'gcj' for the compilation process.


Thanks,
Amit

-- 
Amit Kumar Saha
*NetBeans Community Docs
Contribution Coordinator*
me blogs@ http://amitksaha.blogspot.com
URL:http://amitsaha.in.googlepages.com


From gbenson at redhat.com  Fri Nov  9 00:28:26 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 9 Nov 2007 08:28:26 +0000
Subject: ecj bootstrap
Message-ID: <20071109082826.GA3713@redhat.com>

Hi all,

Are people managing to build with the ecj bootstrap stuff?  I've
tried it on three different platforms (Fedora 7 i386 and ppc, and
Fedora 8 ppc), and I get the same error each time: ecj bombs out
during the langtools build because its source level is wrong.  I
attached the end of a log.  I can only build if I apply something
like the attached patch.

Any clues?

Cheers,
Gary
-------------- next part --------------
make[2]: Entering directory `/home/gbenson/mixtec/openjdk-ecj/langtools/make'
JAVAC=/home/gbenson/mixtec/bootstrap/jdk1.6.0/bin/javac ANT_OPTS=-Djava.io.tmpdir='/home/gbenson/mixtec/openjdk-ecj/control/build/linux-ppc/langtools/build/ant-tmp' ant -diagnostics > /home/gbenson/mixtec/openjdk-ecj/control/build/linux-ppc/langtools/build/ant-diagnostics.log
JAVAC=/home/gbenson/mixtec/bootstrap/jdk1.6.0/bin/javac ANT_OPTS=-Djava.io.tmpdir='/home/gbenson/mixtec/openjdk-ecj/control/build/linux-ppc/langtools/build/ant-tmp' ant -Djdk.version=1.7.0 -Dfull.version='1.7.0-b22'  -Dmilestone=internal -Dbuild.number=b22 -Djavac.target=5 -Dboot.java.home=/home/gbenson/mixtec/bootstrap/jdk1.6.0 -Dbuild.dir=/home/gbenson/mixtec/openjdk-ecj/control/build/linux-ppc/langtools/build -Ddist.dir=/home/gbenson/mixtec/openjdk-ecj/control/build/linux-ppc/langtools/dist -Dfindbugs.home=/NOT-SET/devtools/share/findbugs/latest build
Buildfile: build.xml

-def-check:

-check-boot.java.home:

-def-pcompile:
    [mkdir] Created dir: /home/gbenson/mixtec/openjdk-ecj/control/build/linux-ppc/langtools/build/toolclasses
    [javac] Compiling 2 source files to /home/gbenson/mixtec/openjdk-ecj/control/build/linux-ppc/langtools/build/toolclasses
    [javac] ----------
    [javac] 1. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompileProperties.java (at line 220)
    [javac] 	List<String> sortedKeys = new ArrayList<String>();
    [javac] 	^^^^
    [javac] The type List is not generic; it cannot be parameterized with arguments <String>
    [javac] ----------
    [javac] 2. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompilePropertie
    [javac] s.java (at line 220)
    [javac] 	List<String> sortedKeys = new ArrayList<String>();
    [javac] 	     ^^^^^^
    [javac] Syntax error, parameterized types are only available if source level is 5.0
    [javac] ----------
    [javac] 3. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompileProperties.java (at line 220)
    [javac] 	List<String> sortedKeys = new ArrayList<String>();
    [javac] 	                              ^^^^^^^^^
    [javac] The type ArrayList is not generic; it cannot be parameterized with arguments <String>
    [javac] ----------
    [javac] 4. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompilePropertie
    [javac] s.java (at line 220)
    [javac] 	List<String> sortedKeys = new ArrayList<String>();
    [javac] 	                                        ^^^^^^
    [javac] Syntax error, parameterized types are only available if source level is 5.0
    [javac] ----------
    [javac] 5. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompileProperties.java (at line 221)
    [javac] 	for ( Object key : p.keySet() ) {
    [javac] 	      ^^^^^^^^^^^^^^^^^^^^^^^
    [javac] Syntax error, 'for each' statements are only available if source level is 5.0
    [javac] ----------
    [javac] 6. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompilePropertie
    [javac] s.java (at line 221)
    [javac] 	for ( Object key : p.keySet() ) {
    [javac] 	                   ^^^^^^^^^^
    [javac] Can only iterate over an array or an instance of java.lang.Iterable
    [javac] ----------
    [javac] ----------
    [javac] 7. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompilePropertiesTask.java (at line 60)
    [javac] 	List<String> mainOpts = new ArrayList<String>();
    [javac] 	^^^^
    [javac] The type List is not generic; it cannot be parameterized with arguments <String>
    [javac] ----------
    [javac] 8. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompilePropertie
    [javac] sTask.java (at line 60)
    [javac] 	List<String> mainOpts = new ArrayList<String>();
    [javac] 	     ^^^^^^
    [javac] Syntax error, parameterized types are only available if source level is 5.0
    [javac] ----------
    [javac] 9. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompilePropertiesTask.java (at line 60)
    [javac] 	List<String> mainOpts = new ArrayList<String>();
    [javac] 	                            ^^^^^^^^^
    [javac] The type ArrayList is not generic; it cannot be parameterized with arguments <String>
    [javac] ----------
    [javac] 10. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompileProperti
    [javac] esTask.java (at line 60)
    [javac] 	List<String> mainOpts = new ArrayList<String>();
    [javac] 	                                      ^^^^^^
    [javac] Syntax error, parameterized types are only available if source level is 5.0
    [javac] ----------
    [javac] 11. ERROR in /home/gbenson/mixtec/openjdk-ecj/langtools/make/tools/CompileProperties/CompilePropertiesTask.java (at line 63)
    [javac] 	for (String path: s.getIncludedFiles()) {
    [javac] 	     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    [javac] Syntax error, 'for each' statements are only available if source level is 5.0
    [javac] ----------
    [javac] 11 problems (11 errors)

BUILD FAILED
/home/gbenson/mixtec/openjdk-ecj/langtools/make/build.xml:566: Compile failed; see the compiler error output for details.

Total time: 4 seconds
make[2]: *** [build] Error 1
make[2]: Leaving directory `/home/gbenson/mixtec/openjdk-ecj/langtools/make'
make[1]: *** [langtools-build] Error 2
make[1]: Leaving directory `/home/gbenson/mixtec/openjdk-ecj/control/make'
make: *** [stamps/icedtea-ecj.stamp] Error 2
-------------- next part --------------
diff -r 96f81d7529ad openjdk-ecj/langtools/make/build.xml
--- openjdk/langtools/make/build.xml	Thu Nov 08 13:09:11 2007 +0000
+++ openjdk/langtools/make/build.xml	Thu Nov 08 13:15:07 2007 +0000
@@ -497,7 +497,8 @@
                        includes="@{includes}"
                        sourcepath=""
                        includeAntRuntime="no"
-                       target="@{javac.target}">
+                       target="@{javac.target}"
+		       source="1.5">
                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                     <compilerarg line="${javac.version.opt}"/>
                     <compilerarg line="-Xlint"/>
@@ -511,7 +512,8 @@
                        includeAntRuntime="no"
                        target="@{javac.target}"
                        debug="${javac.debug}" 
-                       debuglevel="${javac.debuglevel}">
+                       debuglevel="${javac.debuglevel}"
+		       source="1.5">
                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                     <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
                     <compilerarg line="${javac.no.jdk.warnings}"/>
@@ -563,7 +565,8 @@
         <mkdir dir="${build.toolclasses.dir}"/>
         <javac srcdir="${make.tools.dir}/CompileProperties"
                destdir="${build.toolclasses.dir}/"
-               classpath="${ant.home}/lib/ant.jar"/>
+               classpath="${ant.home}/lib/ant.jar"
+	       source="1.5"/>
         <taskdef name="pcompile"
                  classname="CompilePropertiesTask" 
                  classpath="${build.toolclasses.dir}/"/>
diff -r 96f81d7529ad openjdk-ecj/langtools/make/build.properties
--- openjdk/langtools/make/build.properties	Thu Nov 08 13:09:11 2007 +0000
+++ openjdk/langtools/make/build.properties	Thu Nov 08 13:18:12 2007 +0000
@@ -66,7 +66,7 @@ javac.no.jdk.warnings = -XDignore.symbol
 # set the following to -version to verify the versions of javac being used
 javac.version.opt = 
 # in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
 
 # options for the <javadoc> task for javac
 javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff -r 96f81d7529ad openjdk-ecj/jaxp/make/build.xml
--- openjdk/jaxp/make/build.xml	Thu Nov 08 13:09:11 2007 +0000
+++ openjdk/jaxp/make/build.xml	Thu Nov 08 13:26:57 2007 +0000
@@ -71,7 +71,8 @@
       <mkdir dir="${build.toolclasses.dir}"/>
       <javac srcdir="${make.tools.dir}/StripProperties"
 		destdir="${build.toolclasses.dir}/"
-		classpath="${ant.home}/lib/ant.jar"/>
+		classpath="${ant.home}/lib/ant.jar"
+		source="1.5"/>
       <taskdef name="pstrip"
 		 classname="StripPropertiesTask"
 		 classpath="${build.toolclasses.dir}/"/>
@@ -85,7 +86,8 @@
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
-             target="${javac.target}">
+             target="${javac.target}"
+	     source="1.5">
          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
          <compilerarg line="${javac.version.opt}"/>
       </javac>

From matthew.flaschen at gatech.edu  Fri Nov  9 00:38:36 2007
From: matthew.flaschen at gatech.edu (Matthew Flaschen)
Date: Fri, 09 Nov 2007 03:38:36 -0500
Subject: Newbie Query
In-Reply-To: <547db2260711082356g5d774172va3c9512721e7370d@mail.gmail.com>
References: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>	<18227.18807.531071.651254@zebedee.pink>
	<547db2260711082356g5d774172va3c9512721e7370d@mail.gmail.com>
Message-ID: <47341C8C.9010804@gatech.edu>

Amit Kumar Saha wrote:
> On Nov 8, 2007 11:07 PM, Andrew Haley <aph at redhat.com> wrote:
>> When you build IcedTea you have to download OpenJDK from Sun.
> 
> Does it work something like this:
> 
> 1. IcedTea builds Open JDK , but only when it has replaced the
> encumbered code by relevant GNU Classpath packages.

Correct, though not all the encumbered code gets a replacement.  Some is
simply removed (or replaced by stubs).

> 2. IcedTea uses 'gcj' for the compilation process.

It uses ecj as a compiler, but also requires libgcj, if I understand
correctly.

However, the preferred method of building IcedTea is now to bootrap;
i.e. an old version of IcedTea is used to build the new version of IcedTea.

Matt Flaschen


From gbenson at redhat.com  Fri Nov  9 01:17:08 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 09 Nov 2007 09:17:08 +0000
Subject: changeset in /hg/icedtea: 2007-11-09  Gary Benson  <gbenson@redh...
Message-ID: <hg.45297d39ebff.1194599828.-6899778133799504387@icedtea.classpath.org>

changeset 45297d39ebff in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=45297d39ebff
description:
	2007-11-09  Gary Benson  <gbenson at redhat.com>

		* Makefile.am (stamps/extract.stamp, stamps/extract-ecj.stamp):
		Fix permissions after unzipping.
		* Makefile.in: Regenerated.

diffstat:

3 files changed, 10 insertions(+), 8 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |    6 ++----
Makefile.in |    6 ++----

diffs (59 lines):

diff -r 95982aa06faf -r 45297d39ebff ChangeLog
--- a/ChangeLog	Fri Nov 09 09:15:09 2007 +0000
+++ b/ChangeLog	Fri Nov 09 09:17:00 2007 +0000
@@ -1,3 +1,9 @@ 2007-11-08  Lillian Angel  <langel at redha
+2007-11-09  Gary Benson  <gbenson at redhat.com>
+
+	* Makefile.am (stamps/extract.stamp, stamps/extract-ecj.stamp):
+	Fix permissions after unzipping.
+	* Makefile.in: Regenerated.
+
 2007-11-08  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
diff -r 95982aa06faf -r 45297d39ebff Makefile.am
--- a/Makefile.am	Fri Nov 09 09:15:09 2007 +0000
+++ b/Makefile.am	Fri Nov 09 09:17:00 2007 +0000
@@ -141,8 +141,7 @@ stamps/extract.stamp: stamps/download.st
 	if ! test -d openjdk ; \
 	then \
 	  $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
-	  chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \
-	     -name sample.makefile.txt` ; \
+	  chmod -R ug+w openjdk ; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
@@ -232,8 +231,7 @@ stamps/extract-ecj.stamp: stamps/downloa
 	  $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \
 	  mv tmp-ecj/openjdk openjdk-ecj ; \
 	  rmdir tmp-ecj ; \
-	  chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \
-	     -name sample.makefile.txt` ; \
+	  chmod -R ug+w openjdk-ecj ; \
 	  rm -rf openjdk-ecj/jaxws; \
 	fi
 	mkdir -p stamps
diff -r 95982aa06faf -r 45297d39ebff Makefile.in
--- a/Makefile.in	Fri Nov 09 09:15:09 2007 +0000
+++ b/Makefile.in	Fri Nov 09 09:17:00 2007 +0000
@@ -690,8 +690,7 @@ stamps/extract.stamp: stamps/download.st
 	if ! test -d openjdk ; \
 	then \
 	  $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
-	  chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \
-	     -name sample.makefile.txt` ; \
+	  chmod -R ug+w openjdk ; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
@@ -736,8 +735,7 @@ stamps/extract-ecj.stamp: stamps/downloa
 	  $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \
 	  mv tmp-ecj/openjdk openjdk-ecj ; \
 	  rmdir tmp-ecj ; \
-	  chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \
-	     -name sample.makefile.txt` ; \
+	  chmod -R ug+w openjdk-ecj ; \
 	  rm -rf openjdk-ecj/jaxws; \
 	fi
 	mkdir -p stamps


From gbenson at redhat.com  Fri Nov  9 01:17:07 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 09 Nov 2007 09:17:07 +0000
Subject: changeset in /hg/icedtea: Fix date
Message-ID: <hg.95982aa06faf.1194599827.-6899778133799504387@icedtea.classpath.org>

changeset 95982aa06faf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=95982aa06faf
description:
	Fix date

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
ChangeLog |    2 +-

diffs (12 lines):

diff -r d12cd64f7a2c -r 95982aa06faf ChangeLog
--- a/ChangeLog	Thu Nov 08 15:18:01 2007 -0500
+++ b/ChangeLog	Fri Nov 09 09:15:09 2007 +0000
@@ -3,7 +3,7 @@ 2007-11-08  Lillian Angel  <langel at redha
 	* Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
 	* Makefile.in: Regenerated.
 
-2007-11-07  Gary Benson  <gbenson at redhat.com>
+2007-11-08  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-bytecodeInterpreter.patch: New file.
 	* patches/icedtea-signature-iterator.patch: Likewise.


From aph at redhat.com  Fri Nov  9 01:20:28 2007
From: aph at redhat.com (Andrew Haley)
Date: Fri, 9 Nov 2007 09:20:28 +0000
Subject: ecj bootstrap
In-Reply-To: <20071109082826.GA3713@redhat.com>
References: <20071109082826.GA3713@redhat.com>
Message-ID: <18228.9820.128929.856387@zebedee.pink>

Gary Benson writes:
 > Hi all,
 > 
 > Are people managing to build with the ecj bootstrap stuff?  I've
 > tried it on three different platforms (Fedora 7 i386 and ppc, and
 > Fedora 8 ppc), and I get the same error each time: ecj bombs out
 > during the langtools build because its source level is wrong.  I
 > attached the end of a log.  I can only build if I apply something
 > like the attached patch.
 > 
 > Any clues?

ecj is borked.  I believe there is an update in the development repo,
1:3.3.0-30.fc8.  Tell us if it works.

Andrew.

-- 
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903


From aph at redhat.com  Fri Nov  9 01:21:44 2007
From: aph at redhat.com (Andrew Haley)
Date: Fri, 9 Nov 2007 09:21:44 +0000
Subject: Newbie Query
In-Reply-To: <47341C8C.9010804@gatech.edu>
References: <547db2260711080930u3c4bc47g91e30cffbe4f800a@mail.gmail.com>
	<18227.18807.531071.651254@zebedee.pink>
	<547db2260711082356g5d774172va3c9512721e7370d@mail.gmail.com>
	<47341C8C.9010804@gatech.edu>
Message-ID: <18228.9896.462172.213956@zebedee.pink>

Matthew Flaschen writes:
 > Amit Kumar Saha wrote:
 > > On Nov 8, 2007 11:07 PM, Andrew Haley <aph at redhat.com> wrote:
 > >> When you build IcedTea you have to download OpenJDK from Sun.
 > > 
 > > Does it work something like this:
 > > 
 > > 1. IcedTea builds Open JDK , but only when it has replaced the
 > > encumbered code by relevant GNU Classpath packages.
 > 
 > Correct, though not all the encumbered code gets a replacement.  Some is
 > simply removed (or replaced by stubs).
 > 
 > > 2. IcedTea uses 'gcj' for the compilation process.
 > 
 > It uses ecj as a compiler, but also requires libgcj, if I understand
 > correctly.
 > 
 > However, the preferred method of building IcedTea is now to bootrap;
 > i.e. an old version of IcedTea is used to build the new version of IcedTea.

I wouldn't say it's preferred: building with ecj and with IcedTea
should both work.

Andrew.

-- 
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903


From gbenson at redhat.com  Fri Nov  9 01:29:04 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 9 Nov 2007 09:29:04 +0000
Subject: ecj bootstrap
In-Reply-To: <18228.9820.128929.856387@zebedee.pink>
References: <20071109082826.GA3713@redhat.com>
	<18228.9820.128929.856387@zebedee.pink>
Message-ID: <20071109092904.GB3713@redhat.com>

Andrew Haley wrote:
> Gary Benson writes:
> > Are people managing to build with the ecj bootstrap stuff?  I've
> > tried it on three different platforms (Fedora 7 i386 and ppc, and
> > Fedora 8 ppc), and I get the same error each time: ecj bombs out
> > during the langtools build because its source level is wrong.  I
> > attached the end of a log.  I can only build if I apply something
> > like the attached patch.
> > 
> > Any clues?
> 
> ecj is borked.  I believe there is an update in the development repo,
> 1:3.3.0-30.fc8.  Tell us if it works.

Is this public knowledge?  I've wasted a ridiculous amount of time on
this...

Cheers,
Gary


From gbenson at redhat.com  Fri Nov  9 01:55:16 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 9 Nov 2007 09:55:16 +0000
Subject: ecj bootstrap
In-Reply-To: <18228.9820.128929.856387@zebedee.pink>
References: <20071109082826.GA3713@redhat.com>
	<18228.9820.128929.856387@zebedee.pink>
Message-ID: <20071109095516.GC3713@redhat.com>

Andrew Haley wrote:
> Gary Benson writes:
> > Are people managing to build with the ecj bootstrap stuff?  I've
> > tried it on three different platforms (Fedora 7 i386 and ppc, and
> > Fedora 8 ppc), and I get the same error each time: ecj bombs out
> > during the langtools build because its source level is wrong.  I
> > attached the end of a log.  I can only build if I apply something
> > like the attached patch.
> > 
> > Any clues?
> 
> ecj is borked.  I believe there is an update in the development repo,
> 1:3.3.0-30.fc8.  Tell us if it works.

It doesn't.  The Fedora 8 build I mentioned was with that version.

Cheers,
Gary


From aph at redhat.com  Fri Nov  9 01:58:56 2007
From: aph at redhat.com (Andrew Haley)
Date: Fri, 9 Nov 2007 09:58:56 +0000
Subject: ecj bootstrap
In-Reply-To: <20071109095516.GC3713@redhat.com>
References: <20071109082826.GA3713@redhat.com>
	<18228.9820.128929.856387@zebedee.pink>
	<20071109095516.GC3713@redhat.com>
Message-ID: <18228.12128.297867.324507@zebedee.pink>

Gary Benson writes:
 > Andrew Haley wrote:
 > > Gary Benson writes:
 > > > Are people managing to build with the ecj bootstrap stuff?  I've
 > > > tried it on three different platforms (Fedora 7 i386 and ppc, and
 > > > Fedora 8 ppc), and I get the same error each time: ecj bombs out
 > > > during the langtools build because its source level is wrong.  I
 > > > attached the end of a log.  I can only build if I apply something
 > > > like the attached patch.
 > > > 
 > > > Any clues?
 > > 
 > > ecj is borked.  I believe there is an update in the development repo,
 > > 1:3.3.0-30.fc8.  Tell us if it works.
 > 
 > It doesn't.  The Fedora 8 build I mentioned was with that version.

Oh, dear.  Looks like the update didn't make it.  OK, we'll have to
patch the IcedTea buildfiles.

Andrew.

-- 
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903


From gbenson at redhat.com  Fri Nov  9 02:13:58 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 9 Nov 2007 10:13:58 +0000
Subject: ecj bootstrap
In-Reply-To: <18228.12128.297867.324507@zebedee.pink>
References: <20071109082826.GA3713@redhat.com>
	<18228.9820.128929.856387@zebedee.pink>
	<20071109095516.GC3713@redhat.com>
	<18228.12128.297867.324507@zebedee.pink>
Message-ID: <20071109101358.GD3713@redhat.com>

Andrew Haley wrote:
> Gary Benson writes:
> > Andrew Haley wrote:
> > > ecj is borked.  I believe there is an update in the development
> > > repo, 1:3.3.0-30.fc8.  Tell us if it works.
> > 
> > It doesn't.  The Fedora 8 build I mentioned was with that version.
> 
> Oh, dear.  Looks like the update didn't make it.  OK, we'll have to
> patch the IcedTea buildfiles.

Ok, I'll merge that patch I mailed into the big ecj patch.

Cheers,
Gary


From gbenson at redhat.com  Fri Nov  9 03:26:46 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 9 Nov 2007 11:26:46 +0000
Subject: IcedTea PPC stuff, part 2 of 2
Message-ID: <20071109112645.GE3713@redhat.com>

Hi all,

In order to build IcedTea on PPC there are a load of extra files that
need dropping into the build tree.  The way I propose doing this is
to have a new directory, "ports", the contents of which are linked
into the build trees via the rules in the attached Makefile patch.
Obviously there will only be PPC stuff in there for now, but I kept
the rules generic so you can drop other ports in there without needing
to edit anything.

Ok to commit?

Cheers,
Gary


From gbenson at redhat.com  Fri Nov  9 03:27:29 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 9 Nov 2007 11:27:29 +0000
Subject: IcedTea PPC stuff, part 2 of 2
In-Reply-To: <20071109112645.GE3713@redhat.com>
References: <20071109112645.GE3713@redhat.com>
Message-ID: <20071109112729.GF3713@redhat.com>

...the attached Makefile patch...

Gary Benson wrote:
> Hi all,
> 
> In order to build IcedTea on PPC there are a load of extra files that
> need dropping into the build tree.  The way I propose doing this is
> to have a new directory, "ports", the contents of which are linked
> into the build trees via the rules in the attached Makefile patch.
> Obviously there will only be PPC stuff in there for now, but I kept
> the rules generic so you can drop other ports in there without needing
> to edit anything.
> 
> Ok to commit?
> 
> Cheers,
> Gary
-------------- next part --------------
diff -r 3b5d33558c92 Makefile.am
--- a/Makefile.am	Fri Nov 09 05:55:15 2007 -0500
+++ b/Makefile.am	Fri Nov 09 06:17:42 2007 -0500
@@ -149,6 +149,18 @@ clean-extract:
 clean-extract:
 	rm -f stamps/extract.stamp
 	rm -rf openjdk
+
+# Link ports sources into tree
+stamps/ports.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports.stamp
 
 # Patch OpenJDK sources for plug replacements.
 if FAST_BUILD
@@ -241,6 +253,18 @@ clean-extract-ecj:
 	rm -f stamps/extract-ecj.stamp
 	rm -rf openjdk-ecj
 
+# Link ports sources into tree
+stamps/ports-ecj.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports-ecj.stamp
+
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
 
@@ -372,7 +396,7 @@ endif
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make
@@ -384,7 +408,7 @@ icedtea: stamps/tools.stamp stamps/plugs
 
 icedtea-debug: 	stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make \
@@ -409,7 +433,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
-	stamps/extract-ecj.stamp stamps/patch-ecj.stamp
+	stamps/extract-ecj.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make

From gbenson at redhat.com  Fri Nov  9 03:54:43 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 09 Nov 2007 11:54:43 +0000
Subject: changeset in /hg/icedtea: 2007-11-09  Gary Benson  <gbenson@redh...
Message-ID: <hg.3b5d33558c92.1194609283.-6899778133799504387@icedtea.classpath.org>

changeset 3b5d33558c92 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3b5d33558c92
description:
	2007-11-09  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-ecj.patch
		(langtools/make/build.xml): Add source="1.5".
		(langtools/make/build.properties): Remove -Werror.
		(jaxp/make/build.xml): Add source="1.5".

diffstat:

2 files changed, 75 insertions(+)
ChangeLog                 |    7 ++++
patches/icedtea-ecj.patch |   68 +++++++++++++++++++++++++++++++++++++++++++++

diffs (89 lines):

diff -r 45297d39ebff -r 3b5d33558c92 ChangeLog
--- a/ChangeLog	Fri Nov 09 09:17:00 2007 +0000
+++ b/ChangeLog	Fri Nov 09 05:55:15 2007 -0500
@@ -1,3 +1,10 @@ 2007-11-09  Gary Benson  <gbenson at redhat
+2007-11-09  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-ecj.patch
+	(langtools/make/build.xml): Add source="1.5".
+	(langtools/make/build.properties): Remove -Werror.
+	(jaxp/make/build.xml): Add source="1.5".
+
 2007-11-09  Gary Benson  <gbenson at redhat.com>
 
 	* Makefile.am (stamps/extract.stamp, stamps/extract-ecj.stamp):
diff -r 45297d39ebff -r 3b5d33558c92 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Fri Nov 09 09:17:00 2007 +0000
+++ b/patches/icedtea-ecj.patch	Fri Nov 09 05:55:15 2007 -0500
@@ -798,3 +798,71 @@ diff -ruN openjdk.old/corba/make/com/sun
  
  # Langtools
  ifdef LANGTOOLS_DIST
+diff -ru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
+--- openjdk-ecj.orig/langtools/make/build.xml	2007-10-12 08:47:30.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml	2007-11-09 10:25:54.000000000 +0000
+@@ -497,7 +497,8 @@
+                        includes="@{includes}"
+                        sourcepath=""
+                        includeAntRuntime="no"
+-                       target="@{javac.target}">
++                       target="@{javac.target}"
++                       source="1.5">
+                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+                     <compilerarg line="${javac.version.opt}"/>
+                     <compilerarg line="-Xlint"/>
+@@ -511,7 +512,8 @@
+                        includeAntRuntime="no"
+                        target="@{javac.target}"
+                        debug="${javac.debug}" 
+-                       debuglevel="${javac.debuglevel}">
++                       debuglevel="${javac.debuglevel}"
++                       source="1.5">
+                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+                     <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
+                     <compilerarg line="${javac.no.jdk.warnings}"/>
+@@ -563,7 +565,8 @@
+         <mkdir dir="${build.toolclasses.dir}"/>
+         <javac srcdir="${make.tools.dir}/CompileProperties"
+                destdir="${build.toolclasses.dir}/"
+-               classpath="${ant.home}/lib/ant.jar"/>
++               classpath="${ant.home}/lib/ant.jar"
++               source="1.5"/>
+         <taskdef name="pcompile"
+                  classname="CompilePropertiesTask" 
+                  classpath="${build.toolclasses.dir}/"/>
+diff -ru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
+--- openjdk-ecj.orig/langtools/make/build.properties	2007-10-12 08:47:30.000000000 +0100
++++ openjdk-ecj/langtools/make/build.properties	2007-11-09 10:25:54.000000000 +0000
+@@ -66,7 +66,7 @@
+ # set the following to -version to verify the versions of javac being used
+ javac.version.opt = 
+ # in time, there should be no exceptions to -Xlint:all
+-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
++javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
+ 
+ # options for the <javadoc> task for javac
+ javadoc.jls3.url=http://java.sun.com/docs/books/jls/
+diff -ru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
+--- openjdk-ecj.orig/jaxp/make/build.xml	2007-10-12 08:50:26.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml	2007-11-09 10:25:54.000000000 +0000
+@@ -71,7 +71,8 @@
+       <mkdir dir="${build.toolclasses.dir}"/>
+       <javac srcdir="${make.tools.dir}/StripProperties"
+ 		destdir="${build.toolclasses.dir}/"
+-		classpath="${ant.home}/lib/ant.jar"/>
++		classpath="${ant.home}/lib/ant.jar"
++		source="1.5"/>
+       <taskdef name="pstrip"
+ 		 classname="StripPropertiesTask"
+ 		 classpath="${build.toolclasses.dir}/"/>
+@@ -85,7 +86,8 @@
+              destdir="${build.classes.dir}"
+              memoryInitialSize="${javac.memoryInitialSize}"
+              memoryMaximumSize="${javac.memoryMaximumSize}"
+-             target="${javac.target}">
++             target="${javac.target}"
++             source="1.5">
+          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
+          <compilerarg line="${javac.version.opt}"/>
+       </javac>


From gbenson at redhat.com  Fri Nov  9 04:37:37 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 09 Nov 2007 12:37:37 +0000
Subject: changeset in /hg/icedtea: 2007-11-09  Gary Benson  <gbenson@redh...
Message-ID: <hg.4f317ccfdce2.1194611857.-6899778133799504387@icedtea.classpath.org>

changeset 4f317ccfdce2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4f317ccfdce2
description:
	2007-11-09  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-ecj.patch
		(j2se/make/common/Release.gmk): Avoid long argument lists.

diffstat:

2 files changed, 27 insertions(+), 10 deletions(-)
ChangeLog                 |    5 +++++
patches/icedtea-ecj.patch |   32 ++++++++++++++++++++++----------

diffs (71 lines):

diff -r 3b5d33558c92 -r 4f317ccfdce2 ChangeLog
--- a/ChangeLog	Fri Nov 09 05:55:15 2007 -0500
+++ b/ChangeLog	Fri Nov 09 07:37:31 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-09  Gary Benson  <gbenson at redhat
+2007-11-09  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-ecj.patch
+	(j2se/make/common/Release.gmk): Avoid long argument lists.
+
 2007-11-09  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-ecj.patch
diff -r 3b5d33558c92 -r 4f317ccfdce2 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Fri Nov 09 05:55:15 2007 -0500
+++ b/patches/icedtea-ecj.patch	Fri Nov 09 07:37:31 2007 -0500
@@ -732,25 +732,37 @@ diff -ruN openjdk.old/corba/make/com/sun
  classheaders.clean:
 --- openjdk.old/j2se/make/common/Release.gmk	2007-11-07 11:48:30.000000000 -0500
 +++ openjdk-ecj/j2se/make/common/Release.gmk	2007-11-07 11:49:02.000000000 -0500
-@@ -652,7 +652,7 @@
- $(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
+@@ -649,10 +649,11 @@
+ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
+-$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
++$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ 	$(prep-target)
+-	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
-+	    `cat $(RES_JAR_ARGLIST)` $(JAR_JFLAGS)
++	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
++	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++	    $(JAR_JFLAGS))
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
-@@ -711,7 +711,7 @@
- $(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
+@@ -708,10 +709,11 @@
+ $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
  	$(prep-target)
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
+-$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
++$(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ 	$(prep-target)
+-	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
-+	    `cat $(RT_JAR_ARGLIST)` $(JAR_JFLAGS)
++	(cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
++	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++	    $(JAR_JFLAGS))
  	@$(java-vm-cleanup)
  
  # Meta-index construction to make core class loaders lazier
-@@ -945,19 +945,6 @@
+@@ -945,19 +947,6 @@
  	@$(java-vm-cleanup)
  	$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
  	@#
@@ -770,7 +782,7 @@ diff -ruN openjdk.old/corba/make/com/sun
  	@# CORBA supported orb.idl and ir.idl should be copied to lib
  	@#
  	$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1036,16 +1023,6 @@
+@@ -1036,16 +1025,6 @@
  	$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
  	$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
  	$(RM) -r $(JDK_IMAGE_DIR)/src


From langel at redhat.com  Fri Nov  9 06:34:10 2007
From: langel at redhat.com (Lillian Angel)
Date: Fri, 09 Nov 2007 14:34:10 +0000
Subject: changeset in /hg/icedtea: 2007-11-09  Lillian Angel  <langel@red...
Message-ID: <hg.93bc6c6a21b7.1194618850.-6899778133799504387@icedtea.classpath.org>

changeset 93bc6c6a21b7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=93bc6c6a21b7
description:
	2007-11-09  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Fixed typo that caused debug target to fail.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 7 insertions(+), 2 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    2 +-
Makefile.in |    2 +-

diffs (36 lines):

diff -r 4f317ccfdce2 -r 93bc6c6a21b7 ChangeLog
--- a/ChangeLog	Fri Nov 09 07:37:31 2007 -0500
+++ b/ChangeLog	Fri Nov 09 09:33:23 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-09  Gary Benson  <gbenson at redhat
+2007-11-09  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Fixed typo that caused debug target to fail.
+	* Makefile.in: Regenerated.
+
 2007-11-09  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-ecj.patch
diff -r 4f317ccfdce2 -r 93bc6c6a21b7 Makefile.am
--- a/Makefile.am	Fri Nov 09 07:37:31 2007 -0500
+++ b/Makefile.am	Fri Nov 09 09:33:23 2007 -0500
@@ -33,7 +33,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
 
 # OpenJDK build environment.
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)/
+BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
 	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
 ICEDTEA_RT = \
diff -r 4f317ccfdce2 -r 93bc6c6a21b7 Makefile.in
--- a/Makefile.in	Fri Nov 09 07:37:31 2007 -0500
+++ b/Makefile.in	Fri Nov 09 09:33:23 2007 -0500
@@ -196,7 +196,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
 
 # OpenJDK build environment.
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)/
+BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
 	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
 


From gbenson at redhat.com  Mon Nov 12 03:27:22 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 12 Nov 2007 11:27:22 +0000
Subject: changeset in /hg/icedtea: 2007-11-12  Gary Benson  <gbenson@redh...
Message-ID: <hg.21c0927f6bcf.1194866842.-6899778133799504387@icedtea.classpath.org>

changeset 21c0927f6bcf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=21c0927f6bcf
description:
	2007-11-12  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-ports.patch: Remake for setarch and ppc64.

diffstat:

2 files changed, 133 insertions(+), 65 deletions(-)
ChangeLog                   |    4 
patches/icedtea-ports.patch |  194 ++++++++++++++++++++++++++++---------------

diffs (276 lines):

diff -r 93bc6c6a21b7 -r 21c0927f6bcf ChangeLog
--- a/ChangeLog	Fri Nov 09 09:33:23 2007 -0500
+++ b/ChangeLog	Mon Nov 12 06:27:08 2007 -0500
@@ -1,3 +1,7 @@ 2007-11-09  Lillian Angel  <langel at redha
+2007-11-12  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-ports.patch: Remake for setarch and ppc64.
+
 2007-11-09  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Fixed typo that caused debug target to fail.
diff -r 93bc6c6a21b7 -r 21c0927f6bcf patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch	Fri Nov 09 09:33:23 2007 -0500
+++ b/patches/icedtea-ports.patch	Mon Nov 12 06:27:08 2007 -0500
@@ -13,29 +13,31 @@ diff -ru openjdk.orig/hotspot/build/linu
 diff -ru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
 --- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/build/linux/makefiles/defs.make	2007-11-08 11:36:15.000000000 +0000
-@@ -87,6 +87,21 @@
+@@ -87,6 +87,23 @@
    HS_ARCH          = x86
  endif
  
-+# ppc and ppc64
-+ifneq ($(findstring ppc,$(ARCH)),)
-+  ifeq ($(ARCH_DATA_MODEL), 64)
-+    ARCH_DATA_MODEL  = 64
++# ppc
++ifeq ($(ARCH), ppc)
++  ARCH_DATA_MODEL  = 32
++  PLATFORM         = linux-ppc
++  VM_PLATFORM      = linux_ppc
++  HS_ARCH          = ppc
++endif
++
++# ppc64
++ifeq ($(ARCH), ppc64)
++  ARCH_DATA_MODEL  = 64
 +    MAKE_ARGS        += LP64=1
-+    PLATFORM         = linux-ppc64
-+    VM_PLATFORM      = linux_ppc64
-+  else
-+    ARCH_DATA_MODEL  = 32
-+    PLATFORM         = linux-ppc
-+    VM_PLATFORM      = linux_ppc
-+  endif
-+  HS_ARCH            = ppc
++  PLATFORM         = linux-ppc64
++  VM_PLATFORM      = linux_ppc64
++  HS_ARCH          = ppc
 +endif
 +
  JDK_INCLUDE_SUBDIR=linux
  
  # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-@@ -94,20 +109,16 @@
+@@ -94,20 +111,16 @@
  
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
@@ -130,23 +132,19 @@ diff -ru openjdk.orig/hotspot/make/defs.
    BUILDARCH = $(SRCARCH)
    ifeq ($(BUILDARCH), x86)
      ifdef LP64
-@@ -208,10 +210,13 @@
-       BUILDARCH = i486
-     endif
-   endif
--  ifeq ($(BUILDARCH), sparc)
--    ifdef LP64
-+  ifdef LP64
-+    ifeq ($(BUILDARCH), sparc)
+@@ -213,6 +215,11 @@
        BUILDARCH = sparcv9
      endif
-+    ifeq ($(BUILDARCH), ppc)
+   endif
++  ifeq ($(BUILDARCH), ppc)
++    ifdef LP64
 +      BUILDARCH = ppc64
 +    endif
-   endif
++  endif
  
    # LIBARCH is 1:1 mapping from BUILDARCH
-@@ -221,8 +226,10 @@
+   LIBARCH         = $(LIBARCH/$(BUILDARCH))
+@@ -221,8 +228,10 @@
    LIBARCH/sparc   = sparc
    LIBARCH/sparcv9 = sparcv9
    LIBARCH/ia64    = ia64
@@ -158,6 +156,22 @@ diff -ru openjdk.orig/hotspot/make/defs.
  endif
  
  # Required make macro settings for all platforms
+diff -r e95eb2395f60 openjdk-ecj/hotspot/build/linux/makefiles/vm.make
+--- openjdk/hotspot/build/linux/makefiles/vm.make	Fri Nov 09 16:35:08 2007 +0000
++++ openjdk/hotspot/build/linux/makefiles/vm.make	Mon Nov 12 09:09:28 2007 +0000
+@@ -122,7 +122,11 @@ mapfile_reorder : mapfile $(REORDERFILE)
+ 	rm -f $@
+ 	cat $^ > $@
+ 
+-STATIC_CXX = true
++ifeq ($(BUILDARCH), ppc64)
++  STATIC_CXX = false
++else
++  STATIC_CXX = true
++endif
+ 
+ ifeq ($(LINK_INTO),AOUT)
+   LIBJVM.o                 =
 diff -ru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
 --- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2007-11-08 11:36:15.000000000 +0000
@@ -289,59 +303,47 @@ diff -ru openjdk.orig/j2se/make/common/s
 diff -ru openjdk.orig/j2se/make/common/shared/Platform.gmk openjdk/j2se/make/common/shared/Platform.gmk
 --- openjdk.orig/j2se/make/common/shared/Platform.gmk	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/j2se/make/common/shared/Platform.gmk	2007-11-08 11:36:15.000000000 +0000
-@@ -203,6 +203,9 @@
-                 sparc*) \
-                     echo sparc \
-                     ;; \
-+                ppc*) \
-+                    echo ppc \
-+                    ;; \
-                 *) \
-                     echo $(mach) \
-                     ;; \
-@@ -211,19 +214,25 @@
-   ARCH_FAMILY := $(ARCH)
- 
-   # Linux builds may be 32-bit or 64-bit data model.
--  ifeq ($(ARCH), sparc)
--    # Linux sparc build can be either 32-bit or 64-bit.
-+  ifneq ($(filter sparc ppc,$(ARCH)),)
-+    # Linux sparc and ppc builds can be either 32-bit or 64-bit.
-     #   Default to 32, but allow explicit setting to 32 or 64.
-     ifndef ARCH_DATA_MODEL
-       ARCH_DATA_MODEL=32
-     endif
--    ifeq ($(ARCH_DATA_MODEL), 32)
--      ARCH=sparc
--    else
--      ARCH=sparcv9
-+    ifeq ($(ARCH_DATA_MODEL), 64)
-+      archExpr = case "$(ARCH)" in \
-+                   sparc) \
-+                       echo sparcv9 \
-+                       ;; \
-+                   ppc) \
-+                       echo ppc64 \
-+                       ;; \
-+                 esac
-+      ARCH := $(shell $(archExpr))
+@@ -223,9 +223,9 @@
+       ARCH=sparcv9
      endif
    else
 -    # i586 is 32-bit, amd64 is 64-bit
-+    # i586 is 32-bit, amd64 and ia64 are 64-bit
++    # i586 and ppc are 32-bit, amd64 and ppc64 are 64-bit
      ifndef ARCH_DATA_MODEL
-       ifeq ($(ARCH), i586)
+-      ifeq ($(ARCH), i586)
++      ifneq ($(filter i586 ppc,$(ARCH)),)
          ARCH_DATA_MODEL=32
+       else
+         ARCH_DATA_MODEL=64
+diff -r 29c822b7c8b2 openjdk-ecj/j2se/make/java/jli/Makefile
+--- openjdk/j2se/make/java/jli/Makefile	Mon Nov 12 09:19:31 2007 +0000
++++ openjdk/j2se/make/java/jli/Makefile	Mon Nov 12 09:24:13 2007 +0000
+@@ -50,7 +50,11 @@ ifeq ($(ARCH_FAMILY), amd64)
+ ifeq ($(ARCH_FAMILY), amd64)
+ ERGO_FAMILY=i586
+ else
++ifeq ($(ARCH_FAMILY), ppc64)
++ERGO_FAMILY=ppc
++else
+ ERGO_FAMILY=$(ARCH_FAMILY)
++endif
+ endif
+ 
+ 
 diff -ru openjdk.orig/j2se/make/javax/sound/SoundDefs.gmk openjdk/j2se/make/javax/sound/SoundDefs.gmk
 --- openjdk.orig/j2se/make/javax/sound/SoundDefs.gmk	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/j2se/make/javax/sound/SoundDefs.gmk	2007-11-08 11:36:15.000000000 +0000
-@@ -71,6 +71,10 @@
+@@ -71,6 +71,14 @@
    CPPFLAGS += -DX_ARCH=X_AMD64
  endif # ARCH amd64
  
 +ifeq ($(ARCH), ppc)
 +  CPPFLAGS += -DX_ARCH=X_PPC
 +endif # ARCH ppc
++
++ifeq ($(ARCH), ppc64)
++  CPPFLAGS += -DX_ARCH=X_PPC64
++endif # ARCH ppc64
 +
  
  # files needed for MIDI i/o
@@ -349,11 +351,73 @@ diff -ru openjdk.orig/j2se/src/share/nat
 diff -ru openjdk.orig/j2se/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/j2se/src/share/native/com/sun/media/sound/SoundDefs.h
 --- openjdk.orig/j2se/src/share/native/com/sun/media/sound/SoundDefs.h	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/j2se/src/share/native/com/sun/media/sound/SoundDefs.h	2007-11-08 11:36:15.000000000 +0000
-@@ -38,6 +38,7 @@
+@@ -38,6 +38,8 @@
  #define X_SPARCV9       3
  #define X_IA64          4
  #define X_AMD64         5
 +#define X_PPC           6
++#define X_PPC64         7
  
  // **********************************
  // Make sure you set X_PLATFORM and X_ARCH defines correctly.
+diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
+--- openjdk.orig/corba/make/common/Defs-linux.gmk	2007-11-09 14:12:27.000000000 +0000
++++ openjdk/corba/make/common/Defs-linux.gmk	2007-11-09 14:13:45.000000000 +0000
+@@ -99,6 +99,10 @@
+ LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc   += -m32 -mcpu=v9
+ LDFLAGS_COMMON_sparc    += -m32 -mcpu=v9
++CFLAGS_REQUIRED_ppc     += -m32
++LDFLAGS_COMMON_ppc      += -m32
++CFLAGS_REQUIRED_ppc64   += -m64
++LDFLAGS_COMMON_ppc64    += -m64
+ CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
+ LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
+ 
+diff -ru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk-ecj/corba/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk	2007-11-09 14:12:27.000000000 +0000
++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk	2007-11-09 14:13:45.000000000 +0000
+@@ -74,13 +74,13 @@
+     # sparc or sparcv9
+     REQUIRED_CC_VER = 4.0
+     REQUIRED_GCC_VER = 4.0.*
+-  else
+-  ifeq ($(ARCH_DATA_MODEL), 32)
++  endif
++  ifeq ($(ARCH), i586)
+     # i586
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 3.2.1*
+     REQUIRED_GCC_VER_INT = 3.2.1-7a
+-  else
++  endif
+   ifeq ($(ARCH), amd64)
+     # amd64
+     REQUIRED_CC_VER = 3.2
+@@ -91,7 +91,10 @@
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 2.9[56789].*
+   endif
+-  endif
++  ifneq ("$(findstring ppc,$(ARCH))", "")
++    # ppc or ppc64
++    REQUIRED_CC_VER = 3.2
++    REQUIRED_GCC_VER = 3.2.*
+   endif
+   # Option used to create a shared library
+   SHARED_LIBRARY_FLAG = -shared -mimpure-text
+diff -ru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk-ecj/corba/make/common/shared/Platform.gmk
+--- openjdk.orig/corba/make/common/shared/Platform.gmk	2007-11-09 14:12:27.000000000 +0000
++++ openjdk/corba/make/common/shared/Platform.gmk	2007-11-09 14:13:45.000000000 +0000
+@@ -214,9 +214,9 @@
+       ARCH=sparcv9
+     endif
+   else
+-    # i586 is 32-bit, amd64 is 64-bit
++    # i586 and ppc are 32-bit, amd64 and ppc64 are 64-bit
+     ifndef ARCH_DATA_MODEL
+-      ifeq ($(ARCH), i586)
++      ifneq ($(filter i586 ppc,$(ARCH)),)
+         ARCH_DATA_MODEL=32
+       else
+         ARCH_DATA_MODEL=64


From gbenson at redhat.com  Mon Nov 12 03:37:55 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 12 Nov 2007 11:37:55 +0000
Subject: changeset in /hg/icedtea: 2007-11-12  Gary Benson  <gbenson@redh...
Message-ID: <hg.9dcd398427b7.1194867475.-6899778133799504387@icedtea.classpath.org>

changeset 9dcd398427b7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9dcd398427b7
description:
	2007-11-12  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/build/linux/platform_ppc: New file.
		* ports/hotspot/build/linux/platform_ppc64: Likewise.
		* ports/hotspot/build/linux/makefiles/ppc.make: Likewise.
		* ports/hotspot/build/linux/makefiles/ppc64.make: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp:
		Likewise.
		* ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/bytes_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/codeBuffer_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/copy_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp:
		Likewise.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/debug_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/depChecker_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/depChecker_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/dump_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/frame_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/frame_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/globals_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/jniFastGetField_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/jni_ppc.h: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/registerMap_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/register_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp:
		Likewise.
		* ports/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/templateTable_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/templateTable_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vmStructs_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.inline.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vtableStubs_ppc.cpp: Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s: Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s: Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp: Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp: Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp: Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp: Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp:
		Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/vm_version_linux_ppc.cpp:
		Likewise.
		* ports/j2se/src/solaris/bin/ppc/jvm.cfg: Likewise.
		* ports/j2se/src/solaris/bin/ppc64/jvm.cfg: Likewise.
		* ports/j2se/src/solaris/bin/ergo_ppc.c: Likewise.
		* Makefile.am: Link the above into the build trees before building.
		* Makefile.in: Regenerated.

diffstat:

71 files changed, 9161 insertions(+), 6 deletions(-)
ChangeLog                                                              |  104 
Makefile.am                                                            |   30 
Makefile.in                                                            |   30 
ports/hotspot/build/linux/makefiles/ppc.make                           |   34 
ports/hotspot/build/linux/makefiles/ppc64.make                         |   37 
ports/hotspot/build/linux/platform_ppc                                 |   17 
ports/hotspot/build/linux/platform_ppc64                               |   17 
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp                         | 1371 +++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp                         |  398 ++
ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp               |   98 
ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp        |  281 ++
ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.cpp                         |   32 
ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.hpp                         |   25 
ports/hotspot/src/cpu/ppc/vm/bytes_ppc.hpp                             |  168 +
ports/hotspot/src/cpu/ppc/vm/codeBuffer_ppc.hpp                        |   27 
ports/hotspot/src/cpu/ppc/vm/copy_ppc.hpp                              |  166 +
ports/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp           |   30 
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp                    | 1380 ++++++++++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.hpp                    |   32 
ports/hotspot/src/cpu/ppc/vm/debug_ppc.cpp                             |   32 
ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.hpp                      |   46 
ports/hotspot/src/cpu/ppc/vm/dump_ppc.cpp                              |   37 
ports/hotspot/src/cpu/ppc/vm/frame_ppc.cpp                             |  122 
ports/hotspot/src/cpu/ppc/vm/frame_ppc.hpp                             |   66 
ports/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp                      |  175 +
ports/hotspot/src/cpu/ppc/vm/globals_ppc.hpp                           |   54 
ports/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp                          |   52 
ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp                            |  101 
ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp                            |   43 
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp                       |  121 
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp                       |   36 
ports/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp              |   37 
ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp                     |  329 ++
ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.hpp                     |  151 +
ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp                       |  187 +
ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.hpp                       |   56 
ports/hotspot/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp                   |   72 
ports/hotspot/src/cpu/ppc/vm/jniFastGetField_ppc.cpp                   |   67 
ports/hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp                          |  108 
ports/hotspot/src/cpu/ppc/vm/jni_ppc.h                                 |   32 
ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp                        |  166 +
ports/hotspot/src/cpu/ppc/vm/registerMap_ppc.hpp                       |   39 
ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp              |  115 
ports/hotspot/src/cpu/ppc/vm/register_ppc.cpp                          |   51 
ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp                          |  250 +
ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp                         |   68 
ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.hpp                         |   34 
ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp                     |  248 +
ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp                     |  512 +++
ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.hpp                      |   56 
ports/hotspot/src/cpu/ppc/vm/vmStructs_ppc.hpp                         |   52 
ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp                        |   32 
ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp                             |   45 
ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.inline.hpp                      |   32 
ports/hotspot/src/cpu/ppc/vm/vtableStubs_ppc.cpp                       |   47 
ports/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp      |  160 +
ports/hotspot/src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp       |   43 
ports/hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp            |   43 
ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s                      |   76 
ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s                    |   96 
ports/hotspot/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp |  101 
ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp                 |  305 ++
ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp                 |   33 
ports/hotspot/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp    |   34 
ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp           |   42 
ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp           |   32 
ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp             |   63 
ports/hotspot/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp          |   45 
ports/j2se/src/solaris/bin/ergo_ppc.c                                  |   58 
ports/j2se/src/solaris/bin/ppc/jvm.cfg                                 |   44 
ports/j2se/src/solaris/bin/ppc64/jvm.cfg                               |   44 

diffs (truncated from 9522 to 500 lines):

diff -r 21c0927f6bcf -r 9dcd398427b7 ChangeLog
--- a/ChangeLog	Mon Nov 12 06:27:08 2007 -0500
+++ b/ChangeLog	Mon Nov 12 06:37:43 2007 -0500
@@ -1,3 +1,107 @@ 2007-11-12  Gary Benson  <gbenson at redhat
+2007-11-12  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/build/linux/platform_ppc: New file.
+	* ports/hotspot/build/linux/platform_ppc64: Likewise.
+	* ports/hotspot/build/linux/makefiles/ppc.make: Likewise.
+	* ports/hotspot/build/linux/makefiles/ppc64.make: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp:
+	Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/bytecodes_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/bytes_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/codeBuffer_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/copy_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp:
+	Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/debug_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/depChecker_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/depChecker_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/disassembler_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/dump_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/frame_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/frame_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/frame_ppc.inline.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/globals_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/jniFastGetField_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/jniTypes_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/jni_ppc.h: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/registerMap_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/register_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/relocInfo_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/stubRoutines_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp:
+	Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/templateTable_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/templateTable_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vmStructs_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.inline.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vtableStubs_ppc.cpp: Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc.s: Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/linux_ppc64.s: Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp: Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp: Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp: Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp: Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp:
+	Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/vm_version_linux_ppc.cpp:
+	Likewise.
+	* ports/j2se/src/solaris/bin/ppc/jvm.cfg: Likewise.
+	* ports/j2se/src/solaris/bin/ppc64/jvm.cfg: Likewise.
+	* ports/j2se/src/solaris/bin/ergo_ppc.c: Likewise.
+	* Makefile.am: Link the above into the build trees before building.
+	* Makefile.in: Regenerated.
+
 2007-11-12  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-ports.patch: Remake for setarch and ppc64.
diff -r 21c0927f6bcf -r 9dcd398427b7 Makefile.am
--- a/Makefile.am	Mon Nov 12 06:27:08 2007 -0500
+++ b/Makefile.am	Mon Nov 12 06:37:43 2007 -0500
@@ -149,6 +149,18 @@ clean-extract:
 clean-extract:
 	rm -f stamps/extract.stamp
 	rm -rf openjdk
+
+# Link ports sources into tree
+stamps/ports.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports.stamp
 
 # Patch OpenJDK sources for plug replacements.
 if FAST_BUILD
@@ -241,6 +253,18 @@ clean-extract-ecj:
 	rm -f stamps/extract-ecj.stamp
 	rm -rf openjdk-ecj
 
+# Link ports sources into tree
+stamps/ports-ecj.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports-ecj.stamp
+
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
 
@@ -372,7 +396,7 @@ endif
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make
@@ -384,7 +408,7 @@ icedtea: stamps/tools.stamp stamps/plugs
 
 icedtea-debug: 	stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make \
@@ -409,7 +433,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
-	stamps/extract-ecj.stamp stamps/patch-ecj.stamp
+	stamps/extract-ecj.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make
diff -r 21c0927f6bcf -r 9dcd398427b7 Makefile.in
--- a/Makefile.in	Mon Nov 12 06:27:08 2007 -0500
+++ b/Makefile.in	Mon Nov 12 06:37:43 2007 -0500
@@ -699,6 +699,18 @@ clean-extract:
 	rm -f stamps/extract.stamp
 	rm -rf openjdk
 
+# Link ports sources into tree
+stamps/ports.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports.stamp
+
 stamps/patch.stamp: stamps/extract.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
@@ -744,6 +756,18 @@ clean-extract-ecj:
 clean-extract-ecj:
 	rm -f stamps/extract-ecj.stamp
 	rm -rf openjdk-ecj
+
+# Link ports sources into tree
+stamps/ports-ecj.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports-ecj.stamp
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
@@ -855,7 +879,7 @@ clean-bootstrap-directory-symlink-ecj:
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make
@@ -867,7 +891,7 @@ icedtea: stamps/tools.stamp stamps/plugs
 
 icedtea-debug: 	stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make \
@@ -892,7 +916,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
-	stamps/extract-ecj.stamp stamps/patch-ecj.stamp
+	stamps/extract-ecj.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make
diff -r 21c0927f6bcf -r 9dcd398427b7 ports/hotspot/build/linux/makefiles/ppc.make
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/build/linux/makefiles/ppc.make	Mon Nov 12 06:37:43 2007 -0500
@@ -0,0 +1,34 @@
+#
+# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007 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.
+#
+#
+
+# Not included in includeDB because it has no dependencies
+Obj_Files += linux_ppc.o
+
+# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
+
+OPT_CFLAGS/compactingPermGenGen.o = -O1
diff -r 21c0927f6bcf -r 9dcd398427b7 ports/hotspot/build/linux/makefiles/ppc64.make
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/build/linux/makefiles/ppc64.make	Mon Nov 12 06:37:43 2007 -0500
@@ -0,0 +1,37 @@
+#
+# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007 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.
+#
+#
+
+# Not included in includeDB because it has no dependencies
+Obj_Files += linux_ppc64.o
+
+# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
+
+# Specify that the CPU is 64 bit
+CFLAGS += -D_LP64=1
+
+OPT_CFLAGS/compactingPermGenGen.o = -O1
diff -r 21c0927f6bcf -r 9dcd398427b7 ports/hotspot/build/linux/platform_ppc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/build/linux/platform_ppc	Mon Nov 12 06:37:43 2007 -0500
@@ -0,0 +1,17 @@
+os_family = linux
+
+arch = ppc
+
+arch_model = ppc
+
+os_arch = linux_ppc
+
+os_arch_model = linux_ppc
+
+lib_arch = ppc
+
+compiler = gcc
+
+gnu_dis_arch = ppc
+
+sysdefs = -DLINUX -D_GNU_SOURCE -DPPC -DPPC32 -DCC_INTERP -DXXX_EVIL_EVIL_EVIL
diff -r 21c0927f6bcf -r 9dcd398427b7 ports/hotspot/build/linux/platform_ppc64
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/build/linux/platform_ppc64	Mon Nov 12 06:37:43 2007 -0500
@@ -0,0 +1,17 @@
+os_family = linux
+
+arch = ppc
+
+arch_model = ppc
+
+os_arch = linux_ppc
+
+os_arch_model = linux_ppc
+
+lib_arch = ppc
+
+compiler = gcc
+
+gnu_dis_arch = ppc
+
+sysdefs = -DLINUX -D_GNU_SOURCE -DPPC -DPPC64 -DCC_INTERP -DXXX_EVIL_EVIL_EVIL
diff -r 21c0927f6bcf -r 9dcd398427b7 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Mon Nov 12 06:37:43 2007 -0500
@@ -0,0 +1,1371 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_assembler_ppc.cpp.incl"
+
+
+// Fill empty space with zeros.
+// (0x00000000 is an illegal instruction on ppc)
+
+int AbstractAssembler::code_fill_byte()
+{
+  return 0x00;
+}
+
+// Instruction emitters for the various forms.
+// Every instruction should ultimately come through one of these.
+
+void Assembler::emit_instruction(int opcode, int li, bool aa, bool lk)
+{
+  // I-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(li & ~0xffffff), "invalid operand");
+  emit_long(opcode << 26 | li << 2 | aa << 1 | lk);
+}
+void Assembler::emit_instruction(int opcode, int bo, int bi, int bd,
+                                 bool aa, bool lk) {
+  // B-form (includes SC-form)
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(bo & ~0x1f),     "invalid operand");
+  assert(!(bi & ~0x1f),     "invalid operand");
+  assert(!(bd & ~0x3fff),   "invalid operand");
+  emit_long(opcode << 26 | bo << 21 | bi << 16 | bd << 2 | aa << 1 | lk);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c)
+{
+  // D-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(a & ~0x1f),      "invalid operand");
+  assert(!(b & ~0x1f),      "invalid operand");
+  if (c < 0) {
+    assert((c & ~0xffff) == ~0xffff, "invalid operand");
+    c &= 0xffff;
+  }
+  else
+    assert(!(c & ~0xffff),  "invalid operand");
+  emit_long(opcode << 26 | a << 21 | b << 16 | c);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c, int d)
+{
+  // DS-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(a & ~0x1f),      "invalid operand");
+  assert(!(b & ~0x1f),      "invalid operand");
+  if (c < 0) {
+    assert((c & ~0x3fff) == ~0x3fff, "invalid operand");
+    c &= 0x3fff;
+  }
+  else
+    assert(!(c & ~0x3fff), "invalid operand");
+  assert(!(d & ~0x3),       "invalid operand");
+  emit_long(opcode << 26 | a << 21 | b << 16 | c << 2 | d);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c, int xo,
+                                 bool rc) {
+  // X-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(a & ~0x1f),      "invalid operand");
+  assert(!(b & ~0x1f),      "invalid operand");
+  assert(!(c & ~0x1f),      "invalid operand");
+  assert(!(xo & ~0x3ff),    "invalid operand");
+  emit_long(opcode << 26 | a << 21 | b << 16 | c << 11 | xo << 1 | rc);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c, int d,
+                                 int e, bool rc) {
+  switch (opcode) {
+  case 21:
+    // M-form
+    assert(!(a & ~0x1f),    "invalid operand");
+    assert(!(b & ~0x1f),    "invalid operand");
+    assert(!(c & ~0x1f),    "invalid operand");
+    assert(!(d & ~0x1f),    "invalid operand");
+    assert(!(e & ~0x1f),    "invalid operand");
+    break;
+
+  case 30:
+    // MD-form
+    assert(!(a & ~0x1f),    "invalid operand");
+    assert(!(b & ~0x1f),    "invalid operand");
+    assert(!(c & ~0x3f),    "invalid operand");
+    assert(!(d & ~0x3f),    "invalid operand");
+    assert(!(e & ~0x07),    "invalid operand");
+    {
+      int C = c & 0x1f;
+      int D = d & 0x1f;
+      int E = (d & 0x20) >> 1 | e << 1 | (c & 0x20) >> 5;
+
+      c = C; d = D; e = E;
+    }
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+  emit_long(opcode << 26 | a << 21 | b << 16 | c << 11 | d << 6 | e << 1 | rc);
+}


From gbenson at redhat.com  Mon Nov 12 03:53:12 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 12 Nov 2007 11:53:12 +0000
Subject: IcedTea PPC support committed
Message-ID: <20071112115311.GB3897@redhat.com>

Hi all,

My last commit added all my PPC work thus far.  With it the ecj-
bootstrap part of the build should run to completion on both ppc
and ppc64 machines.  The main part of the build fails with a
java.lang.NoSuchMethodError: java.util.EnumSet.add(Ljava/lang/Enum;)
but this is not ppc-specific -- it happens on all platforms.  I'm
looking into a fix for this now.

Cheers,
Gary


From langel at redhat.com  Mon Nov 12 08:09:31 2007
From: langel at redhat.com (Lillian Angel)
Date: Mon, 12 Nov 2007 16:09:31 +0000
Subject: changeset in /hg/icedtea: 2007-11-12  Lillian Angel  <langel@red...
Message-ID: <hg.00248c0c332a.1194883771.-6899778133799504387@icedtea.classpath.org>

changeset 00248c0c332a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=00248c0c332a
description:
	2007-11-12  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-ecj.patch: Updated. Added bootclasspath to
	        langtools/make/build.xml. Resolves EnumSet error.

diffstat:

2 files changed, 39 insertions(+), 33 deletions(-)
ChangeLog                 |    5 +++
patches/icedtea-ecj.patch |   67 ++++++++++++++++++++++-----------------------

diffs (93 lines):

diff -r 9dcd398427b7 -r 00248c0c332a ChangeLog
--- a/ChangeLog	Mon Nov 12 06:37:43 2007 -0500
+++ b/ChangeLog	Mon Nov 12 11:08:12 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-12  Gary Benson  <gbenson at redhat
+2007-11-12  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-ecj.patch: Updated. Added bootclasspath to
+	langtools/make/build.xml. Resolves EnumSet error.
+
 2007-11-12  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/build/linux/platform_ppc: New file.
diff -r 9dcd398427b7 -r 00248c0c332a patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Mon Nov 12 06:37:43 2007 -0500
+++ b/patches/icedtea-ecj.patch	Mon Nov 12 11:08:12 2007 -0500
@@ -810,39 +810,6 @@ diff -ruN openjdk.old/corba/make/com/sun
  
  # Langtools
  ifdef LANGTOOLS_DIST
-diff -ru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml	2007-10-12 08:47:30.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml	2007-11-09 10:25:54.000000000 +0000
-@@ -497,7 +497,8 @@
-                        includes="@{includes}"
-                        sourcepath=""
-                        includeAntRuntime="no"
--                       target="@{javac.target}">
-+                       target="@{javac.target}"
-+                       source="1.5">
-                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-                     <compilerarg line="${javac.version.opt}"/>
-                     <compilerarg line="-Xlint"/>
-@@ -511,7 +512,8 @@
-                        includeAntRuntime="no"
-                        target="@{javac.target}"
-                        debug="${javac.debug}" 
--                       debuglevel="${javac.debuglevel}">
-+                       debuglevel="${javac.debuglevel}"
-+                       source="1.5">
-                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-                     <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
-                     <compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -563,7 +565,8 @@
-         <mkdir dir="${build.toolclasses.dir}"/>
-         <javac srcdir="${make.tools.dir}/CompileProperties"
-                destdir="${build.toolclasses.dir}/"
--               classpath="${ant.home}/lib/ant.jar"/>
-+               classpath="${ant.home}/lib/ant.jar"
-+               source="1.5"/>
-         <taskdef name="pcompile"
-                  classname="CompilePropertiesTask" 
-                  classpath="${build.toolclasses.dir}/"/>
 diff -ru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
 --- openjdk-ecj.orig/langtools/make/build.properties	2007-10-12 08:47:30.000000000 +0100
 +++ openjdk-ecj/langtools/make/build.properties	2007-11-09 10:25:54.000000000 +0000
@@ -878,3 +845,37 @@ diff -ru openjdk-ecj.orig/jaxp/make/buil
           <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
           <compilerarg line="${javac.version.opt}"/>
        </javac>
+--- openjdk.old/langtools/make/build.xml	2007-10-12 03:47:30.000000000 -0400
++++ openjdk-ecj/langtools/make/build.xml	2007-11-12 10:30:47.000000000 -0500
+@@ -497,7 +497,9 @@
+                        includes="@{includes}"
+                        sourcepath=""
+                        includeAntRuntime="no"
+-                       target="@{javac.target}">
++                       target="@{javac.target}"
++                       source="1.5">
++		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+                     <compilerarg line="${javac.version.opt}"/>
+                     <compilerarg line="-Xlint"/>
+@@ -511,7 +513,9 @@
+                        includeAntRuntime="no"
+                        target="@{javac.target}"
+                        debug="${javac.debug}" 
+-                       debuglevel="${javac.debuglevel}">
++                       debuglevel="${javac.debuglevel}"
++                       source="1.5">
++		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+                     <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
+                     <compilerarg line="${javac.no.jdk.warnings}"/>
+@@ -563,7 +567,8 @@
+         <mkdir dir="${build.toolclasses.dir}"/>
+         <javac srcdir="${make.tools.dir}/CompileProperties"
+                destdir="${build.toolclasses.dir}/"
+-               classpath="${ant.home}/lib/ant.jar"/>
++               classpath="${ant.home}/lib/ant.jar"
++               source="1.5"/>
+         <taskdef name="pcompile"
+                  classname="CompilePropertiesTask" 
+                  classpath="${build.toolclasses.dir}/"/>


From langel at redhat.com  Mon Nov 12 10:50:33 2007
From: langel at redhat.com (Lillian Angel)
Date: Mon, 12 Nov 2007 18:50:33 +0000
Subject: changeset in /hg/icedtea: 2007-11-12  Lillian Angel  <langel@red...
Message-ID: <hg.b402f84d1960.1194893433.-6899778133799504387@icedtea.classpath.org>

changeset b402f84d1960 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b402f84d1960
description:
	2007-11-12  Lillian Angel  <langel at redhat.com>

	        * .hgignore: Updated
	        * Makefile.am
	        (ICEDTEA_ENV): Removed GENSRCDIR.
	        * Makefile.in: Regenerated
	        * generated/*: Updated files with changes specified in patch.
	        * patches/icedtea-ecj.patch
	        (GenerateCharacter.java): Patched to always insert the same date and
	        non-specific information.

diffstat:

20 files changed, 1630 insertions(+), 2504 deletions(-)
.hgignore                                             |   85 
ChangeLog                                             |   11 
Makefile.am                                           |    1 
Makefile.in                                           |    1 
generated/java/lang/CharacterData00.java              |    1 
generated/java/lang/CharacterData01.java              |    3 
generated/java/lang/CharacterData02.java              |    3 
generated/java/lang/CharacterData0E.java              |    3 
generated/java/lang/CharacterDataLatin1.java          |    1 
generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java |   30 
generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java |   60 
generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java |  107 -
generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java |  235 --
generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java |   30 
generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java |   60 
generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java |  107 -
generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java |  235 --
generated/sun/awt/X11/generator/sizer.32.c            | 1778 ++++++++---------
generated/sun/awt/X11/generator/sizes.32              | 1364 ++++++-------
patches/icedtea-ecj.patch                             |   19 

diffs (truncated from 4402 to 500 lines):

diff -r 00248c0c332a -r b402f84d1960 .hgignore
--- a/.hgignore	Mon Nov 12 11:08:12 2007 -0500
+++ b/.hgignore	Mon Nov 12 13:18:06 2007 -0500
@@ -387,79 +387,14 @@ generated/java/lang/CharacterData02.java
 generated/java/lang/CharacterData02.java
 generated/java/lang/CharacterData0E.java
 generated/java/lang/CharacterDataLatin1.java
-generated/org/omg/PortableServer/AdapterActivator.java
-generated/org/omg/PortableServer/AdapterActivatorOperations.java
-generated/org/omg/PortableServer/Current.java
-generated/org/omg/PortableServer/CurrentOperations.java
-generated/org/omg/PortableServer/CurrentPackage/NoContext.java
-generated/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
-generated/org/omg/PortableServer/ForwardRequest.java
-generated/org/omg/PortableServer/ForwardRequestHelper.java
-generated/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
-generated/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
-generated/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
-generated/org/omg/PortableServer/IdAssignmentPolicy.java
-generated/org/omg/PortableServer/IdAssignmentPolicyOperations.java
-generated/org/omg/PortableServer/IdAssignmentPolicyValue.java
-generated/org/omg/PortableServer/IdUniquenessPolicy.java
-generated/org/omg/PortableServer/IdUniquenessPolicyOperations.java
-generated/org/omg/PortableServer/IdUniquenessPolicyValue.java
-generated/org/omg/PortableServer/ImplicitActivationPolicy.java
-generated/org/omg/PortableServer/ImplicitActivationPolicyOperations.java
-generated/org/omg/PortableServer/ImplicitActivationPolicyValue.java
-generated/org/omg/PortableServer/LIFESPAN_POLICY_ID.java
-generated/org/omg/PortableServer/LifespanPolicy.java
-generated/org/omg/PortableServer/LifespanPolicyOperations.java
-generated/org/omg/PortableServer/LifespanPolicyValue.java
-generated/org/omg/PortableServer/POA.java
-generated/org/omg/PortableServer/POAManager.java
-generated/org/omg/PortableServer/POAManagerOperations.java
-generated/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
-generated/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
-generated/org/omg/PortableServer/POAManagerPackage/State.java
-generated/org/omg/PortableServer/POAOperations.java
-generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
-generated/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
-generated/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
-generated/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
-generated/org/omg/PortableServer/POAPackage/InvalidPolicy.java
-generated/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
-generated/org/omg/PortableServer/POAPackage/NoServant.java
-generated/org/omg/PortableServer/POAPackage/NoServantHelper.java
-generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
-generated/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
-generated/org/omg/PortableServer/POAPackage/ObjectNotActive.java
-generated/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
-generated/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
-generated/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
-generated/org/omg/PortableServer/POAPackage/ServantNotActive.java
-generated/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
-generated/org/omg/PortableServer/POAPackage/WrongAdapter.java
-generated/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
-generated/org/omg/PortableServer/POAPackage/WrongPolicy.java
-generated/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
-generated/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java
-generated/org/omg/PortableServer/RequestProcessingPolicy.java
-generated/org/omg/PortableServer/RequestProcessingPolicyOperations.java
-generated/org/omg/PortableServer/RequestProcessingPolicyValue.java
-generated/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java
-generated/org/omg/PortableServer/ServantActivator.java
-generated/org/omg/PortableServer/ServantActivatorHelper.java
-generated/org/omg/PortableServer/ServantActivatorOperations.java
-generated/org/omg/PortableServer/ServantActivatorPOA.java
-generated/org/omg/PortableServer/ServantLocator.java
-generated/org/omg/PortableServer/ServantLocatorHelper.java
-generated/org/omg/PortableServer/ServantLocatorOperations.java
-generated/org/omg/PortableServer/ServantLocatorPOA.java
-generated/org/omg/PortableServer/ServantManager.java
-generated/org/omg/PortableServer/ServantManagerOperations.java
-generated/org/omg/PortableServer/ServantRetentionPolicy.java
-generated/org/omg/PortableServer/ServantRetentionPolicyOperations.java
-generated/org/omg/PortableServer/ServantRetentionPolicyValue.java
-generated/org/omg/PortableServer/THREAD_POLICY_ID.java
-generated/org/omg/PortableServer/ThreadPolicy.java
-generated/org/omg/PortableServer/ThreadPolicyOperations.java
-generated/org/omg/PortableServer/ThreadPolicyValue.java
-generated/org/omg/PortableServer/_ServantActivatorStub.java
-generated/org/omg/PortableServer/_ServantLocatorStub.java
+generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java
+generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java
+generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java
+generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java
+generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java
+generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java
+generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java
+generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java
 generated/sun/awt/X11/generator/sizer.32
+generated/sun/awt/X11/generator/sizer.32.c
+generated/sun/awt/X11/generator/sizes.32
diff -r 00248c0c332a -r b402f84d1960 ChangeLog
--- a/ChangeLog	Mon Nov 12 11:08:12 2007 -0500
+++ b/ChangeLog	Mon Nov 12 13:18:06 2007 -0500
@@ -1,3 +1,14 @@ 2007-11-12  Lillian Angel  <langel at redha
+2007-11-12  Lillian Angel  <langel at redhat.com>
+
+	* .hgignore: Updated
+	* Makefile.am
+	(ICEDTEA_ENV): Removed GENSRCDIR.
+	* Makefile.in: Regenerated
+	* generated/*: Updated files with changes specified in patch.
+	* patches/icedtea-ecj.patch
+	(GenerateCharacter.java): Patched to always insert the same date and
+	non-specific information.
+
 2007-11-12  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-ecj.patch: Updated. Added bootclasspath to
diff -r 00248c0c332a -r b402f84d1960 Makefile.am
--- a/Makefile.am	Mon Nov 12 11:08:12 2007 -0500
+++ b/Makefile.am	Mon Nov 12 13:18:06 2007 -0500
@@ -60,7 +60,6 @@ ICEDTEA_ENV = \
 	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
-	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
 
 env:
diff -r 00248c0c332a -r b402f84d1960 Makefile.in
--- a/Makefile.in	Mon Nov 12 11:08:12 2007 -0500
+++ b/Makefile.in	Mon Nov 12 13:18:06 2007 -0500
@@ -227,7 +227,6 @@ ICEDTEA_ENV = \
 	"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	"CLASSPATH=" \
 	"LD_LIBRARY_PATH=" \
-	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
 
 
diff -r 00248c0c332a -r b402f84d1960 generated/java/lang/CharacterData00.java
--- a/generated/java/lang/CharacterData00.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/java/lang/CharacterData00.java	Mon Nov 12 13:18:06 2007 -0500
@@ -433,7 +433,6 @@ class CharacterData00 extends CharacterD
     private CharacterData00() {};
 
     // The following tables and code generated using:
-  // java GenerateCharacter -plane 0 -template ../../tools/GenerateCharacter/CharacterData00.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -o /notnfs/langel/icedtea-ecj/generated/java/lang/CharacterData00.java -string -usecharforbyte 11 4 1
       static final char[][][] charMap;
 // The X table has 2048 entries for a total of 4096 bytes.
 
diff -r 00248c0c332a -r b402f84d1960 generated/java/lang/CharacterData01.java
--- a/generated/java/lang/CharacterData01.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/java/lang/CharacterData01.java	Mon Nov 12 13:18:06 2007 -0500
@@ -1,4 +1,4 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:46 EST 2007
+// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -253,7 +253,6 @@ class CharacterData01 extends CharacterD
     private CharacterData01() {};
 
     // The following tables and code generated using:
-  // java GenerateCharacter -plane 1 -template ../../tools/GenerateCharacter/CharacterData01.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -o /notnfs/langel/icedtea-ecj/generated/java/lang/CharacterData01.java -string -usecharforbyte 11 4 1
   // The X table has 2048 entries for a total of 4096 bytes.
 
   static final char X[] = (
diff -r 00248c0c332a -r b402f84d1960 generated/java/lang/CharacterData02.java
--- a/generated/java/lang/CharacterData02.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/java/lang/CharacterData02.java	Mon Nov 12 13:18:06 2007 -0500
@@ -1,4 +1,4 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:46 EST 2007
+// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,7 +213,6 @@ class CharacterData02 extends CharacterD
     private CharacterData02() {};
 
     // The following tables and code generated using:
-  // java GenerateCharacter -plane 2 -template ../../tools/GenerateCharacter/CharacterData02.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -o /notnfs/langel/icedtea-ecj/generated/java/lang/CharacterData02.java -string -usecharforbyte 11 4 1
   // The X table has 2048 entries for a total of 4096 bytes.
 
   static final char X[] = (
diff -r 00248c0c332a -r b402f84d1960 generated/java/lang/CharacterData0E.java
--- a/generated/java/lang/CharacterData0E.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/java/lang/CharacterData0E.java	Mon Nov 12 13:18:06 2007 -0500
@@ -1,4 +1,4 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:46 EST 2007
+// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -215,7 +215,6 @@ class CharacterData0E extends CharacterD
     private CharacterData0E() {};
 
     // The following tables and code generated using:
-  // java GenerateCharacter -plane 14 -template ../../tools/GenerateCharacter/CharacterData0E.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -o /notnfs/langel/icedtea-ecj/generated/java/lang/CharacterData0E.java -string -usecharforbyte 11 4 1
   // The X table has 2048 entries for a total of 4096 bytes.
 
   static final char X[] = (
diff -r 00248c0c332a -r b402f84d1960 generated/java/lang/CharacterDataLatin1.java
--- a/generated/java/lang/CharacterDataLatin1.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/java/lang/CharacterDataLatin1.java	Mon Nov 12 13:18:06 2007 -0500
@@ -226,7 +226,6 @@ class CharacterDataLatin1 extends Charac
     private CharacterDataLatin1() {};
 
     // The following tables and code generated using:
-  // java GenerateCharacter -template ../../tools/GenerateCharacter/CharacterDataLatin1.java.template -spec ../../tools/UnicodeData/UnicodeData.txt -specialcasing ../../tools/UnicodeData/SpecialCasing.txt -o /notnfs/langel/icedtea-ecj/generated/java/lang/CharacterDataLatin1.java -string -usecharforbyte -latin1 8
   // The A table has 256 entries for a total of 1024 bytes.
 
   static final int A[] = new int[256];
diff -r 00248c0c332a -r b402f84d1960 generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java
--- a/generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java	Mon Nov 12 13:18:06 2007 -0500
@@ -1,31 +1,5 @@ package sun.awt.X11;
 package sun.awt.X11;
 public class XAWTIcon32_java_icon16_png {
 public static int[] java_icon16_png = { 
-16,16,
-0x689fb5c9, 
-0xcc9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 
-0xff9fb5c8, 0xff9fb5c8, 0xff9fb5c8, 0xcc9fb5c8, 0x689fb5c9, 0xcc9bb2c4, 0xffd5dade, 0xfff5f5f5, 0xfff7f7f7, 0xfff7f7f7, 
-0xfff7f7f7, 0xfff7f7f7, 0xff9b9b9b, 0xffbbbbbb, 0xfff4f4f4, 0xfff7f7f7, 0xfff7f7f7, 0xfff7f7f7, 0xfff5f5f5, 0xffd5dade, 
-0xcc9bb2c4, 0xff96acbf, 0xffededed, 0xfffcfcfc, 0xfffdfdfd, 0xfffdfdfd, 0xfffdfdfd, 0xfffdfdfd, 0xff575757, 0xff454646, 
-0xffb7a697, 0xfffafafa, 0xfffdfdfd, 0xfffdfdfd, 0xfffcfcfc, 0xffededed, 0xff96acbf, 0xff90a7ba, 0xffececec, 0xfffbfbfb, 
-0xfffbfbfb, 0xfffbfbfb, 0xfffbfbfb, 0xffededed, 0xff2e3333, 0xff3c3e3e, 0xff42433f, 0xffcfd0d0, 0xfffbfbfb, 0xfffbfbfb, 
-0xfffbfbfb, 0xffececec, 0xff90a7ba, 0xff89a1b5, 0xffe9e9e9, 0xfff9f9f9, 0xfff9f9f9, 0xfff9f9f9, 0xfff9f9f9, 0xff9e9f9f, 
-0xff4f2828, 0xffd24747, 0xffab4a4a, 0xff5e564f, 0xfff5f5f5, 0xfff9f9f9, 0xfff9f9f9, 0xffe9e9e9, 0xff89a1b5, 0xff829baf, 
-0xffe7e7e7, 0xfff6f6f6, 0xfff6f6f6, 0xffeae9e9, 0xffc6c6c6, 0xff413d35, 0xff7c2525, 0xfff84343, 0xfff84040, 0xff634241, 
-0xffcecfcf, 0xfff4f4f4, 0xffececec, 0xffe7e7e7, 0xff829baf, 0xff7b94a8, 0xffe4e4e4, 0xffebebeb, 0xff999c9f, 0xff627381, 
-0xff575c60, 0xff959696, 0xff462828, 0xff731515, 0xff7e1919, 0xffe3d2d2, 0xffa4a6a6, 0xffbebebe, 0xff949494, 0xffe4e4e4, 
-0xff7b94a8, 0xff748da2, 0xffe1e1e1, 0xff878685, 0xff6b839b, 0xffb1d4f2, 0xff929ca6, 0xffacaba9, 0xff3a3b3b, 0xff070101, 
-0xff4f4848, 0xffffffff, 0xffbbbbbb, 0xff5e5e5e, 0xff797979, 0xffe1e1e1, 0xff748da2, 0xff6c879b, 0xffdedede, 0xff5c5b5b, 
-0xff413b33, 0xff504b43, 0xff8f867a, 0xffb1b2b3, 0xff7f8080, 0xff686a6a, 0xffced0d0, 0xffffffff, 0xffcbcdcf, 0xff1d1e1f, 
-0xff444444, 0xffdcdcdc, 0xff6c879b, 0xff648094, 0xffdcdcdc, 0xff828282, 0xff484845, 0xff414e58, 0xff6f7274, 0xffbdbdbd, 
-0xffc0c0c0, 0xffd5d5d5, 0xffffffff, 0xffffffff, 0xffd9d9d9, 0xff3c4f5e, 0xff56636e, 0xffd8d8d8, 0xff648094, 0xff5d798e, 
-0xffd9d9d9, 0xffdedede, 0xffd7d7d7, 0xfffafafa, 0xff828282, 0xffaaaaaa, 0xffb7b7b7, 0xffd0d0d0, 0xffececec, 0xfffefefe, 
-0xffe4e4e4, 0xff526a7d, 0xff899eaf, 0xffd5d5d5, 0xff5d798e, 0xff567287, 0xffd6d6d6, 0xffc6c6c6, 0xffa6a6a6, 0xff8f8f8f, 
-0xff5b5c5e, 0xff737373, 0xff6a6a6a, 0xff797979, 0xff969696, 0xffd0d0d0, 0xffe1e1e1, 0xff71818e, 0xffe0e0e0, 0xffd4d4d4, 
-0xff567287, 0xff4f6c81, 0xffdbdbdb, 0xffb4b4b4, 0xff919191, 0xff737373, 0xff414141, 0xff424242, 0xff1a1a1a, 0xff0f0f0f, 
-0xff252525, 0xff7b7b7b, 0xffa1a1a1, 0xffbababa, 0xffe5e5e5, 0xffdbdbdb, 0xff4f6c81, 0xff48667c, 0xffdfdfdf, 0xffe6e6e6, 
-0xffabbbc7, 0xff87a0b4, 0xff5f7a8f, 0xff536a7d, 0xff4f6576, 0xff485c6c, 0xff3e4f5d, 0xff384550, 0xff495b6a, 0xffe2e2e2, 
-0xffe9e9e9, 0xffdfdfdf, 0xff48667c, 0xe1426177, 0xffaab0b5, 0xffe8e8e8, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 
-0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffeaeaea, 0xffaab0b5, 0xe1426177, 0x683d5d71, 
-0xcc3d5d72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 
-0xff3d5c72, 0xff3d5c72, 0xff3d5c72, 0xcc3d5d72, 0x683d5d71, }; }
+0,0
+}; }
diff -r 00248c0c332a -r b402f84d1960 generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java
--- a/generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java	Mon Nov 12 13:18:06 2007 -0500
@@ -1,61 +1,5 @@ package sun.awt.X11;
 package sun.awt.X11;
 public class XAWTIcon32_java_icon24_png {
 public static int[] java_icon24_png = { 
-24,23,
-0x1a9dbac4, 
-0x80a1b5c9, 0xd5a0b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 
-0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 
-0xd5a0b6c9, 0x80a1b5c9, 0x1a9dbac4, 0x809db3c5, 0xffbec9d2, 0xffe8ebed, 0xfff8f8f8, 0xfffafafa, 0xfffafafa, 0xfffafafa, 
-0xfffafafa, 0xfffafafa, 0xfffafafa, 0xffe3e3e3, 0xff989898, 0xffdadada, 0xfffafafa, 0xfffafafa, 0xfffafafa, 0xfffafafa, 
-0xfffafafa, 0xfffafafa, 0xfffafafa, 0xfff8f8f8, 0xffe8ebed, 0xffbec9d2, 0x809db3c5, 0xd59ab0c3, 0xffdce0e3, 0xfff5f4fb, 
-0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xffd2d1d7, 0xff4c4c4d, 0xff959598, 
-0xfff3f2f9, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xffdce0e3, 
-0xd59ab0c3, 0xff96adc0, 0xffededed, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 
-0xfff3f3fa, 0xffbbbbc1, 0xff2b2b2b, 0xff4d4d4d, 0xff88888b, 0xffe9e9f0, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 
-0xfff3f3fa, 0xfff3f3fa, 0xfff3f3fa, 0xffededed, 0xff96adc0, 0xff92a9bc, 0xffececec, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 
-0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xffeeedf4, 0xff8e8e92, 0xff282626, 0xff414242, 0xff4c4f4f, 0xff807f82, 
-0xffe6e5ec, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xfff2f1f8, 0xffececec, 0xff92a9bc, 0xff8ea5b9, 
-0xffebebeb, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xffe5e4ec, 0xff4c4c4e, 
-0xff1e2828, 0xff293434, 0xff424c4c, 0xff3d4748, 0xff8a8a8e, 0xffeeedf5, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 
-0xfff0eff7, 0xffebebeb, 0xff8ea5b9, 0xff89a1b4, 0xffe9e9e9, 0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, 
-0xffededf5, 0xffededf5, 0xffafb0b5, 0xff232627, 0xff4b2a2a, 0xffb53e3e, 0xffc34c4c, 0xff704646, 0xff394243, 0xffaeafb5, 
-0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, 0xffededf5, 0xffe9e9e9, 0xff89a1b4, 0xff849cb0, 0xffe7e7e7, 0xffebebf3, 
-0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffe5e5ed, 0xff525558, 0xff342323, 0xffba3232, 0xfffe4e4e, 
-0xffff5858, 0xffdf4949, 0xff623636, 0xff5e6568, 0xffdedee6, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffe7e7e7, 
-0xff849cb0, 0xff7f98ac, 0xffe5e5e5, 0xffe8e8f1, 0xffe8e8f1, 0xffe8e8f1, 0xffe1e1e9, 0xffd2d1d9, 0xffcacad2, 0xff97989d, 
-0xff282c2d, 0xff3d1b1b, 0xffad2828, 0xffea3f3f, 0xfffc4848, 0xfff43c3c, 0xff8c3939, 0xff454e4f, 0xffb5b6bc, 0xffe8e8f1, 
-0xffe4e4ec, 0xffd9d9e1, 0xffe4e4ed, 0xffe5e5e5, 0xff7f98ac, 0xff7a93a7, 0xffe3e3e3, 0xffe6e6ee, 0xffe1e1e8, 0xffc3c3ca, 
-0xff7f8286, 0xff525456, 0xff343435, 0xff565656, 0xff8d8f8f, 0xff4e3d3d, 0xff540e0e, 0xff9d2828, 0xffbb2a2a, 0xff9c1313, 
-0xffa86e6e, 0xffeef3f3, 0xffa0a1a4, 0xffd6d6de, 0xffc7c7ce, 0xff6c6c6f, 0xffc4c4cb, 0xffe3e3e3, 0xff7a93a7, 0xff748ea2, 
-0xffe2e2e2, 0xffd0d0d8, 0xff89898e, 0xff687b8d, 0xff7ca5c2, 0xff749bb9, 0xff64717d, 0xff8b8b8a, 0xffd4d5d5, 0xff666464, 
-0xff130000, 0xff410e0e, 0xff480a0a, 0xff400d0d, 0xffb0a3a3, 0xffffffff, 0xffbfbfbf, 0xff848489, 0xffbebec5, 0xff434345, 
-0xffb1b1b8, 0xffe2e2e2, 0xff748ea2, 0xff6f899d, 0xffe0e0e0, 0xff7a797c, 0xff393f43, 0xff82a6ca, 0xffbae3fc, 0xffbcdffe, 
-0xff94a3b5, 0xffa2a1a0, 0xffadaeac, 0xff636464, 0xff121313, 0xff050101, 0xff000202, 0xff4f5353, 0xffe4e7e7, 0xffffffff, 
-0xffe3e3e3, 0xff545455, 0xff828287, 0xff49494b, 0xffa3a3a9, 0xffe0e0e0, 0xff6f899d, 0xff698499, 0xffdddddd, 0xff4c4c4f, 
-0xff383834, 0xff3f3f40, 0xff787777, 0xffa1958b, 0xff918477, 0xffaba8a6, 0xffacaeaf, 0xff828282, 0xff464747, 0xff2d3030, 
-0xff4d5050, 0xffc0c2c2, 0xffffffff, 0xffffffff, 0xfffbfbfb, 0xff616162, 0xff19191a, 0xff303030, 0xff808085, 0xffdddddd, 
-0xff698499, 0xff647f94, 0xffdbdbdb, 0xff46484c, 0xff463f37, 0xff453a29, 0xff0e0b07, 0xff2b261a, 0xff756c5e, 0xffadacaa, 
-0xffb5b7b7, 0xffa9a9a9, 0xff949494, 0xff929292, 0xffc3c3c3, 0xfffbfbfb, 0xffffffff, 0xffffffff, 0xffffffff, 0xff8f8f93, 
-0xff313234, 0xff1a1a1a, 0xff7c7d81, 0xffdbdbdb, 0xff647f94, 0xff5e7a8f, 0xffdadada, 0xff76767c, 0xff282623, 0xff474744, 
-0xff5a5b5f, 0xff6b6c72, 0xff6f7071, 0xffafb0b0, 0xffbbbbbb, 0xffbfbfbf, 0xffc4c4c4, 0xffd1d0d0, 0xffeeeeee, 0xffffffff, 
-0xffffffff, 0xffffffff, 0xfffbfbfb, 0xff959599, 0xffa2a3aa, 0xff56575a, 0xffabacb4, 0xffdadada, 0xff5e7a8f, 0xff59758a, 
-0xffd8d8d8, 0xffc1c2cb, 0xff7d7e84, 0xffa5a6ae, 0xffd4d5df, 0xffcdced8, 0xff7c7d80, 0xffaaaaaa, 0xffb5b5b5, 0xffbdbdbd, 
-0xffc9c9c9, 0xffdadada, 0xffeeeeee, 0xfffdfdfd, 0xffffffff, 0xffffffff, 0xfffdfdfd, 0xff8c8c8e, 0xffc0c1ca, 0xffcdcdd7, 
-0xffd4d5df, 0xffd8d8d8, 0xff59758a, 0xff547186, 0xffd6d6d6, 0xffd1d3dd, 0xffd1d3dd, 0xffcfd1db, 0xffcfd1da, 0xffb6b7c0, 
-0xff717173, 0xff979797, 0xff9f9f9f, 0xffa8a8a8, 0xffb4b4b4, 0xffc2c2c2, 0xffd2d2d2, 0xffe3e3e3, 0xfff1f1f1, 0xfffdfdfd, 
-0xffffffff, 0xff979798, 0xffc1c3cb, 0xffd1d3dd, 0xffd1d3dd, 0xffd6d6d6, 0xff547186, 0xff4f6c82, 0xffd7d7d7, 0xffc0c1cb, 
-0xffb3b3bd, 0xff9c9da5, 0xff8f9097, 0xff78787f, 0xff606162, 0xff7d7d7d, 0xff6e6e6e, 0xff6e6e6e, 0xff787878, 0xff868686, 
-0xff929292, 0xffa6a6a6, 0xffc1c1c1, 0xffe1e1e1, 0xfff7f7f7, 0xff9d9d9f, 0xffc6c7d0, 0xffcfd0db, 0xffcfd0db, 0xffd7d7d7, 
-0xff4f6c82, 0xff4a687d, 0xffd9d9d9, 0xff9d9ea6, 0xff84848c, 0xff69696f, 0xff505155, 0xff3a3a3d, 0xff3f4040, 0xff717171, 
-0xff535353, 0xff393939, 0xff363637, 0xff3c3c3c, 0xff434343, 0xff575757, 0xff7f7f7f, 0xffbebebe, 0xffebebeb, 0xff919294, 
-0xffbbbcc6, 0xffcdced9, 0xffcdced9, 0xffd9d9d9, 0xff4a687d, 0xff46647a, 0xffdcdcdc, 0xffa3a4ae, 0xff9b9ca5, 0xff9798a1, 
-0xff8f9098, 0xff7a7a82, 0xff3e3e42, 0xff363637, 0xff373737, 0xff272728, 0xff333336, 0xff434347, 0xff343537, 0xff1e1e1f, 
-0xff3c3c3c, 0xff878787, 0xffa7a7a7, 0xff76767b, 0xffb9bac5, 0xffc3c4d0, 0xffc9cad6, 0xffdcdcdc, 0xff46647a, 0xd5426077, 
-0xffc2c7ca, 0xffc4c6d1, 0xffc5c7d2, 0xffc7c9d4, 0xffc7c9d4, 0xffc3c5d0, 0xffacaeb7, 0xff909199, 0xff8b8c93, 0xff8c8e95, 
-0xff9799a1, 0xffa2a3ac, 0xff93949c, 0xff67686e, 0xff444548, 0xff454648, 0xff5e5f63, 0xffa5a7af, 0xffc3c5cf, 0xffc3c5cf, 
-0xffc8cad5, 0xffc2c7ca, 0xd5426077, 0x803e5e74, 0xff778792, 0xffbbc1c4, 0xffe6e6e6, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 
-0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 
-0xffe7e7e7, 0xffe7e7e7, 0xffe7e7e7, 0xffe6e6e6, 0xffbbc1c4, 0xff778792, 0x803e5e74, 0x1a3b586c, 0x803a5a70, 0xd5395a71, 
-0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 
-0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xff3a5a70, 0xd5395a71, 0x803a5a70, 
-0x1a3b586c, }; }
+0,0
+}; }
diff -r 00248c0c332a -r b402f84d1960 generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java
--- a/generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java	Mon Nov 12 13:18:06 2007 -0500
@@ -1,108 +1,5 @@ package sun.awt.X11;
 package sun.awt.X11;
 public class XAWTIcon32_java_icon32_png {
 public static int[] java_icon32_png = { 
-32,32,
-0x0, 
-0x0, 0x409fb7c7, 0x7fa1b7c9, 0xbfa2b6ca, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 
-0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 
-0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xffa1b6c9, 0xbfa2b6ca, 0x7fa1b7c9, 0x409fb7c7, 0x0, 
-0x0, 0x0, 0x409fb3c7, 0xffaebecc, 0xffc0cbd5, 0xffd8dee2, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 
-0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 
-0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xffd8dee2, 0xffc0cbd5, 
-0xffaebecc, 0x409fb3c7, 0x0, 0x409bb3c7, 0xffacbdcb, 0xffcfd7dd, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 
-0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xffbab9be, 0xffa09fa4, 0xffeae9f0, 
-0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 
-0xfff4f3fa, 0xfff4f3fa, 0xffcfd7dd, 0xffacbdcb, 0x409bb3c7, 0x7f9bb1c5, 0xffbdc8d2, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 
-0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xff8e8d91, 
-0xff373737, 0xff858487, 0xffe6e6ec, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 
-0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xffbdc8d2, 0x7f9bb1c5, 0xbf98aec2, 0xffd4d9de, 0xfff2f1f9, 
-0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 
-0xffecebf2, 0xff77777a, 0xff333333, 0xff494949, 0xff757578, 0xffdedde4, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 
-0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xfff2f1f9, 0xffd4d9de, 0xbf98aec2, 0xff95abbf, 
-0xffececec, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 
-0xfff1f0f8, 0xfff1f0f8, 0xffd5d4db, 0xff555557, 0xff2a2a2a, 0xff444444, 0xff4c4c4c, 0xff69686b, 0xffd5d4db, 0xfff1f0f8, 
-0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 
-0xff95abbf, 0xff92a8bc, 0xffececec, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 
-0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffb6b6bb, 0xff303031, 0xff292929, 0xff3a3a3a, 0xff4f4e4e, 0xff494949, 
-0xff656567, 0xffd5d5db, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 
-0xffefeff6, 0xffefeff6, 0xff92a8bc, 0xff8ea5b9, 0xffebebeb, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 
-0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xff929296, 0xff222223, 0xff292929, 0xff303232, 
-0xff414747, 0xff4d4f4f, 0xff424141, 0xff78777a, 0xffdfdfe6, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 
-0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xff8ea5b9, 0xff8ba2b6, 0xffe9e9e9, 0xffececf4, 0xffececf4, 0xffececf4, 
-0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffd5d5dc, 0xff5b5b5e, 0xff222525, 
-0xff212828, 0xff3a2e2e, 0xff5c3e3e, 0xff534a4a, 0xff3e4646, 0xff363737, 0xff9a999e, 0xffebebf3, 0xffececf4, 0xffececf4, 
-0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xff8ba2b6, 0xff879fb3, 0xffe8e8e8, 0xffebebf3, 
-0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffa9a8ae, 
-0xff292e2f, 0xff202626, 0xff6c2c2c, 0xffdb4040, 0xffff4d4d, 0xffdf4a4a, 0xff774040, 0xff353b3b, 0xff4d5153, 0xffc8c8cf, 
-0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xffebebf3, 0xff879fb3, 0xff849cb0, 
-0xffe7e7e7, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 
-0xffd8d8df, 0xff636568, 0xff182424, 0xff5a2626, 0xffdf3838, 0xffff4b4b, 0xffff5757, 0xffff5a5a, 0xffef4747, 0xff6f3636, 
-0xff2c3535, 0xff8a8b8f, 0xffe5e5ed, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 0xffe9e9f1, 
-0xff849cb0, 0xff8098ac, 0xffe6e6e6, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 
-0xffe7e7f0, 0xffe7e7f0, 0xffaeaeb4, 0xff212627, 0xff201e1e, 0xff752121, 0xffd93434, 0xfffa4242, 0xffff5050, 0xffff5252, 
-0xffff4747, 0xffaa3333, 0xff2f2727, 0xff3b4143, 0xffcdcdd5, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 0xffe7e7f0, 
-0xffe7e7f0, 0xffe7e7f0, 0xff8098ac, 0xff7c95a9, 0xffe4e4e4, 0xffe6e6ee, 0xffe6e6ee, 0xffe6e6ee, 0xffe6e6ee, 0xffe5e5ed, 
-0xffd4d4dc, 0xffbdbdc3, 0xffafafb4, 0xff919196, 0xff4f4f51, 0xff1c2222, 0xff221b1b, 0xff591616, 0xff9f2727, 0xffcc3434, 
-0xffe63b3b, 0xffed3d3d, 0xffef3535, 0xffaa3030, 0xff635252, 0xff616868, 0xffb1b1b7, 0xffe6e6ee, 0xffe6e6ee, 0xffe0e0e8, 
-0xffc4c4ca, 0xffdbdbe2, 0xffe6e6ee, 0xffe6e6ee, 0xff7c95a9, 0xff7891a6, 0xffe3e3e3, 0xffe4e4ed, 0xffe4e4ed, 0xffe4e4ed, 
-0xffdddde6, 0xff89878a, 0xff4a4846, 0xff322e2c, 0xff1d1a1a, 0xff2d2d2e, 0xff787777, 0xffb1b4b4, 0xff706d6d, 0xff350f0f, 
-0xff631313, 0xff952626, 0xffb02c2c, 0xffbc3131, 0xffa21515, 0xff923c3c, 0xffd2c6c6, 0xffffffff, 0xffa2a2a4, 0xffb9b9c0, 
-0xffe4e4ed, 0xffc4c4cb, 0xff59595b, 0xff9f9fa5, 0xffe2e2eb, 0xffe4e4ed, 0xff7891a6, 0xff748ea2, 0xffe1e1e1, 0xffe2e2eb, 
-0xffe0e0e8, 0xffa9a9af, 0xff5b5b5e, 0xff5a6b7c, 0xff6f8da9, 0xff6f8495, 0xff76797f, 0xff5b5a5c, 0xffa6a6a7, 0xffe8e9e9, 
-0xff949595, 0xff231616, 0xff280101, 0xff571717, 0xff741e1e, 0xff7d2121, 0xff4e0000, 0xff7e5858, 0xffeceaea, 0xffffffff, 
-0xffc8c8c8, 0xff525254, 0xffd1d1d9, 0xffc9c9d1, 0xff272728, 0xff838388, 0xffe0e0e8, 0xffe2e2eb, 0xff748ea2, 0xff708a9f, 
-0xffe0e0e0, 0xffdadbe4, 0xff79797c, 0xff41474a, 0xff7d9ebd, 0xff9acdfb, 0xff96ceff, 0xff9ed4fc, 0xff93b4ca, 0xff858c93, 
-0xffa7a3a1, 0xffc7c7c7, 0xff868787, 0xff2a2929, 0xff090000, 0xff1a0404, 0xff2d0b0b, 0xff220101, 0xff200b0b, 0xffa6a1a1, 
-0xfffeffff, 0xffffffff, 0xffefefef, 0xff4e4e4e, 0xff9c9da3, 0xffd6d7df, 0xff333335, 0xff909196, 0xffdedfe8, 0xffe0e1ea, 
-0xff708a9f, 0xff6c879b, 0xffdedede, 0xffcbccd4, 0xff424141, 0xff484f55, 0xff87add0, 0xff9bc5ef, 0xffabc9dc, 0xff9db6cc, 
-0xff8492a7, 0xff909193, 0xffafadac, 0xffb7b7b7, 0xff858686, 0xff3d3f3f, 0xff1a1919, 0xff130e0e, 0xff0a0404, 0xff040000, 
-0xff565858, 0xffe0e1e1, 0xffffffff, 0xffffffff, 0xffffffff, 0xff6f6f6f, 0xff66666a, 0xff999aa0, 0xff3f3f40, 0xff6f6f73, 
-0xffd6d7df, 0xffdedfe8, 0xff6c879b, 0xff688397, 0xffdddddd, 0xffa3a4ab, 0xff222122, 0xff33302d, 0xff313435, 0xff636266, 
-0xffccc2c0, 0xffc7bbb5, 0xff8c8074, 0xff968e84, 0xffb1b2b3, 0xffb2b2b3, 0xff919191, 0xff5a5a5a, 0xff313333, 0xff282828, 
-0xff292929, 0xff515252, 0xffb6b6b6, 0xfffafafa, 0xffffffff, 0xffffffff, 0xffffffff, 0xff8d8d8d, 0xff2b2b2c, 0xff2b2b2c, 
-0xff2e2e2e, 0xff3e3e3e, 0xffc4c5cd, 0xffdcdde6, 0xff688397, 0xff647f94, 0xffdcdcdc, 0xff8c8d93, 0xff242524, 0xff4c463b, 
-0xff403426, 0xff191612, 0xff32312c, 0xff655d4c, 0xff7b6b53, 0xff9b9288, 0xffb2b4b7, 0xffb3b3b3, 0xffa3a3a3, 0xff878787, 
-0xff686868, 0xff5f5f5f, 0xff757575, 0xffaeaeae, 0xffececec, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffafafb1, 
-0xff424245, 0xff101010, 0xff1f1f1f, 0xff2c2c2d, 0xffbebfc7, 0xffdadbe5, 0xff647f94, 0xff607c90, 0xffdadada, 0xffa1a2a8, 
-0xff191a1a, 0xff4f4a41, 0xff6f604c, 0xff26231c, 0xff000000, 0xff131511, 0xff5b5449, 0xff9a9793, 0xffb5b6b7, 0xffb8b8b8, 
-0xffb3b3b3, 0xffacacac, 0xffa4a4a4, 0xffa6a6a6, 0xffb9b9b9, 0xffdfdfdf, 0xfffcfcfc, 0xffffffff, 0xffffffff, 0xffffffff, 
-0xffffffff, 0xffb6b6b8, 0xffa1a2a9, 0xff353537, 0xff1a1a1a, 0xff343435, 0xffc6c7cf, 0xffd9dae3, 0xff607c90, 0xff5c788d, 
-0xffd9d9d9, 0xffc4c5ce, 0xff313233, 0xff2f2d2b, 0xff3a3935, 0xff353839, 0xff54585c, 0xff676a6f, 0xff606266, 0xff989798, 
-0xffb7b7b7, 0xffb9b9b9, 0xffbcbcbc, 0xffbebebe, 0xffc1c1c1, 0xffc8c8c8, 0xffd8d8d8, 0xfff2f2f2, 0xffffffff, 0xffffffff, 
-0xffffffff, 0xffffffff, 0xffffffff, 0xffb1b1b1, 0xffacadb5, 0xffa0a1a8, 0xff252627, 0xff74757a, 0xffd1d2dc, 0xffd7d8e2, 
-0xff5c788d, 0xff58758a, 0xffd7d7d7, 0xffd3d4de, 0xff88888f, 0xff1b1b1d, 0xff74767b, 0xffbabcc4, 0xffcfd0da, 0xffcccdd6, 
-0xff818186, 0xff9d9d9d, 0xffb0b0b0, 0xffb7b7b7, 0xffbcbcbc, 0xffc1c1c1, 0xffc9c9c9, 0xffd4d4d4, 0xffe4e4e4, 0xfff7f7f7, 
-0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffb0b0b0, 0xff8b8c91, 0xffcdced8, 0xffb2b2bb, 0xffcbccd6, 
-0xffd5d6e0, 0xffd5d6e0, 0xff58758a, 0xff547186, 0xffd6d6d6, 0xffd3d5df, 0xffcbcdd6, 0xffb1b3bb, 0xffd1d2dc, 0xffd3d5df, 
-0xffd3d5df, 0xffc1c3cc, 0xff737477, 0xff989898, 0xffa6a6a6, 0xffadadad, 0xffb4b4b4, 0xffbababa, 0xffc3c3c3, 0xffcfcfcf, 
-0xffdddddd, 0xffeaeaea, 0xfff6f6f6, 0xfffefefe, 0xffffffff, 0xffffffff, 0xffffffff, 0xffbbbbbb, 0xff8c8d91, 0xffcbcdd6, 
-0xffd3d5df, 0xffd3d5df, 0xffd3d5df, 0xffd3d5df, 0xff547186, 0xff516e83, 0xffd6d6d6, 0xffd0d1db, 0xffd0d1da, 0xffd0d1db, 
-0xffc9cad3, 0xffc2c2cc, 0xffc4c5ce, 0xffb5b6be, 0xff68696b, 0xff8b8b8b, 0xff969696, 0xff9b9b9b, 0xffa1a1a1, 0xffa8a8a8, 
-0xffb1b1b1, 0xffbbbbbb, 0xffc6c6c6, 0xffd1d1d1, 0xffdddddd, 0xffeaeaea, 0xfff5f5f5, 0xfffefefe, 0xffffffff, 0xffcbcbcb, 
-0xff939398, 0xffcdced7, 0xffd2d3dd, 0xffd2d3dd, 0xffd2d3dd, 0xffd2d3dd, 0xff516e83, 0xff4d6b80, 0xffd8d8d8, 0xffcbccd7, 
-0xffc1c2cc, 0xffb7b8c1, 0xffadaeb7, 0xffa2a3ac, 0xff9d9ea7, 0xff909098, 0xff5c5c5f, 0xff7e7e7e, 0xff7e7e7e, 0xff7d7d7d, 
-0xff808080, 0xff868686, 0xff8e8e8e, 0xff969696, 0xffa0a0a0, 0xffababab, 0xffbababa, 0xffc9c9c9, 0xffdadada, 0xffebebeb, 
-0xfff9f9f9, 0xffcbcbcb, 0xff9c9da2, 0xffcccdd7, 0xffd0d1dc, 0xffd0d1dc, 0xffd0d1dc, 0xffd0d1dc, 0xff4d6b80, 0xff4a687d, 
-0xffd8d8d8, 0xffbcbec8, 0xffaaacb5, 0xff999ba3, 0xff898a91, 0xff76777d, 0xff696a70, 0xff5d5e62, 0xff4a4b4d, 0xff767676, 
-0xff6d6d6d, 0xff585858, 0xff525252, 0xff535353, 0xff5a5a5a, 0xff616161, 0xff696969, 0xff747474, 0xff858585, 0xff9d9d9d, 
-0xffbababa, 0xffd6d6d6, 0xffececec, 0xffcacaca, 0xff999a9f, 0xffcaccd7, 0xffced0db, 0xffced0db, 0xffced0db, 0xffced0db, 
-0xff4a687d, 0xff46657a, 0xffd7d7d7, 0xffabadb6, 0xff909199, 0xff7d7e85, 0xff68696e, 0xff4f5054, 0xff404144, 0xff333437, 
-0xff2e2e30, 0xff666666, 0xff717171, 0xff4c4c4c, 0xff373737, 0xff303030, 0xff2f2f2f, 0xff2f3030, 0xff343435, 0xff3c3d3d, 
-0xff4b4b4b, 0xff686868, 0xff939393, 0xffc0c0c0, 0xffe1e1e1, 0xffbebebe, 0xff85878d, 0xffc7c9d4, 0xffcdcfda, 0xffcdcfda, 
-0xffcdcfda, 0xffcdcfda, 0xff46657a, 0xbf436177, 0xffafb7bc, 0xffb2b2bc, 0xff9d9ea6, 0xff8e8f97, 0xff87888f, 0xff7e7f86, 
-0xff76777d, 0xff626267, 0xff333336, 0xff2d2d2d, 0xff565656, 0xff484848, 0xff2d2d2d, 0xff1e1e1f, 0xff2a2a2c, 0xff393a3d, 
-0xff39393c, 0xff2a2b2c, 0xff262626, 0xff3c3c3c, 0xff686868, 0xffa1a1a1, 0xffc4c4c4, 0xff878788, 0xff96979f, 0xffc0c1cb, 
-0xffc2c3cd, 0xffc9cad5, 0xffcccdd8, 0xffafb7bc, 0xbf436177, 0x7f405e74, 0xff8797a2, 0xffc7c8d3, 0xffc4c5cf, 0xffc2c3ce, 
-0xffc4c5cf, 0xffc5c6d1, 0xffc1c2cc, 0xffb2b3bd, 0xff8d8e95, 0xff56575b, 0xff434346, 0xff464649, 0xff424246, 0xff4f4f53, 
-0xff6f7076, 0xff8a8a92, 0xff85868d, 0xff5f5f64, 0xff2d2d2f, 0xff181818, 0xff343434, 0xff5c5c5c, 0xff626262, 0xff606064, 
-0xffafb0ba, 0xffb9bac4, 0xffbbbcc6, 0xffc5c6d0, 0xffcbccd7, 0xff8797a2, 0x7f405e74, 0x40405c74, 0xff4f6676, 0xffa5afb6, 
-0xffc9cbd7, 0xffc9cbd7, 0xffc9cbd7, 0xffc9cbd7, 0xffc9cbd7, 0xffc7c9d5, 0xffc6c8d4, 0xffc0c2ce, 0xffb9bbc6, 0xffb5b7c2, 
-0xffb4b6c0, 0xffb5b7c2, 0xffbcbeca, 0xffc3c5d1, 0xffc2c4cf, 0xffb5b7c2, 0xff9b9da6, 0xff76777e, 0xff56565b, 0xff4d4e52, 
-0xff6c6e74, 0xffaeb0ba, 0xffc5c7d3, 0xffc5c7d3, 0xffc7c9d4, 0xffc8cad6, 0xffa5afb6, 0xff4f6676, 0x40405c74, 0x0, 
-0x403c5c70, 0xff4e6676, 0xff768590, 0xffacb4b9, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 
-0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 
-0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffc8cad6, 0xffacb4b9, 0xff768590, 0xff4e6676, 0x403c5c70, 
-0x0, 0x0, 0x0, 0x40385870, 0x7f38586e, 0xbf39586d, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 
-0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 
-0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xff39586e, 0xbf39586d, 0x7f38586e, 
-0x40385870, 0x0, 0x0, }; }
+0,0
+}; }
diff -r 00248c0c332a -r b402f84d1960 generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java
--- a/generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java	Mon Nov 12 11:08:12 2007 -0500
+++ b/generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java	Mon Nov 12 13:18:06 2007 -0500
@@ -1,236 +1,5 @@ package sun.awt.X11;
 package sun.awt.X11;
 public class XAWTIcon32_java_icon48_png {
 public static int[] java_icon48_png = { 
-48,48,
-0x0, 
-0x0, 0x33a0b9c8, 0x96a1b8ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 
-0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 
-0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 
-0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 
-0xffa2b7ca, 0xffa2b7ca, 0xffa2b7ca, 0x9fa2b7ca, 0x4ba3b8c9, 0x0, 0x0, 0x0, 0x66a0b7c8, 0xfca1b6c9, 
-0xffcad3da, 0xfff0f0f2, 0xfff4f3f6, 0xfff6f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 
-0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 
-0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 
-0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff7f6f9, 0xfff6f6f9, 0xfff4f4f7, 
-0xfff1f1f3, 0xffced6dd, 0xffb3c1cf, 0x99a2b6ca, 0x0, 0x21a2b2c9, 0xf99fb5c8, 0xffdce0e4, 0xfff5f4fa, 0xfff5f4fb, 
-0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 
-0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xff9f9ea2, 0xff585859, 0xffb7b6bb, 0xfff3f2f8, 
-0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 
-0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff5f4fb, 0xfff7f6fc, 
-0xfffdfdfe, 0xffb2c1ce, 0x4ea0b4c7, 0x789db3c6, 0xffc0cad4, 0xfff4f4fa, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 
-0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 
-0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff3f3fa, 0xff86868a, 0xff3b3b3b, 0xff4e4e4e, 0xffa6a6ab, 0xffededf3, 0xfff4f4fb, 
-0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 
-0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff4f4fb, 0xfff6f6fc, 0xffd1d7df, 
-0x9f9fb4c5, 0xff9cb2c5, 0xffe8e9ed, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 
-0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 
-0xfff4f3fa, 0xffe3e2e9, 0xff656467, 0xff2c2c2c, 0xff464646, 0xff484848, 0xff969599, 0xffe8e7ed, 0xfff4f3fa, 0xfff4f3fa, 
-0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 
-0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff4f3fa, 0xfff1f1f5, 0xff9cb2c5, 0xff9ab0c4, 
-0xfff1f0f5, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 
-0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xffd3d2d8, 
-0xff4a4a4c, 0xff262626, 0xff3a3a3a, 0xff4c4c4c, 0xff434343, 0xff828285, 0xffe3e2e8, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 
-0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 
-0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff3f2f9, 0xfff2f1f6, 0xff9ab0c4, 0xff99afc2, 0xfff1f1f5, 0xfff2f2f9, 
-0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 
-0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xffb8b8bd, 0xff343435, 0xff242424, 
-0xff323232, 0xff474747, 0xff4e4e4e, 0xff414141, 0xff747477, 0xffd7d7de, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 
-0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 
-0xfff2f2f9, 0xfff2f2f9, 0xfff2f2f9, 0xfff1f1f6, 0xff99afc2, 0xff97adc0, 0xfff0f0f4, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 
-0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 
-0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xff949498, 0xff2c2c2c, 0xff262626, 0xff2d2d2d, 0xff3d3d3d, 
-0xff4d4d4d, 0xff4c4c4c, 0xff3f3f3f, 0xff6a6a6d, 0xffd1d1d7, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 
-0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 0xfff1f1f8, 
-0xfff1f1f8, 0xfff0f0f5, 0xff97adc0, 0xff95abbf, 0xfff0eff4, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 
-0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 
-0xfff1f0f8, 0xfff1f0f8, 0xffe7e6ed, 0xff6e6e71, 0xff242424, 0xff262626, 0xff2a2a2a, 0xff373737, 0xff474747, 0xff505050, 
-0xff484848, 0xff3e3e3e, 0xff646366, 0xffd2d1d8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 
-0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff1f0f8, 0xfff0eff5, 
-0xff95abbf, 0xff93a9bd, 0xffefeef3, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 
-0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 
-0xffcecdd4, 0xff48484a, 0xff222222, 0xff262626, 0xff2a2a2a, 0xff343434, 0xff414040, 0xff4c4c4c, 0xff4f4e4e, 0xff434343, 
-0xff3c3c3c, 0xff6d6d70, 0xffdddce3, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 
-0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xfff0eff7, 0xffefeef4, 0xff93a9bd, 0xff91a7bb, 
-0xffeeeef2, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 
-0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffa4a4a9, 0xff2f2f30, 
-0xff242424, 0xff272727, 0xff2b2a2a, 0xff2f3030, 0xff373c3c, 0xff424848, 0xff4e5050, 0xff4a4949, 0xff3e3d3d, 0xff383838, 
-0xff87878b, 0xffeaeaf1, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 
-0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffefeff6, 0xffeeeef3, 0xff91a7bb, 0xff8ea5b9, 0xffededf1, 0xffeeeef5, 
-0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 
-0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffe4e4eb, 0xff666669, 0xff232323, 0xff242424, 0xff272626, 
-0xff222929, 0xff222e2e, 0xff2f3737, 0xff3b4141, 0xff414c4c, 0xff444d4d, 0xff3f4040, 0xff393939, 0xff3e3e3e, 0xffadadb2, 
-0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 
-0xffeeeef5, 0xffeeeef5, 0xffeeeef5, 0xffededf2, 0xff8ea5b9, 0xff8ca3b7, 0xffececf0, 0xffededf4, 0xffededf4, 0xffededf4, 
-0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 
-0xffededf4, 0xffededf4, 0xffededf4, 0xffbababf, 0xff363637, 0xff242323, 0xff232626, 0xff1b2626, 0xff2a2828, 0xff5c3030, 
-0xff8c3a3a, 0xff984040, 0xff7d4343, 0xff544646, 0xff394444, 0xff343838, 0xff393838, 0xff575759, 0xffd4d4da, 0xffededf4, 
-0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 0xffededf4, 
-0xffededf4, 0xffececf1, 0xff8ca3b7, 0xff8aa1b5, 0xffebebf0, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 
-0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 
-0xffe8e8ef, 0xff76767a, 0xff262425, 0xff222525, 0xff182525, 0xff3e2525, 0xffa03232, 0xffeb4242, 0xffff4c4c, 0xffff4f4f, 
-0xfffa4949, 0xffc54343, 0xff6c3e3e, 0xff323b3b, 0xff333636, 0xff363535, 0xff8f8f93, 0xffe9e9f1, 0xffececf4, 0xffececf4, 
-0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffececf4, 0xffebebf1, 


From langel at redhat.com  Mon Nov 12 10:50:33 2007
From: langel at redhat.com (Lillian Angel)
Date: Mon, 12 Nov 2007 18:50:33 +0000
Subject: changeset in /hg/icedtea: Fixed typo
Message-ID: <hg.8eeff03f776d.1194893433.-6899778133799504387@icedtea.classpath.org>

changeset 8eeff03f776d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8eeff03f776d
description:
	Fixed typo

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
ChangeLog |    2 +-

diffs (12 lines):

diff -r b402f84d1960 -r 8eeff03f776d ChangeLog
--- a/ChangeLog	Mon Nov 12 13:18:06 2007 -0500
+++ b/ChangeLog	Mon Nov 12 13:49:44 2007 -0500
@@ -7,7 +7,7 @@ 2007-11-12  Lillian Angel  <langel at redha
 	* generated/*: Updated files with changes specified in patch.
 	* patches/icedtea-ecj.patch
 	(GenerateCharacter.java): Patched to always insert the same date and
-	non-specific information.
+	non-specific information, so file is not modified with every build.
 
 2007-11-12  Lillian Angel  <langel at redhat.com>
 


From langel at redhat.com  Mon Nov 12 12:31:16 2007
From: langel at redhat.com (Lillian Angel)
Date: Mon, 12 Nov 2007 20:31:16 +0000
Subject: changeset in /hg/icedtea: 2007-11-12  Lillian Angel  <langel@red...
Message-ID: <hg.a82c7471e590.1194899476.-6899778133799504387@icedtea.classpath.org>

changeset a82c7471e590 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a82c7471e590
description:
	2007-11-12  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Fixed tools.jar and rt.jar to include all directories
	        built under lib/.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 12 insertions(+), 4 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |    5 +++--
Makefile.in |    5 +++--

diffs (57 lines):

diff -r 8eeff03f776d -r a82c7471e590 ChangeLog
--- a/ChangeLog	Mon Nov 12 13:49:44 2007 -0500
+++ b/ChangeLog	Mon Nov 12 15:30:32 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-12  Lillian Angel  <langel at redha
+2007-11-12  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Fixed tools.jar and rt.jar to include all directories
+	built under lib/.
+	* Makefile.in: Regenerated.
+
 2007-11-12  Lillian Angel  <langel at redhat.com>
 
 	* .hgignore: Updated
diff -r 8eeff03f776d -r a82c7471e590 Makefile.am
--- a/Makefile.am	Mon Nov 12 13:49:44 2007 -0500
+++ b/Makefile.am	Mon Nov 12 15:30:32 2007 -0500
@@ -590,7 +590,8 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/tools-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
 	$(JAR) cf $@ -C lib/tools com -C lib/tools sun \
-	  -C lib/tools org
+	  -C lib/tools org -C lib/tools gnu -C lib/tools java \
+	  -C lib/tools javax
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -619,7 +620,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-	  -C lib/rt javax -C lib/rt sun
+	  -C lib/rt javax -C lib/rt sun -C lib/rt org
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
 	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
diff -r 8eeff03f776d -r a82c7471e590 Makefile.in
--- a/Makefile.in	Mon Nov 12 13:49:44 2007 -0500
+++ b/Makefile.in	Mon Nov 12 15:30:32 2007 -0500
@@ -1043,7 +1043,8 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/tools-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
 	$(JAR) cf $@ -C lib/tools com -C lib/tools sun \
-	  -C lib/tools org
+	  -C lib/tools org -C lib/tools gnu -C lib/tools java \
+	  -C lib/tools javax
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -1072,7 +1073,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-	  -C lib/rt javax -C lib/rt sun
+	  -C lib/rt javax -C lib/rt sun -C lib/rt org
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
 	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \


From langel at redhat.com  Mon Nov 12 20:07:21 2007
From: langel at redhat.com (Lillian Angel)
Date: Mon, 12 Nov 2007 23:07:21 -0500
Subject: IcedTea PPC support committed
In-Reply-To: <20071112115311.GB3897@redhat.com>
References: <20071112115311.GB3897@redhat.com>
Message-ID: <473922F9.9040406@redhat.com>

Gary Benson wrote:
> Hi all,
>
> My last commit added all my PPC work thus far.  With it the ecj-
> bootstrap part of the build should run to completion on both ppc
> and ppc64 machines.  

> The main part of the build fails with a
> java.lang.NoSuchMethodError: java.util.EnumSet.add(Ljava/lang/Enum;)
> but this is not ppc-specific -- it happens on all platforms.  I'm
> looking into a fix for this now.
>   

The fix for this has been committed.


Lillian


From gbenson at redhat.com  Tue Nov 13 01:14:18 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 09:14:18 +0000
Subject: changeset in /hg/icedtea: 2007-11-12 Lillian Angel <langel@red...
In-Reply-To: <hg.b402f84d1960.1194893433.-6899778133799504387@icedtea.classpath.org>
References: <hg.b402f84d1960.1194893433.-6899778133799504387@icedtea.classpath.org>
Message-ID: <20071113091418.GA3748@redhat.com>

Lillian Angel wrote:
> --- a/openjdk-ecj/j2se/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java      Mon Nov 12 16:34:44 2007 +0000
> +++ b/openjdk-ecj/j2se/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java      Tue Nov 13 08:50:28 2007 +0000
> @@ -649,7 +649,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
>          PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
>          out.println(commentStart +
>              " This file was generated AUTOMATICALLY from a template file " +
> -            new java.util.Date() + commentEnd);
> +            "Wed Nov 07 13:33:45 EST 2007" + commentEnd);
>          int marklen = commandMarker.length();
>          LOOP: while(true) {
>              try {

Do you plan to update this manually whenever you regenerate?
If not would it not make more sense to omit the date entirely?

Cheers,
Gary



From gbenson at redhat.com  Tue Nov 13 03:50:54 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 11:50:54 +0000
Subject: changeset in /hg/icedtea: 2007-11-13  Gary Benson  <gbenson@redh...
Message-ID: <hg.be4f18fe7da6.1194954653.-6899778133799504387@icedtea.classpath.org>

changeset be4f18fe7da6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=be4f18fe7da6
description:
	2007-11-13  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_native_entry): Removed an extraneous call to
		InterpreterRuntime::prepare_native_call().

diffstat:

2 files changed, 18 insertions(+), 10 deletions(-)
ChangeLog                                           |    6 +++++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp |   22 ++++++++++---------

diffs (45 lines):

diff -r a82c7471e590 -r be4f18fe7da6 ChangeLog
--- a/ChangeLog	Mon Nov 12 15:30:32 2007 -0500
+++ b/ChangeLog	Tue Nov 13 06:48:38 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-12  Lillian Angel  <langel at redha
+2007-11-13  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_native_entry): Removed an extraneous call to
+	InterpreterRuntime::prepare_native_call().
+
 2007-11-12  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Fixed tools.jar and rt.jar to include all directories
diff -r a82c7471e590 -r be4f18fe7da6 ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Mon Nov 12 15:30:32 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 13 06:48:38 2007 -0500
@@ -539,16 +539,18 @@ address InterpreterGenerator::generate_n
   Label got_function;
 
   __ load (function, native_function_addr);
-  __ compare (function, 0);
-  __ bne (got_function);
-  __ mr (r3, Rthread);
-  __ mr (r4, Rmethod);
-  __ call (CAST_FROM_FN_PTR(address, InterpreterRuntime::prepare_native_call));
-  __ load (r0, Address(Rthread, Thread::pending_exception_offset()));
-  __ compare (r0, 0);
-  __ bne (return_to_caller);
-  __ load (function, native_function_addr);
-  __ bind (got_function);
+#ifdef ASSERT
+  {
+    // InterpreterRuntime::prepare_native_call() sets the mirror
+    // handle and native function address first and the signature
+    // handler last, so function should always be set here.
+    Label ok;
+    __ compare (function, 0);
+    __ bne (ok);
+    __ should_not_reach_here (__FILE__, __LINE__);
+    __ bind (ok);
+  }
+#endif
 
   // Call signature handler
   __ mtlr (handler);


From gbenson at redhat.com  Tue Nov 13 03:50:54 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 11:50:54 +0000
Subject: changeset in /hg/icedtea: 2007-11-13  Gary Benson  <gbenson@redh...
Message-ID: <hg.55e5e7e59cb7.1194954654.-6899778133799504387@icedtea.classpath.org>

changeset 55e5e7e59cb7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=55e5e7e59cb7
description:
	2007-11-13  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_normal_entry, generate_native_entry):
		Reload the method pointer after potential safepoints.

diffstat:

2 files changed, 12 insertions(+)
ChangeLog                                           |    6 ++++++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp |    6 ++++++

diffs (36 lines):

diff -r be4f18fe7da6 -r 55e5e7e59cb7 ChangeLog
--- a/ChangeLog	Tue Nov 13 06:48:38 2007 -0500
+++ b/ChangeLog	Tue Nov 13 06:50:47 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-13  Gary Benson  <gbenson at redhat
+2007-11-13  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_normal_entry, generate_native_entry):
+	Reload the method pointer after potential safepoints.
+
 2007-11-13  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
diff -r be4f18fe7da6 -r 55e5e7e59cb7 ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 13 06:48:38 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 13 06:50:47 2007 -0500
@@ -635,6 +635,9 @@ address InterpreterGenerator::generate_n
        JavaThread::check_special_condition_for_native_trans));
   __ bind (no_block);
 
+  // The method pointer may have changed if there was a safepoint
+  __ load (Rmethod, STATE(_method));
+
   // Change the thread state
   __ load (r0, _thread_in_Java);
   __ stw (r0, thread_state_addr);
@@ -803,6 +806,9 @@ address InterpreterGenerator::generate_n
   __ mr (r3, Rstate);
   __ call (interpreter);
 
+  // The method pointer may have changed if there was a safepoint
+  __ load (Rmethod, STATE(_method));
+
   // Clear the frame anchor
   __ reset_last_Java_frame ();
 


From gbenson at redhat.com  Tue Nov 13 05:31:33 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 13:31:33 +0000
Subject: IcedTea PPC support committed
In-Reply-To: <473922F9.9040406@redhat.com>
References: <20071112115311.GB3897@redhat.com> <473922F9.9040406@redhat.com>
Message-ID: <20071113133133.GC3748@redhat.com>

Lillian Angel wrote:
> Gary Benson wrote:
> > My last commit added all my PPC work thus far.  With it the ecj-
> > bootstrap part of the build should run to completion on both ppc
> > and ppc64 machines.
> > 
> > The main part of the build fails with a
> > java.lang.NoSuchMethodError: java.util.EnumSet.add(Ljava/lang/Enum;)
> > but this is not ppc-specific -- it happens on all platforms.  I'm
> > looking into a fix for this now.
> 
> The fix for this has been committed.

Thank you, it works :)

Cheers,
Gary


From langel at redhat.com  Tue Nov 13 07:04:17 2007
From: langel at redhat.com (Lillian Angel)
Date: Tue, 13 Nov 2007 10:04:17 -0500
Subject: changeset in /hg/icedtea: 2007-11-12 Lillian Angel <langel@red...
In-Reply-To: <20071113091418.GA3748@redhat.com>
References: <hg.b402f84d1960.1194893433.-6899778133799504387@icedtea.classpath.org>
	<20071113091418.GA3748@redhat.com>
Message-ID: <4739BCF1.7090400@redhat.com>



Gary Benson wrote:
> Lillian Angel wrote:
>> --- a/openjdk-ecj/j2se/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java      Mon Nov 12 16:34:44 2007 +0000
>> +++ b/openjdk-ecj/j2se/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java      Tue Nov 13 08:50:28 2007 +0000
>> @@ -649,7 +649,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
>>          PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
>>          out.println(commentStart +
>>              " This file was generated AUTOMATICALLY from a template file " +
>> -            new java.util.Date() + commentEnd);
>> +            "Wed Nov 07 13:33:45 EST 2007" + commentEnd);
>>          int marklen = commandMarker.length();
>>          LOOP: while(true) {
>>              try {
> 
> Do you plan to update this manually whenever you regenerate?

I do plan on regenerating these files with every new OpenJDK bundle 
released in case there are any changes.

Lillian

> If not would it not make more sense to omit the date entirely?
> 
> Cheers,
> Gary
> 


From gbenson at redhat.com  Tue Nov 13 07:13:50 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 15:13:50 +0000
Subject: changeset in /hg/icedtea: 2007-11-12 Lillian Angel <langel@red...
In-Reply-To: <4739BCF1.7090400@redhat.com>
References: <hg.b402f84d1960.1194893433.-6899778133799504387@icedtea.classpath.org>
	<20071113091418.GA3748@redhat.com> <4739BCF1.7090400@redhat.com>
Message-ID: <20071113151349.GD3748@redhat.com>

Lillian Angel wrote:
> Gary Benson wrote:
> >Lillian Angel wrote:
> > > @@ -649,7 +649,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
> > >          PrintWriter out = new PrintWriter(new BufferedWriter(new 
> > >          FileWriter(theOutputFileName)));
> > >          out.println(commentStart +
> > >              " This file was generated AUTOMATICALLY from a template file 
> > >              " +
> > > -            new java.util.Date() + commentEnd);
> > > +            "Wed Nov 07 13:33:45 EST 2007" + commentEnd);
> > >          int marklen = commandMarker.length();
> > >          LOOP: while(true) {
> > >              try {
> > 
> > Do you plan to update this manually whenever you regenerate?
> 
> I do plan on regenerating these files with every new OpenJDK bundle
> released in case there are any changes.

I wonder if we should just take the date out altogether.  It's the
kind of thing that'll get forgotten, and we can aways query hg to
see when the date changed.

Cheers,
Gary


From gbenson at redhat.com  Tue Nov 13 07:21:02 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 15:21:02 +0000
Subject: changeset in /hg/icedtea: 2007-11-13  Gary Benson  <gbenson@redh...
Message-ID: <hg.914992a3ebba.1194967262.-6899778133799504387@icedtea.classpath.org>

changeset 914992a3ebba in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=914992a3ebba
description:
	2007-11-13  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp
		(SlowSignatureHandler::pass_int): Implemented.
		(SlowSignatureHandler::pass_object): Likewise.

diffstat:

2 files changed, 33 insertions(+), 2 deletions(-)
ChangeLog                                          |    6 ++++
ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp |   29 ++++++++++++++++++--

diffs (59 lines):

diff -r 55e5e7e59cb7 -r 914992a3ebba ChangeLog
--- a/ChangeLog	Tue Nov 13 06:50:47 2007 -0500
+++ b/ChangeLog	Tue Nov 13 10:20:57 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-13  Gary Benson  <gbenson at redhat
+2007-11-13  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp
+	(SlowSignatureHandler::pass_int): Implemented.
+	(SlowSignatureHandler::pass_object): Likewise.
+
 2007-11-13  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
diff -r 55e5e7e59cb7 -r 914992a3ebba ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp	Tue Nov 13 06:50:47 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp	Tue Nov 13 10:20:57 2007 -0500
@@ -246,7 +246,18 @@ void InterpreterRuntime::SignatureHandle
 
 void InterpreterRuntime::SlowSignatureHandler::pass_int()
 {
-  Unimplemented();
+  jint src = *(jint *)
+    (_from + Interpreter::local_offset_in_bytes(offset()));
+
+  if (_gp_regs <= _gp_reg_max) {
+    *(jint *)(_gp_regs++) = src;
+#ifdef PPC64
+    _st_args++;
+#endif
+  }
+  else {
+    *(jint *)(_st_args++) = src;
+  }
 }
 
 void InterpreterRuntime::SlowSignatureHandler::pass_long()
@@ -293,7 +304,21 @@ void InterpreterRuntime::SlowSignatureHa
 
 void InterpreterRuntime::SlowSignatureHandler::pass_object()
 {
-  Unimplemented();
+  intptr_t *src = (intptr_t *)
+    (_from + Interpreter::local_offset_in_bytes(offset()));
+
+  if (*src == 0)
+    src = NULL;
+
+  if (_gp_regs <= _gp_reg_max) {
+    *(intptr_t **)(_gp_regs++) = src;
+#ifdef PPC64
+    _st_args++;
+#endif
+  }
+  else {
+    *(intptr_t **)(_st_args++) = src;
+  }
 }
 
 IRT_ENTRY(address,


From gbenson at redhat.com  Tue Nov 13 07:37:15 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 15:37:15 +0000
Subject: changeset in /hg/icedtea: 2007-11-13  Gary Benson  <gbenson@redh...
Message-ID: <hg.9cbaee9e9b57.1194968234.-6899778133799504387@icedtea.classpath.org>

changeset 9cbaee9e9b57 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9cbaee9e9b57
description:
	2007-11-13  Gary Benson  <gbenson at redhat.com>
	            Arnaud Vandyck <avdyk at debian.org>

		* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
		(JVM_handle_linux_signal): Don't fail with -Wwrite-strings.

diffstat:

2 files changed, 7 insertions(+), 1 deletion(-)
ChangeLog                                              |    6 ++++++
ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp |    2 +-

diffs (25 lines):

diff -r 914992a3ebba -r 9cbaee9e9b57 ChangeLog
--- a/ChangeLog	Tue Nov 13 10:20:57 2007 -0500
+++ b/ChangeLog	Tue Nov 13 10:37:09 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-13  Gary Benson  <gbenson at redhat
+2007-11-13  Gary Benson  <gbenson at redhat.com>
+            Arnaud Vandyck <avdyk at debian.org>
+
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+	(JVM_handle_linux_signal): Don't fail with -Wwrite-strings.
+
 2007-11-13  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/interpreterRT_ppc.cpp
diff -r 914992a3ebba -r 9cbaee9e9b57 ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
--- a/ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Tue Nov 13 10:20:57 2007 -0500
+++ b/ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Tue Nov 13 10:37:09 2007 -0500
@@ -108,7 +108,7 @@ JVM_handle_linux_signal(int sig,
     }
   }
 
-  char *fmt = "caught unhandled signal %d";
+  const char *fmt = "caught unhandled signal %d";
   char buf[64];
 
   sprintf(buf, fmt, sig);


From langel at redhat.com  Tue Nov 13 08:11:15 2007
From: langel at redhat.com (Lillian Angel)
Date: Tue, 13 Nov 2007 16:11:15 +0000
Subject: changeset in /hg/icedtea: 2007-11-13  Lillian Angel  <langel@red...
Message-ID: <hg.3a0358279c60.1194970275.-6899778133799504387@icedtea.classpath.org>

changeset 3a0358279c60 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3a0358279c60
description:
	2007-11-13  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-ecj.patch
	        (GenerateCharacter.java): Removed date.
	        * generated/*: Updated files.

diffstat:

7 files changed, 14 insertions(+), 12 deletions(-)
ChangeLog                                    |    8 +++++++-
generated/java/lang/CharacterData00.java     |    1 -
generated/java/lang/CharacterData01.java     |    1 -
generated/java/lang/CharacterData02.java     |    1 -
generated/java/lang/CharacterData0E.java     |    1 -
generated/java/lang/CharacterDataLatin1.java |    1 -
patches/icedtea-ecj.patch                    |   13 +++++++------

diffs (86 lines):

diff -r 9cbaee9e9b57 -r 3a0358279c60 ChangeLog
--- a/ChangeLog	Tue Nov 13 10:37:09 2007 -0500
+++ b/ChangeLog	Tue Nov 13 11:10:31 2007 -0500
@@ -1,5 +1,11 @@ 2007-11-13  Gary Benson  <gbenson at redhat
+2007-11-13  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-ecj.patch
+	(GenerateCharacter.java): Removed date.
+	* generated/*: Updated files.
+
 2007-11-13  Gary Benson  <gbenson at redhat.com>
-            Arnaud Vandyck <avdyk at debian.org>
+	    Arnaud Vandyck <avdyk at debian.org>
 
 	* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
 	(JVM_handle_linux_signal): Don't fail with -Wwrite-strings.
diff -r 9cbaee9e9b57 -r 3a0358279c60 generated/java/lang/CharacterData00.java
--- a/generated/java/lang/CharacterData00.java	Tue Nov 13 10:37:09 2007 -0500
+++ b/generated/java/lang/CharacterData00.java	Tue Nov 13 11:10:31 2007 -0500
@@ -1,4 +1,3 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff -r 9cbaee9e9b57 -r 3a0358279c60 generated/java/lang/CharacterData01.java
--- a/generated/java/lang/CharacterData01.java	Tue Nov 13 10:37:09 2007 -0500
+++ b/generated/java/lang/CharacterData01.java	Tue Nov 13 11:10:31 2007 -0500
@@ -1,4 +1,3 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff -r 9cbaee9e9b57 -r 3a0358279c60 generated/java/lang/CharacterData02.java
--- a/generated/java/lang/CharacterData02.java	Tue Nov 13 10:37:09 2007 -0500
+++ b/generated/java/lang/CharacterData02.java	Tue Nov 13 11:10:31 2007 -0500
@@ -1,4 +1,3 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff -r 9cbaee9e9b57 -r 3a0358279c60 generated/java/lang/CharacterData0E.java
--- a/generated/java/lang/CharacterData0E.java	Tue Nov 13 10:37:09 2007 -0500
+++ b/generated/java/lang/CharacterData0E.java	Tue Nov 13 11:10:31 2007 -0500
@@ -1,4 +1,3 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff -r 9cbaee9e9b57 -r 3a0358279c60 generated/java/lang/CharacterDataLatin1.java
--- a/generated/java/lang/CharacterDataLatin1.java	Tue Nov 13 10:37:09 2007 -0500
+++ b/generated/java/lang/CharacterDataLatin1.java	Tue Nov 13 11:10:31 2007 -0500
@@ -1,4 +1,3 @@
-// This file was generated AUTOMATICALLY from a template file Wed Nov 07 13:33:45 EST 2007
 /*
  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff -r 9cbaee9e9b57 -r 3a0358279c60 generated/sun/awt/X11/generator/sizer.32
Binary file generated/sun/awt/X11/generator/sizer.32 has changed
diff -r 9cbaee9e9b57 -r 3a0358279c60 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Tue Nov 13 10:37:09 2007 -0500
+++ b/patches/icedtea-ecj.patch	Tue Nov 13 11:10:31 2007 -0500
@@ -880,17 +880,18 @@ diff -ru openjdk-ecj.orig/jaxp/make/buil
                   classname="CompilePropertiesTask" 
                   classpath="${build.toolclasses.dir}/"/>
 --- openjdk.old/j2se/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2007-10-12 03:54:09.000000000 -0400
-+++ openjdk-ecj/j2se/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2007-11-12 12:56:21.000000000 -0500
-@@ -649,7 +649,7 @@
++++ openjdk-ecj/j2se/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2007-11-13 10:29:46.000000000 -0500
+@@ -647,9 +647,6 @@
+             throws FileNotFoundException, IOException {
+         BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
          PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
-         out.println(commentStart +
-             " This file was generated AUTOMATICALLY from a template file " +
+-        out.println(commentStart +
+-            " This file was generated AUTOMATICALLY from a template file " +
 -            new java.util.Date() + commentEnd);
-+            "Wed Nov 07 13:33:45 EST 2007" + commentEnd);
          int marklen = commandMarker.length();
          LOOP: while(true) {
              try {
-@@ -876,7 +876,6 @@
+@@ -876,7 +873,6 @@
          // liu : Add a comment showing the source of this table
          result.append(commentStart + " The following tables and code generated using:" +
                    commentEnd + "\n  ");


From langel at redhat.com  Tue Nov 13 08:11:30 2007
From: langel at redhat.com (Lillian Angel)
Date: Tue, 13 Nov 2007 11:11:30 -0500
Subject: changeset in /hg/icedtea: 2007-11-12 Lillian Angel <langel@red...
In-Reply-To: <20071113151349.GD3748@redhat.com>
References: <hg.b402f84d1960.1194893433.-6899778133799504387@icedtea.classpath.org>	<20071113091418.GA3748@redhat.com>
	<4739BCF1.7090400@redhat.com> <20071113151349.GD3748@redhat.com>
Message-ID: <4739CCB2.9080706@redhat.com>



Gary Benson wrote:
> Lillian Angel wrote:
>> Gary Benson wrote:
>>> Lillian Angel wrote:
>>>> @@ -649,7 +649,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
>>>>          PrintWriter out = new PrintWriter(new BufferedWriter(new 
>>>>          FileWriter(theOutputFileName)));
>>>>          out.println(commentStart +
>>>>              " This file was generated AUTOMATICALLY from a template file 
>>>>              " +
>>>> -            new java.util.Date() + commentEnd);
>>>> +            "Wed Nov 07 13:33:45 EST 2007" + commentEnd);
>>>>          int marklen = commandMarker.length();
>>>>          LOOP: while(true) {
>>>>              try {
>>> Do you plan to update this manually whenever you regenerate?
>> I do plan on regenerating these files with every new OpenJDK bundle
>> released in case there are any changes.
> 
> I wonder if we should just take the date out altogether.  It's the
> kind of thing that'll get forgotten, and we can aways query hg to
> see when the date changed.

done.

> 
> Cheers,
> Gary


From gbenson at redhat.com  Tue Nov 13 08:21:26 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 13 Nov 2007 16:21:26 +0000
Subject: changeset in /hg/icedtea: 2007-11-12 Lillian Angel <langel@red...
In-Reply-To: <4739CCB2.9080706@redhat.com>
References: <hg.b402f84d1960.1194893433.-6899778133799504387@icedtea.classpath.org>
	<20071113091418.GA3748@redhat.com> <4739BCF1.7090400@redhat.com>
	<20071113151349.GD3748@redhat.com> <4739CCB2.9080706@redhat.com>
Message-ID: <20071113162126.GG3748@redhat.com>

Lillian Angel wrote:
> Gary Benson wrote:
> > I wonder if we should just take the date out altogether.  It's the
> > kind of thing that'll get forgotten, and we can aways query hg to
> > see when the date changed.
> 
> done.

Cool :)



From langel at redhat.com  Tue Nov 13 13:34:11 2007
From: langel at redhat.com (Lillian Angel)
Date: Tue, 13 Nov 2007 21:34:11 +0000
Subject: changeset in /hg/icedtea: 2007-11-13  Lillian Angel  <langel@red...
Message-ID: <hg.037d94f5c2ea.1194989651.-6899778133799504387@icedtea.classpath.org>

changeset 037d94f5c2ea in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=037d94f5c2ea
description:
	2007-11-13  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-ecj.patch
	        (stamps/bootstrap-directory-ecj.stamp): Added links to tools.jar and
	        rt.jar if built prior to creating bootstrap/ecj. Fixes problem where
	        make tools or make plugs is called before make.

diffstat:

3 files changed, 29 insertions(+)
ChangeLog   |    7 +++++++
Makefile.am |   11 +++++++++++
Makefile.in |   11 +++++++++++

diffs (56 lines):

diff -r 3a0358279c60 -r 037d94f5c2ea ChangeLog
--- a/ChangeLog	Tue Nov 13 11:10:31 2007 -0500
+++ b/ChangeLog	Tue Nov 13 16:33:27 2007 -0500
@@ -1,3 +1,10 @@ 2007-11-13  Lillian Angel  <langel at redha
+2007-11-13  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-ecj.patch
+	(stamps/bootstrap-directory-ecj.stamp): Added links to tools.jar and
+	rt.jar if built prior to creating bootstrap/ecj. Fixes problem where
+	make tools or make plugs is called before make.
+
 2007-11-13  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-ecj.patch
diff -r 3a0358279c60 -r 037d94f5c2ea Makefile.am
--- a/Makefile.am	Tue Nov 13 11:10:31 2007 -0500
+++ b/Makefile.am	Tue Nov 13 16:33:27 2007 -0500
@@ -363,6 +363,17 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	if bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	then \
+		mkdir -p bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+	if bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	then \
+		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			bootstrap/ecj/jre/lib/rt.jar; \
+	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 
diff -r 3a0358279c60 -r 037d94f5c2ea Makefile.in
--- a/Makefile.in	Tue Nov 13 11:10:31 2007 -0500
+++ b/Makefile.in	Tue Nov 13 16:33:27 2007 -0500
@@ -856,6 +856,17 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	if bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	then \
+		mkdir -p bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+	if bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	then \
+		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			bootstrap/ecj/jre/lib/rt.jar; \
+	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 


From langel at redhat.com  Wed Nov 14 14:29:35 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 14 Nov 2007 22:29:35 +0000
Subject: changeset in /hg/icedtea: 2007-11-15  Lillian Angel  <langel@red...
Message-ID: <hg.9f98682ecbbb.1195079375.-6899778133799504387@icedtea.classpath.org>

changeset 9f98682ecbbb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9f98682ecbbb
description:
	2007-11-15  Lillian Angel  <langel at redhat.com>
	            Joshua Sumali  <jsumali at redhat.com>

	        * Makefile.am: Changed j2se to jdk.
	        (OPENJDK_VERSION): Updated to b23.
	        (OPENJDK_DATE): Likewise.
	        (OPENJDK_MD5SUM): Likewise.
	        (stamps/patch.stamp): Added -l option to PATCH to ignore whitespace.
	        (stamps/patch-ecj.stamp): Likewise.
	        (stamps/clean-patch.stamp): Likewise.
	        (stamps/clean-patch-ecj.stamp): Likewise.
	        (ICEDTEA_COPY_DIRS): Added javax/net/ssl to list.
	        * Makefile.in: Regenerated.
	        * README: Changed instances of j2se to jdk.
	        * patches/icedtea-ant.patch: Changed instances of j2se to jdk and
	        updated to b23.
	        * patches/icedtea-antialias.patch: Likewise.
	        * patches/icedtea-bytebuffer-compact.patch: Likewise.
	        * patches/icedtea-bytecodeInterpreter.patch: Likewise.
	        * patches/icedtea-bytecodeInterpreterWithChecks.patch: Likewise.
	        * patches/icedtea-certbundle.patch: Likewise.
	        * patches/icedtea-copy-plugs.patch: Likewise.
	        * patches/icedtea-core-build.patch: Likewise.
	        * patches/icedtea-debuginfo.patch: Likewise.
	        * patches/icedtea-demos.patch: Likewise.
	        * patches/icedtea-ecj.patch: Likewise.
	        * patches/icedtea-float-double-trailing-zeros.patch: Likewise.
	        * patches/icedtea-gcc-suffix.patch: Likewise.
	        * patches/icedtea-graphics.patch: Likewise.
	        * patches/icedtea-gtkplaf.patch: Likewise.
	        * patches/icedtea-javafiles.patch: Likewise.
	        * patches/icedtea-libraries.patch: Likewise.
	        * patches/icedtea-license-headers.patch: Likewise.
	        * patches/icedtea-linker-options.patch: Likewise.
	        * patches/icedtea-memory-limits.patch: Likewise.
	        * patches/icedtea-paths.patch: Likewise.
	        * patches/icedtea-plugin.patch: Likewise.
	        * patches/icedtea-ports.patch: Likewise.
	        * patches/icedtea-rmi_amd64.patch: Likewise.
	        * patches/icedtea-signature-iterator.patch: Likewise.
	        * patches/icedtea-signed-types.patch: Likewise.
	        * patches/icedtea-speed.patch: Likewise.
	        * patches/icedtea-ssl.patch: Likewise.
	        * patches/icedtea-sunsrc.patch: Likewise.
	        * patches/icedtea-test-atomic-operations.patch: Likewise.
	        * patches/icedtea-tools.patch: Likewise.
	        * patches/icedtea-use-system-tzdata.patch: Likewise.
	        * patches/icedtea-version.patch: Likewise.
	        * generated/java/nio/*: Regenerated.
	        * generated/sun/awt/X11/generator/sizer.32: Regenerated.
	        * rt/com/sun/image/codec/jpeg/JPEGCodec.java: New stubbed class.
	        * rt/com/sun/image/codec/jpeg/JPEGEncodeParam.java: Likewise.
	        * rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Likewise.
	        * rt/com/sun/image/codec/jpeg/JPEGImageEncoder.java: Likewise.
	        * rt/java/io/PushbackReader.java: Likewise.
	        * ports/jdk/: Moved ports/j2se here.
	        * ports/j2se/: Removed.

diffstat:

88 files changed, 34852 insertions(+), 34443 deletions(-)
ChangeLog                                           |   58 
Makefile.am                                         |   49 
Makefile.in                                         |   51 
README                                              |    8 
generated/java/nio/DirectByteBuffer.java            | 1116 
generated/java/nio/DirectByteBufferR.java           |  700 
generated/java/nio/DirectCharBufferRS.java          |  124 
generated/java/nio/DirectCharBufferRU.java          |  124 
generated/java/nio/DirectCharBufferS.java           |  316 
generated/java/nio/DirectCharBufferU.java           |  316 
generated/java/nio/DirectDoubleBufferRS.java        |  144 
generated/java/nio/DirectDoubleBufferRU.java        |  144 
generated/java/nio/DirectDoubleBufferS.java         |  336 
generated/java/nio/DirectDoubleBufferU.java         |  336 
generated/java/nio/DirectFloatBufferRS.java         |  144 
generated/java/nio/DirectFloatBufferRU.java         |  144 
generated/java/nio/DirectFloatBufferS.java          |  336 
generated/java/nio/DirectFloatBufferU.java          |  336 
generated/java/nio/DirectIntBufferRS.java           |  144 
generated/java/nio/DirectIntBufferRU.java           |  144 
generated/java/nio/DirectIntBufferS.java            |  336 
generated/java/nio/DirectIntBufferU.java            |  336 
generated/java/nio/DirectLongBufferRS.java          |  144 
generated/java/nio/DirectLongBufferRU.java          |  144 
generated/java/nio/DirectLongBufferS.java           |  336 
generated/java/nio/DirectLongBufferU.java           |  336 
generated/java/nio/DirectShortBufferRS.java         |  144 
generated/java/nio/DirectShortBufferRU.java         |  144 
generated/java/nio/DirectShortBufferS.java          |  336 
generated/java/nio/DirectShortBufferU.java          |  336 
generated/java/nio/HeapByteBuffer.java              |  462 
generated/java/nio/HeapByteBufferR.java             |  318 
generated/java/nio/HeapCharBuffer.java              |  854 
generated/java/nio/HeapCharBufferR.java             |  754 
generated/java/nio/HeapDoubleBuffer.java            |  828 
generated/java/nio/HeapDoubleBufferR.java           |  728 
generated/java/nio/HeapFloatBuffer.java             |  828 
generated/java/nio/HeapFloatBufferR.java            |  728 
generated/java/nio/HeapIntBuffer.java               |  828 
generated/java/nio/HeapIntBufferR.java              |  728 
generated/java/nio/HeapLongBuffer.java              |  828 
generated/java/nio/HeapLongBufferR.java             |  728 
generated/java/nio/HeapShortBuffer.java             |  828 
generated/java/nio/HeapShortBufferR.java            |  728 
patches/icedtea-ant.patch                           |   44 
patches/icedtea-antialias.patch                     |   78 
patches/icedtea-bytebuffer-compact.patch            |  115 
patches/icedtea-bytecodeInterpreter.patch           |    4 
patches/icedtea-bytecodeInterpreterWithChecks.patch |    4 
patches/icedtea-certbundle.patch                    |   23 
patches/icedtea-copy-plugs.patch                    |   28 
patches/icedtea-core-build.patch                    |   14 
patches/icedtea-debuginfo.patch                     |   18 
patches/icedtea-demos.patch                         |   32 
patches/icedtea-ecj.patch                           |  447 
patches/icedtea-float-double-trailing-zeros.patch   |   59 
patches/icedtea-gcc-suffix.patch                    |    4 
patches/icedtea-graphics.patch                      |  160 
patches/icedtea-gtkplaf.patch                       |    4 
patches/icedtea-javafiles.patch                     |    4 
patches/icedtea-libraries.patch                     |49373 +++++++++----------
patches/icedtea-license-headers.patch               |  100 
patches/icedtea-linker-options.patch                |   18 
patches/icedtea-memory-limits.patch                 |   11 
patches/icedtea-paths.patch                         |   83 
patches/icedtea-plugin.patch                        |   24 
patches/icedtea-ports.patch                         |   46 
patches/icedtea-rmi_amd64.patch                     |    4 
patches/icedtea-signature-iterator.patch            |    6 
patches/icedtea-signed-types.patch                  |    4 
patches/icedtea-speed.patch                         |   12 
patches/icedtea-ssl.patch                           |   59 
patches/icedtea-sunsrc.patch                        |    6 
patches/icedtea-test-atomic-operations.patch        |    2 
patches/icedtea-tools.patch                         |   22 
patches/icedtea-use-system-tzdata.patch             |   85 
patches/icedtea-version.patch                       |    4 
ports/j2se/src/solaris/bin/ergo_ppc.c               |   58 
ports/j2se/src/solaris/bin/ppc/jvm.cfg              |   44 
ports/j2se/src/solaris/bin/ppc64/jvm.cfg            |   44 
ports/jdk/src/solaris/bin/ergo_ppc.c                |   58 
ports/jdk/src/solaris/bin/ppc/jvm.cfg               |   44 
ports/jdk/src/solaris/bin/ppc64/jvm.cfg             |   44 
rt/com/sun/image/codec/jpeg/JPEGCodec.java          |   60 
rt/com/sun/image/codec/jpeg/JPEGEncodeParam.java    |   49 
rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java   |   49 
rt/com/sun/image/codec/jpeg/JPEGImageEncoder.java   |   56 
rt/java/io/PushbackReader.java                      |   62 

diffs (truncated from 74850 to 500 lines):

diff -r 037d94f5c2ea -r 9f98682ecbbb ChangeLog
--- a/ChangeLog	Tue Nov 13 16:33:27 2007 -0500
+++ b/ChangeLog	Wed Nov 14 17:28:39 2007 -0500
@@ -1,3 +1,61 @@ 2007-11-13  Lillian Angel  <langel at redha
+2007-11-15  Lillian Angel  <langel at redhat.com>
+	    Joshua Sumali  <jsumali at redhat.com>
+
+	* Makefile.am: Changed j2se to jdk. 
+	(OPENJDK_VERSION): Updated to b23.
+	(OPENJDK_DATE): Likewise.
+	(OPENJDK_MD5SUM): Likewise.
+	(stamps/patch.stamp): Added -l option to PATCH to ignore whitespace.
+	(stamps/patch-ecj.stamp): Likewise.
+	(stamps/clean-patch.stamp): Likewise.
+	(stamps/clean-patch-ecj.stamp): Likewise.
+	(ICEDTEA_COPY_DIRS): Added javax/net/ssl to list.
+	* Makefile.in: Regenerated.
+	* README: Changed instances of j2se to jdk.
+	* patches/icedtea-ant.patch: Changed instances of j2se to jdk and
+	updated to b23.
+	* patches/icedtea-antialias.patch: Likewise.
+	* patches/icedtea-bytebuffer-compact.patch: Likewise.
+	* patches/icedtea-bytecodeInterpreter.patch: Likewise.
+	* patches/icedtea-bytecodeInterpreterWithChecks.patch: Likewise.
+	* patches/icedtea-certbundle.patch: Likewise.
+	* patches/icedtea-copy-plugs.patch: Likewise.
+	* patches/icedtea-core-build.patch: Likewise.
+	* patches/icedtea-debuginfo.patch: Likewise.
+	* patches/icedtea-demos.patch: Likewise.
+	* patches/icedtea-ecj.patch: Likewise.
+	* patches/icedtea-float-double-trailing-zeros.patch: Likewise.
+	* patches/icedtea-gcc-suffix.patch: Likewise.
+	* patches/icedtea-graphics.patch: Likewise.
+	* patches/icedtea-gtkplaf.patch: Likewise.
+	* patches/icedtea-javafiles.patch: Likewise.
+	* patches/icedtea-libraries.patch: Likewise.
+	* patches/icedtea-license-headers.patch: Likewise.
+	* patches/icedtea-linker-options.patch: Likewise.
+	* patches/icedtea-memory-limits.patch: Likewise.
+	* patches/icedtea-paths.patch: Likewise.
+	* patches/icedtea-plugin.patch: Likewise.
+	* patches/icedtea-ports.patch: Likewise.
+	* patches/icedtea-rmi_amd64.patch: Likewise.
+	* patches/icedtea-signature-iterator.patch: Likewise.
+	* patches/icedtea-signed-types.patch: Likewise.
+	* patches/icedtea-speed.patch: Likewise.
+	* patches/icedtea-ssl.patch: Likewise.
+	* patches/icedtea-sunsrc.patch: Likewise.
+	* patches/icedtea-test-atomic-operations.patch: Likewise.
+	* patches/icedtea-tools.patch: Likewise.
+	* patches/icedtea-use-system-tzdata.patch: Likewise.
+	* patches/icedtea-version.patch: Likewise.
+	* generated/java/nio/*: Regenerated.
+	* generated/sun/awt/X11/generator/sizer.32: Regenerated.
+	* rt/com/sun/image/codec/jpeg/JPEGCodec.java: New stubbed class.
+	* rt/com/sun/image/codec/jpeg/JPEGEncodeParam.java: Likewise.
+	* rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Likewise.
+	* rt/com/sun/image/codec/jpeg/JPEGImageEncoder.java: Likewise.
+	* rt/java/io/PushbackReader.java: Likewise.
+	* ports/jdk/: Moved ports/j2se here.
+	* ports/j2se/: Removed.
+
 2007-11-13  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-ecj.patch
diff -r 037d94f5c2ea -r 9f98682ecbbb Makefile.am
--- a/Makefile.am	Tue Nov 13 16:33:27 2007 -0500
+++ b/Makefile.am	Wed Nov 14 17:28:39 2007 -0500
@@ -1,6 +1,6 @@ OPENJDK_VERSION = b22
-OPENJDK_VERSION = b22
-OPENJDK_DATE = 12_oct_2007
-OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2
+OPENJDK_VERSION = b23
+OPENJDK_DATE = 30_oct_2007
+OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d
 
 # Top-Level Targets
 # =================
@@ -154,7 +154,7 @@ stamps/ports.stamp: stamps/extract.stamp
 	for target in ports/hotspot/build/*/platform_* \
 		      ports/hotspot/build/*/makefiles/* \
 		      ports/hotspot/src/*/* \
-		      ports/j2se/src/*/bin/*; do \
+		      ports/jdk/src/*/bin/*; do \
 	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
 	  ln -sf $$PWD/$$target $$link; \
 	done
@@ -210,10 +210,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	  if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $$p ; \
 	  fi ; \
 	done
 	mkdir -p stamps
@@ -224,10 +224,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $$p ; \
 	  fi ; \
 	done
 
@@ -243,7 +243,6 @@ stamps/extract-ecj.stamp: stamps/downloa
 	  mv tmp-ecj/openjdk openjdk-ecj ; \
 	  rmdir tmp-ecj ; \
 	  chmod -R ug+w openjdk-ecj ; \
-	  rm -rf openjdk-ecj/jaxws; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract-ecj.stamp
@@ -257,7 +256,7 @@ stamps/ports-ecj.stamp: stamps/extract.s
 	for target in ports/hotspot/build/*/platform_* \
 		      ports/hotspot/build/*/makefiles/* \
 		      ports/hotspot/src/*/* \
-		      ports/j2se/src/*/bin/*; do \
+		      ports/jdk/src/*/bin/*; do \
 	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
 	  ln -sf $$PWD/$$target $$link; \
 	done
@@ -271,17 +270,17 @@ stamps/patch-ecj.stamp: stamps/extract-e
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
+	  if $(PATCH) -l -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -p1 -d openjdk-ecj < $$p ; \
+	    $(PATCH) -l -p1 -d openjdk-ecj < $$p ; \
 	  fi ; \
 	done
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
-	if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+	if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
 	then \
 	  echo Applying $(ICEDTEA_ECJ_PATCH) ; \
-	  $(PATCH) -p0 < $(ICEDTEA_ECJ_PATCH) ; \
+	  $(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
 	fi
 	mkdir -p stamps
 	touch stamps/patch-ecj.stamp
@@ -289,18 +288,18 @@ clean-patch-ecj:
 clean-patch-ecj:
 	rm -f stamps/patch-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
-	if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+	if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
 	then \
 	  echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
-	  $(PATCH) -p0 -R < $(ICEDTEA_ECJ_PATCH) ; \
+	  $(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
 	fi
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p1 -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -p1 -l -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -p1 -d openjdk-ecj -R < $$p ; \
+	    $(PATCH) -p1 -l -d openjdk-ecj -R < $$p ; \
 	  fi ; \
 	done
 
@@ -516,13 +515,14 @@ ICEDTEA_COPY_DIRS = \
 	com/sun/jmx/snmp/agent \
 	com/sun/tools/jdi \
 	java/util \
-	java/rmi
+	java/rmi \
+	javax/net/ssl
 
 stamps/copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
 	for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
 	do \
 	  mkdir -p rt/$$copy_dir ; \
-	  cp -af openjdk/j2se/src/share/classes/$$copy_dir/*.java \
+	  cp -af openjdk/jdk/src/share/classes/$$copy_dir/*.java \
 	    rt/$$copy_dir ; \
 	done
 	mkdir -p stamps
@@ -535,8 +535,8 @@ clean-copy:
 	  rm -rf rt/$$copy_dir ; \
 	done
 
-SHARE = openjdk/j2se/src/share/classes
-SOLARIS = openjdk/j2se/src/solaris/classes
+SHARE = openjdk/jdk/src/share/classes
+SOLARIS = openjdk/jdk/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
 CORBA = openjdk/corba/src/share/classes
@@ -547,10 +547,10 @@ OPENJDK_SOURCEPATH_DIRS = \
 
 # tools.jar class files.
 stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
-	for copy_dir in `cat tools-copy/tools-j2se-copy-files.txt` ; \
+	for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
         do \
           mkdir -p tools/$$copy_dir ; \
-	  cp -arf openjdk/j2se/src/share/classes/$$copy_dir/* \
+	  cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \
             tools/$$copy_dir ; \
         done
 	
@@ -587,7 +587,6 @@ stamps/tools-class-files.stamp: tools-so
 	$(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools -bootclasspath '' -source 1.6 \
 	  -sourcepath 'rt:tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
 	  @$<
-	rm -rf openjdk/jaxws # Remove jaxws because of invalid license headers in b22.
 	mkdir -p stamps
 	touch stamps/tools-class-files.stamp
 
diff -r 037d94f5c2ea -r 9f98682ecbbb Makefile.in
--- a/Makefile.in	Tue Nov 13 16:33:27 2007 -0500
+++ b/Makefile.in	Wed Nov 14 17:28:39 2007 -0500
@@ -187,9 +187,9 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b22
-OPENJDK_DATE = 12_oct_2007
-OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2
+OPENJDK_VERSION = b23
+OPENJDK_DATE = 30_oct_2007
+OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy
 
@@ -346,10 +346,11 @@ ICEDTEA_COPY_DIRS = \
 	com/sun/jmx/snmp/agent \
 	com/sun/tools/jdi \
 	java/util \
-	java/rmi
-
-SHARE = openjdk/j2se/src/share/classes
-SOLARIS = openjdk/j2se/src/solaris/classes
+	java/rmi \
+	javax/net/ssl
+
+SHARE = openjdk/jdk/src/share/classes
+SOLARIS = openjdk/jdk/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 JAXP = openjdk/jaxp/src/share/classes
 CORBA = openjdk/corba/src/share/classes
@@ -703,7 +704,7 @@ stamps/ports.stamp: stamps/extract.stamp
 	for target in ports/hotspot/build/*/platform_* \
 		      ports/hotspot/build/*/makefiles/* \
 		      ports/hotspot/src/*/* \
-		      ports/j2se/src/*/bin/*; do \
+		      ports/jdk/src/*/bin/*; do \
 	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
 	  ln -sf $$PWD/$$target $$link; \
 	done
@@ -714,10 +715,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	  if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $$p ; \
 	  fi ; \
 	done
 	mkdir -p stamps
@@ -728,10 +729,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $$p ; \
 	  fi ; \
 	done
 
@@ -747,7 +748,6 @@ stamps/extract-ecj.stamp: stamps/downloa
 	  mv tmp-ecj/openjdk openjdk-ecj ; \
 	  rmdir tmp-ecj ; \
 	  chmod -R ug+w openjdk-ecj ; \
-	  rm -rf openjdk-ecj/jaxws; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract-ecj.stamp
@@ -761,7 +761,7 @@ stamps/ports-ecj.stamp: stamps/extract.s
 	for target in ports/hotspot/build/*/platform_* \
 		      ports/hotspot/build/*/makefiles/* \
 		      ports/hotspot/src/*/* \
-		      ports/j2se/src/*/bin/*; do \
+		      ports/jdk/src/*/bin/*; do \
 	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
 	  ln -sf $$PWD/$$target $$link; \
 	done
@@ -772,17 +772,17 @@ stamps/patch-ecj.stamp: stamps/extract-e
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
+	  if $(PATCH) -l -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -p1 -d openjdk-ecj < $$p ; \
+	    $(PATCH) -l -p1 -d openjdk-ecj < $$p ; \
 	  fi ; \
 	done
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
-	if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+	if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
 	then \
 	  echo Applying $(ICEDTEA_ECJ_PATCH) ; \
-	  $(PATCH) -p0 < $(ICEDTEA_ECJ_PATCH) ; \
+	  $(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
 	fi
 	mkdir -p stamps
 	touch stamps/patch-ecj.stamp
@@ -790,18 +790,18 @@ clean-patch-ecj:
 clean-patch-ecj:
 	rm -f stamps/patch-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
-	if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+	if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
 	then \
 	  echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
-	  $(PATCH) -p0 -R < $(ICEDTEA_ECJ_PATCH) ; \
+	  $(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
 	fi
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -p1 -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -p1 -l -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -p1 -d openjdk-ecj -R < $$p ; \
+	    $(PATCH) -p1 -l -d openjdk-ecj -R < $$p ; \
 	  fi ; \
 	done
 
@@ -985,7 +985,7 @@ stamps/copy-source-files.stamp: stamps/e
 	for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
 	do \
 	  mkdir -p rt/$$copy_dir ; \
-	  cp -af openjdk/j2se/src/share/classes/$$copy_dir/*.java \
+	  cp -af openjdk/jdk/src/share/classes/$$copy_dir/*.java \
 	    rt/$$copy_dir ; \
 	done
 	mkdir -p stamps
@@ -1000,10 +1000,10 @@ clean-copy:
 
 # tools.jar class files.
 stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
-	for copy_dir in `cat tools-copy/tools-j2se-copy-files.txt` ; \
+	for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
         do \
           mkdir -p tools/$$copy_dir ; \
-	  cp -arf openjdk/j2se/src/share/classes/$$copy_dir/* \
+	  cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \
             tools/$$copy_dir ; \
         done
 
@@ -1040,7 +1040,6 @@ stamps/tools-class-files.stamp: tools-so
 	$(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools -bootclasspath '' -source 1.6 \
 	  -sourcepath 'rt:tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
 	  @$<
-	rm -rf openjdk/jaxws # Remove jaxws because of invalid license headers in b22.
 	mkdir -p stamps
 	touch stamps/tools-class-files.stamp
 
diff -r 037d94f5c2ea -r 9f98682ecbbb README
--- a/README	Tue Nov 13 16:33:27 2007 -0500
+++ b/README	Wed Nov 14 17:28:39 2007 -0500
@@ -71,7 +71,7 @@ Some sources downloaded from openjdk.jav
 Some sources downloaded from openjdk.java.net do not display the GPL
 license header.  Instances are:
 
- - The files in openjdk/j2se/src/share/classes/javax/xml/stream/ seem to 
+ - The files in openjdk/jdk/src/share/classes/javax/xml/stream/ seem to 
    comprise the BEA-StAX source code
 
    http://ftpna2.bea.com/pub/downloads/jsr173.jar
@@ -81,7 +81,7 @@ license header.  Instances are:
    that the modifications are owned by Sun.
 
  - We are assuming that these files are owned by Sun:
-   openjdk/j2se/src/share/classes/**/resources/*.properties
+   openjdk/jdk/src/share/classes/**/resources/*.properties
 
 
 gcjwebplugin
@@ -98,8 +98,8 @@ single source file, gcjwebplugin.cc.  Th
 single source file, gcjwebplugin.cc.  The IcedTea adaptation of
 gcjwebplugin communicates through named pipes with a modified version
 of IcedTea's appletviewer.  Two source files,
-openjdk/j2se/src/share/classes/sun/applet/PluginAppletViewer.java,
-openjdk/j2se/src/share/classes/sun/applet/PluginMain.java are added to
+openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java,
+openjdk/jdk/src/share/classes/sun/applet/PluginMain.java are added to
 rt.jar and tools.jar to provide gcjwebplugin with an interface into
 the appletviewer code.  This support code is provided in
 patches/icedtea-plugin.patch.
diff -r 037d94f5c2ea -r 9f98682ecbbb generated/java/nio/DirectByteBuffer.java
--- a/generated/java/nio/DirectByteBuffer.java	Tue Nov 13 16:33:27 2007 -0500
+++ b/generated/java/nio/DirectByteBuffer.java	Wed Nov 14 17:28:39 2007 -0500
@@ -65,29 +65,29 @@ class DirectByteBuffer
 
 
     private static class Deallocator
-	implements Runnable
+        implements Runnable
     {
 
-	private static Unsafe unsafe = Unsafe.getUnsafe();
-
-	private long address;
-	private int capacity;
-
-	private Deallocator(long address, int capacity) {
-	    assert (address != 0);
-	    this.address = address;
-	    this.capacity = capacity;
-	}
-
-	public void run() {
-	    if (address == 0) {
-		// Paranoia
-		return;
-	    }
-	    unsafe.freeMemory(address);
-	    address = 0;
-	    Bits.unreserveMemory(capacity);
-	}
+        private static Unsafe unsafe = Unsafe.getUnsafe();
+
+        private long address;
+        private int capacity;
+
+        private Deallocator(long address, int capacity) {
+            assert (address != 0);
+            this.address = address;
+            this.capacity = capacity;
+        }
+
+        public void run() {
+            if (address == 0) {
+                // Paranoia
+                return;
+            }
+            unsafe.freeMemory(address);
+            address = 0;
+            Bits.unreserveMemory(capacity);
+        }
 
     }
 
@@ -107,26 +107,26 @@ class DirectByteBuffer
 
     // Primary constructor
     //
-    DirectByteBuffer(int cap) {			// package-private
-
-	super(-1, 0, cap, cap, false);
-	Bits.reserveMemory(cap);
-	int ps = Bits.pageSize();
-	long base = 0;
-	try {
-	    base = unsafe.allocateMemory(cap + ps);
-	} catch (OutOfMemoryError x) {
-	    Bits.unreserveMemory(cap);
-	    throw x;
-	}
-	unsafe.setMemory(base, cap + ps, (byte) 0);
-	if (base % ps != 0) {
-	    // Round up to page boundary
-	    address = base + ps - (base & (ps - 1));
-	} else {
-	    address = base;
-	}
-	cleaner = Cleaner.create(this, new Deallocator(base, cap));
+    DirectByteBuffer(int cap) {                   // package-private
+
+        super(-1, 0, cap, cap, false);
+        Bits.reserveMemory(cap);
+        int ps = Bits.pageSize();
+        long base = 0;
+        try {


From langel at redhat.com  Wed Nov 14 14:41:58 2007
From: langel at redhat.com (Lillian Angel)
Date: Wed, 14 Nov 2007 17:41:58 -0500
Subject: IcedTea updated to b23
In-Reply-To: <hg.9f98682ecbbb.1195079375.-6899778133799504387@icedtea.classpath.org>
References: <hg.9f98682ecbbb.1195079375.-6899778133799504387@icedtea.classpath.org>
Message-ID: <473B79B6.8050309@redhat.com>

Hi,

I just updated IcedTea to b23. It has been tested on i386, x86_64 and ppc.


Please let me know if there are any problems.

Cheers,
Lillian




From matthew.flaschen at gatech.edu  Wed Nov 14 22:06:00 2007
From: matthew.flaschen at gatech.edu (Matthew Flaschen)
Date: Thu, 15 Nov 2007 01:06:00 -0500
Subject: changeset in /hg/icedtea: 2007-11-15 Lillian Angel <langel@red...
In-Reply-To: <hg.9f98682ecbbb.1195079375.-6899778133799504387@icedtea.classpath.org>
References: <hg.9f98682ecbbb.1195079375.-6899778133799504387@icedtea.classpath.org>
Message-ID: <473BE1C8.5010701@gatech.edu>

Lillian Angel wrote:
> 	        * rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Likewise.

In theory, it should be possible to replace all this JPEG code with
calls to javax.imageio.*

I started this by implementing createJPEGDecoder in the JPEGCodec class.
 The stub of JPEGImageDecoder was actually incorrect, because the stub
was an (incomplete) class while JPEGImageDecoder is an interface
(http://java.sun.com/j2se/1.5.0/docs/guide/2d/api-jpeg/com/sun/image/codec/jpeg/JPEGImageDecoder.html).
 So I wrote a proper JPEGImageDecoder interface, then used that
implement a private class in JPEGCodec, ImageIOJPEGImageDecoder.

Finally, I made a ImageFormatException stub to match the interface.  The
files I worked on are attached as a hg diff.

Matt Flaschen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jpeg.diff
Type: text/x-patch
Size: 6269 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071115/c68763d7/jpeg.diff 

From bugzilla-daemon at icedtea.classpath.org  Thu Nov 15 02:22:12 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 15 Nov 2007 10:22:12 +0000
Subject: [Bug 79] New: security type applet doesnt work
Message-ID: <E1IsbrQ-0005VO-8M@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=79

           Summary: security type applet doesnt work
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: joakim at verona.se


The applet at https://www1.skatteverket.se/es/eskd/login.do?method=cbt
fails with the message "Applet was not granted necessary rights and is unable
to run."

Its a security kind of applet for identifying with certificates given by a bank
to swedish government services.

it works with suns plugin. 

Its unclear if the message is generated by the applet, or by the plugin.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From gbenson at redhat.com  Thu Nov 15 03:06:46 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 15 Nov 2007 11:06:46 +0000
Subject: changeset in /hg/icedtea: 2007-11-15  Gary Benson  <gbenson@redh...
Message-ID: <hg.815f3949a569.1195124806.-6899778133799504387@icedtea.classpath.org>

changeset 815f3949a569 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=815f3949a569
description:
	2007-11-15  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp
		(line_size, log2_line_size): Reduce cache line size.
		* ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp
		(generate_icache_flush): Ensure we never run with an
		over-large cache line size.

diffstat:

3 files changed, 11 insertions(+), 5 deletions(-)
ChangeLog                                   |    8 ++++++++
ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp |    4 +---
ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp |    4 ++--

diffs (56 lines):

diff -r 9f98682ecbbb -r 815f3949a569 ChangeLog
--- a/ChangeLog	Wed Nov 14 17:28:39 2007 -0500
+++ b/ChangeLog	Thu Nov 15 06:06:41 2007 -0500
@@ -1,3 +1,11 @@ 2007-11-15  Lillian Angel  <langel at redha
+2007-11-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp
+	(line_size, log2_line_size): Reduce cache line size.
+	* ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp
+	(generate_icache_flush): Ensure we never run with an
+	over-large cache line size.
+
 2007-11-15  Lillian Angel  <langel at redhat.com>
 	    Joshua Sumali  <jsumali at redhat.com>
 
diff -r 9f98682ecbbb -r 815f3949a569 ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp	Wed Nov 14 17:28:39 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp	Thu Nov 15 06:06:41 2007 -0500
@@ -28,7 +28,6 @@
 
 #define __ _masm->
 
-#ifdef ASSERT
 static int get_cache_block_size()
 {
   // Measure the cache block size by zeroing the first cache block
@@ -49,14 +48,13 @@ static int get_cache_block_size()
   free(page);
   return blocksize;
 }
-#endif // ASSERT
 
 void ICacheStubGenerator::generate_icache_flush(
   ICache::flush_icache_stub_t* flush_icache_stub) {
 
   StubCodeMark mark(this, "ICache", "flush_icache_stub");
 
-  assert(ICache::line_size <= get_cache_block_size(), "line_size too large");
+  guarantee(ICache::line_size <= get_cache_block_size(),"line_size too large");
   assert(ICache::line_size == 1 << ICache::log2_line_size, "doh");
 
   address start = __ enter();
diff -r 9f98682ecbbb -r 815f3949a569 ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp	Wed Nov 14 17:28:39 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp	Thu Nov 15 06:06:41 2007 -0500
@@ -35,8 +35,8 @@ class ICache : public AbstractICache {
 #else
     stub_size      = 80,  // Size of the icache flush stub in bytes
 #endif // PPC32
-    line_size      = 128, // Icache line size in bytes
-    log2_line_size = 7    // log2(line_size)
+    line_size      = 32,  // Icache line size in bytes
+    log2_line_size = 5    // log2(line_size)
   };
 
   // Use default implementation


From gbenson at redhat.com  Thu Nov 15 05:16:16 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 15 Nov 2007 13:16:16 +0000
Subject: changeset in /hg/icedtea: 2007-11-15  Gary Benson  <gbenson@redh...
Message-ID: <hg.3e77d6bcbb20.1195132576.-6899778133799504387@icedtea.classpath.org>

changeset 3e77d6bcbb20 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3e77d6bcbb20
description:
	2007-11-15  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
		(Rstate): Moved declaration from assembler_ppc.hpp.
		(STATE): Moved definition from cppInterpreter_ppc.cpp.
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(Rstate): Moved definition from register_definitions_ppc.cpp.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		(Rstate): Moved declaration to interp_masm_ppc.hpp.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(STATE): Moved definition to interp_masm_ppc.hpp.
		* ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp
		(Rstate): Moved definition to interp_masm_ppc.cpp.

		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
		(fixup_after_potential_safepoint): New method.
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(fixup_after_potential_safepoint): Likewise.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_normal_entry, generate_native_entry):
		Replace method pointer reloads with calls to the above
		to make what is happening more obvious.
		(generate_native_entry): Add an extra fixup.
		* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
		(generate_slow_signature_handler): Add an extra fixup.

diffstat:

7 files changed, 57 insertions(+), 18 deletions(-)
ChangeLog                                                 |   26 +++++++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp            |    3 -
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp       |   11 +----
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp          |   19 ++++++++-
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp          |   11 +++++
ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp          |    1 
ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp |    4 --

diffs (177 lines):

diff -r 815f3949a569 -r 3e77d6bcbb20 ChangeLog
--- a/ChangeLog	Thu Nov 15 06:06:41 2007 -0500
+++ b/ChangeLog	Thu Nov 15 08:16:11 2007 -0500
@@ -1,3 +1,29 @@ 2007-11-15  Gary Benson  <gbenson at redhat
+2007-11-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
+	(Rstate): Moved declaration from assembler_ppc.hpp.
+	(STATE): Moved definition from cppInterpreter_ppc.cpp.
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(Rstate): Moved definition from register_definitions_ppc.cpp.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	(Rstate): Moved declaration to interp_masm_ppc.hpp.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(STATE): Moved definition to interp_masm_ppc.hpp.
+	* ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp
+	(Rstate): Moved definition to interp_masm_ppc.cpp.
+
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
+	(fixup_after_potential_safepoint): New method.
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(fixup_after_potential_safepoint): Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_normal_entry, generate_native_entry):
+	Replace method pointer reloads with calls to the above
+	to make what is happening more obvious.
+	(generate_native_entry): Add an extra fixup.
+	* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
+	(generate_slow_signature_handler): Add an extra fixup.
+
 2007-11-15  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp
diff -r 815f3949a569 -r 3e77d6bcbb20 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 06:06:41 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 08:16:11 2007 -0500
@@ -30,9 +30,6 @@ REGISTER_DECLARATION(Register, Rmethod, 
 REGISTER_DECLARATION(Register, Rmethod, r31);
 REGISTER_DECLARATION(Register, Rlocals, r30);
 REGISTER_DECLARATION(Register, Rthread, r29);
-#ifdef CC_INTERP
-REGISTER_DECLARATION(Register, Rstate,  r28);
-#endif // CC_INTERP
 
 
 // Address is an abstraction used to represent a memory location
diff -r 815f3949a569 -r 3e77d6bcbb20 ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Thu Nov 15 06:06:41 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
@@ -39,8 +39,6 @@ extern "C" void RecursiveInterpreterActi
 }
 
 #define __ _masm->
-#define STATE(field_name) \
-  (Address(Rstate, byte_offset_of(BytecodeInterpreter, field_name)))
 
 // Non-volatile registers we use
 const Register          Rmonitor = r27;
@@ -526,6 +524,7 @@ address InterpreterGenerator::generate_n
   __ mr (r3, Rthread);
   __ mr (r4, Rmethod);
   __ call (CAST_FROM_FN_PTR(address, InterpreterRuntime::prepare_native_call));
+  __ fixup_after_potential_safepoint ();
   __ load (r0, Address(Rthread, Thread::pending_exception_offset()));
   __ compare (r0, 0);
   __ bne (return_to_caller);
@@ -633,10 +632,8 @@ address InterpreterGenerator::generate_n
   __ mr (r3, Rthread);
   __ call (CAST_FROM_FN_PTR(address,
        JavaThread::check_special_condition_for_native_trans));
+  __ fixup_after_potential_safepoint ();
   __ bind (no_block);
-
-  // The method pointer may have changed if there was a safepoint
-  __ load (Rmethod, STATE(_method));
 
   // Change the thread state
   __ load (r0, _thread_in_Java);
@@ -805,9 +802,7 @@ address InterpreterGenerator::generate_n
 
   __ mr (r3, Rstate);
   __ call (interpreter);
-
-  // The method pointer may have changed if there was a safepoint
-  __ load (Rmethod, STATE(_method));
+  __ fixup_after_potential_safepoint ();
 
   // Clear the frame anchor
   __ reset_last_Java_frame ();
diff -r 815f3949a569 -r 3e77d6bcbb20 ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 06:06:41 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
@@ -26,7 +26,11 @@
 #include "incls/_precompiled.incl"
 #include "incls/_interp_masm_ppc.cpp.incl"
 
-// Lock object
+#ifdef CC_INTERP
+REGISTER_DEFINITION(Register, Rstate);
+#endif
+
+// Lock an object
 //
 // Arguments:
 //  monitor: BasicObjectLock to be used for locking
@@ -68,7 +72,7 @@ void InterpreterMacroAssembler::lock_obj
   bind(done);
 }
 
-// Unlocks an object. Throws an IllegalMonitorException if
+// Unlock an object. Throws an IllegalMonitorException if
 // object is not locked by current thread.
 //
 // Arguments:
@@ -119,3 +123,14 @@ void InterpreterMacroAssembler::unlock_o
   unimplemented(__FILE__, __LINE__);
   bind(done);
 }
+
+// Reload everything that might have changed after a safepoint
+
+void InterpreterMacroAssembler::fixup_after_potential_safepoint()
+{
+#ifdef CC_INTERP
+  load(Rmethod, STATE(_method));
+#else
+  Unimplemented();
+#endif
+}
diff -r 815f3949a569 -r 3e77d6bcbb20 ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Thu Nov 15 06:06:41 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Thu Nov 15 08:16:11 2007 -0500
@@ -25,6 +25,13 @@
 
 // This file specializes the assember with interpreter-specific macros
 
+#ifdef CC_INTERP
+REGISTER_DECLARATION(Register, Rstate, r28);
+
+#define STATE(field_name) \
+  (Address(Rstate, byte_offset_of(BytecodeInterpreter, field_name)))
+#endif // CC_INTERP
+
 class InterpreterMacroAssembler : public MacroAssembler {
  public:
   InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
@@ -32,5 +39,7 @@ class InterpreterMacroAssembler : public
   // Object locking
   void lock_object(Register entry);
   void unlock_object(Register entry);
+
+  // Safepoints
+  void fixup_after_potential_safepoint();
 };
-
diff -r 815f3949a569 -r 3e77d6bcbb20 ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Thu Nov 15 06:06:41 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
@@ -93,6 +93,7 @@ address AbstractInterpreterGenerator::ge
   __ prolog (frame);
   __ call (CAST_FROM_FN_PTR(address,
                             InterpreterRuntime::slow_signature_handler));
+  __ fixup_after_potential_safepoint ();
   __ epilog (frame);
 
   // Load the register images into the registers
diff -r 815f3949a569 -r 3e77d6bcbb20 ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp	Thu Nov 15 06:06:41 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
@@ -109,7 +109,3 @@ REGISTER_DEFINITION(Register, Rmethod);
 REGISTER_DEFINITION(Register, Rmethod);
 REGISTER_DEFINITION(Register, Rlocals);
 REGISTER_DEFINITION(Register, Rthread);
-#ifdef CC_INTERP
-REGISTER_DEFINITION(Register, Rstate);
-#endif
-


From gbenson at redhat.com  Thu Nov 15 05:33:48 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 15 Nov 2007 13:33:48 +0000
Subject: changeset in /hg/icedtea: 2007-11-15 Gary Benson <gbenson@redh...
In-Reply-To: <hg.3e77d6bcbb20.1195132576.-6899778133799504387@icedtea.classpath.org>
References: <hg.3e77d6bcbb20.1195132576.-6899778133799504387@icedtea.classpath.org>
Message-ID: <20071115133348.GD4362@redhat.com>

Detailed changelogs are all very well, but sometimes the meaning of
the change gets lost.  The point of this one is that the x86 code has
loads of places where the method pointer register is reloaded from
memory after function calls.  I assumed it was because it was volatile
and didn't reload because this is ppc: I have non-volatile registers
coming out of my ears.  But it turns out it was nothing to do with
that; the reloads were because the method pointer is an oop and can
thus change after safepoints.  Rather than fill my code with
uncommented reloads that I'll forget about I made a new assembler
macro, fixup_after_potential_safepoint, and used that instead.
And that's the point of this commit.

Cheers,
Gary

Gary Benson wrote:
> changeset 3e77d6bcbb20 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3e77d6bcbb20
> description:
> 	2007-11-15  Gary Benson  <gbenson at redhat.com>
> 
> 		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
> 		(Rstate): Moved declaration from assembler_ppc.hpp.
> 		(STATE): Moved definition from cppInterpreter_ppc.cpp.
> 		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
> 		(Rstate): Moved definition from register_definitions_ppc.cpp.
> 		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
> 		(Rstate): Moved declaration to interp_masm_ppc.hpp.
> 		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
> 		(STATE): Moved definition to interp_masm_ppc.hpp.
> 		* ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp
> 		(Rstate): Moved definition to interp_masm_ppc.cpp.
> 
> 		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
> 		(fixup_after_potential_safepoint): New method.
> 		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
> 		(fixup_after_potential_safepoint): Likewise.
> 		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
> 		(generate_normal_entry, generate_native_entry):
> 		Replace method pointer reloads with calls to the above
> 		to make what is happening more obvious.
> 		(generate_native_entry): Add an extra fixup.
> 		* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
> 		(generate_slow_signature_handler): Add an extra fixup.


From langel at redhat.com  Thu Nov 15 06:40:15 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 15 Nov 2007 09:40:15 -0500
Subject: [PATCH] Use openjdk b23
In-Reply-To: <472F34F6.7000404@redhat.com>
References: <200711030035.38976.bero@arklinux.org>
	<472F34F6.7000404@redhat.com>
Message-ID: <473C5A4F.7060105@redhat.com>

Hi Bernhard,

I apologize for not using your patch to update IcedTea to b23. 
Unfortunately, it did not include jaxws (which was neglected in b22 
because of licensing), and because there were so many changes since this 
patch was created it would not apply cleanly.

Thanks for your hard work, and please continue to contribute :)
Lillian


>
>
>
>
> Bernhard Rosenkraenzer wrote:
>> SSIA...
>>
>> Due to the large size of the patch, I'm not posting it to the list, 
>> it can be downloaded at
>>
>> http://arklinux.org/~bero/icedtea-309-openjdk-b23.patch.bz2
>>
>> The patch is against an icedtea checkout from a couple of days ago 
>> (rev 309), might need slight adjustments with today's changes to 
>> icedtea-libraries.patch
>>
>> Regards,
>> bero



From gbenson at redhat.com  Thu Nov 15 07:11:40 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 15 Nov 2007 15:11:40 +0000
Subject: changeset in /hg/icedtea: 2007-11-15  Gary Benson  <gbenson@redh...
Message-ID: <hg.82970c9037aa.1195139500.-6899778133799504387@icedtea.classpath.org>

changeset 82970c9037aa in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=82970c9037aa
description:
	2007-11-15  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(bcl): New instruction.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(set_last_Java_frame): Preserve the link stack.

diffstat:

4 files changed, 14 insertions(+), 4 deletions(-)
ChangeLog                                        |    8 ++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp   |    4 ++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp   |    1 +
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp |    5 +----

diffs (55 lines):

diff -r 23ffcc32dd5a -r 82970c9037aa ChangeLog
--- a/ChangeLog	Thu Nov 15 09:43:38 2007 -0500
+++ b/ChangeLog	Thu Nov 15 10:11:36 2007 -0500
@@ -1,3 +1,11 @@ 2007-11-15  Gary Benson  <gbenson at redhat
+2007-11-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(bcl): New instruction.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(set_last_Java_frame): Preserve the link stack.
+
 2007-11-15  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
diff -r 23ffcc32dd5a -r 82970c9037aa ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 15 09:43:38 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 15 10:11:36 2007 -0500
@@ -240,6 +240,10 @@ void Assembler::bc(int bo, int bi, addre
 void Assembler::bc(int bo, int bi, address a)
 {
   emit_instruction(16, bo, bi, branch_target(pc(), a, 14), false, false);
+}
+void Assembler::bcl(int bo, int bi, address a)
+{
+  emit_instruction(16, bo, bi, branch_target(pc(), a, 14), false, true);
 }
 void Assembler::bclr(int bo, int bi)
 {
diff -r 23ffcc32dd5a -r 82970c9037aa ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 09:43:38 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 10:11:36 2007 -0500
@@ -114,6 +114,7 @@ class Assembler : public AbstractAssembl
   void andi_(Register dst, Register a, int b);
   void b(address a);
   void bc(int bo, int bi, address a);
+  void bcl(int bo, int bi, address a);
   void bclr(int bo, int bi);
   void bclrl(int bo, int bi);
   void bl(address a);
diff -r 23ffcc32dd5a -r 82970c9037aa ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 09:43:38 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 10:11:36 2007 -0500
@@ -34,10 +34,7 @@ REGISTER_DEFINITION(Register, Rstate);
 
 void InterpreterMacroAssembler::set_last_Java_frame()
 {
-  Label label;
-
-  bl(label);
-  bind(label);
+  bcl(31, 20, pc() + 4);  // magic branch that preserves the link stack
   mflr(r0);
   store(r0, Address(Rthread, JavaThread::last_Java_pc_offset()));
   store(r1, Address(Rthread, JavaThread::last_Java_sp_offset()));


From gbenson at redhat.com  Thu Nov 15 07:11:40 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 15 Nov 2007 15:11:40 +0000
Subject: changeset in /hg/icedtea: 2007-11-15  Gary Benson  <gbenson@redh...
Message-ID: <hg.23ffcc32dd5a.1195139500.-6899778133799504387@icedtea.classpath.org>

changeset 23ffcc32dd5a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=23ffcc32dd5a
description:
	2007-11-15  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(set_last_Java_frame, reset_last_Java_frame):
		Moved from assembler_ppc.hpp and assembler_ppc.cpp.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(set_last_Java_frame, reset_last_Java_frame):
		Moved to interp_masm_ppc.hpp and interp_masm_ppc.cpp.

diffstat:

5 files changed, 36 insertions(+), 20 deletions(-)
ChangeLog                                        |   11 +++++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp   |   17 -----------------
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp   |    3 ---
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp |   21 +++++++++++++++++++++
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp |    4 ++++

diffs (103 lines):

diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ChangeLog
--- a/ChangeLog	Thu Nov 15 08:16:11 2007 -0500
+++ b/ChangeLog	Thu Nov 15 09:43:38 2007 -0500
@@ -1,3 +1,14 @@ 2007-11-15  Gary Benson  <gbenson at redhat
+2007-11-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(set_last_Java_frame, reset_last_Java_frame):
+	Moved from assembler_ppc.hpp and assembler_ppc.cpp.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(set_last_Java_frame, reset_last_Java_frame):
+	Moved to interp_masm_ppc.hpp and interp_masm_ppc.cpp.
+
 2007-11-15  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 15 09:43:38 2007 -0500
@@ -1196,23 +1196,6 @@ void MacroAssembler::cmpxchg_(Register e
   bind(done);
 }
 
-void MacroAssembler::set_last_Java_frame()
-{
-  Label label;
-
-  bl(label);
-  bind(label);
-  mflr(r0);
-  store(r0, Address(Rthread, JavaThread::last_Java_pc_offset()));
-  store(r1, Address(Rthread, JavaThread::last_Java_sp_offset()));
-}
-
-void MacroAssembler::reset_last_Java_frame()
-{
-  load(r0, 0);
-  store(r0, Address(Rthread, JavaThread::last_Java_sp_offset()));
-}
-
 // Write serialization page so VM thread can do a pseudo remote membar.
 void MacroAssembler::serialize_memory(Register tmp1, Register tmp2)
 {
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 15 09:43:38 2007 -0500
@@ -352,9 +352,6 @@ class MacroAssembler : public Assembler 
 
   void cmpxchg_(Register exchange, Register dst, Register compare);
 
-  void set_last_Java_frame();
-  void reset_last_Java_frame();
-
   void serialize_memory(Register tmp1, Register tmp2);
 
   void calc_padding_for_alignment(Register dst, Register src, int align);
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 15 09:43:38 2007 -0500
@@ -29,6 +29,27 @@
 #ifdef CC_INTERP
 REGISTER_DEFINITION(Register, Rstate);
 #endif
+
+// Set the last Java frame pointer
+
+void InterpreterMacroAssembler::set_last_Java_frame()
+{
+  Label label;
+
+  bl(label);
+  bind(label);
+  mflr(r0);
+  store(r0, Address(Rthread, JavaThread::last_Java_pc_offset()));
+  store(r1, Address(Rthread, JavaThread::last_Java_sp_offset()));
+}
+
+// Clear the last Java frame pointer
+
+void InterpreterMacroAssembler::reset_last_Java_frame()
+{
+  load(r0, 0);
+  store(r0, Address(Rthread, JavaThread::last_Java_sp_offset()));
+}
 
 // Lock an object
 //
diff -r 3e77d6bcbb20 -r 23ffcc32dd5a ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Thu Nov 15 08:16:11 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Thu Nov 15 09:43:38 2007 -0500
@@ -36,6 +36,10 @@ class InterpreterMacroAssembler : public
  public:
   InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
 
+  // Frame anchor tracking
+  void set_last_Java_frame();
+  void reset_last_Java_frame();
+
   // Object locking
   void lock_object(Register entry);
   void unlock_object(Register entry);


From langel at redhat.com  Thu Nov 15 07:28:23 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 15 Nov 2007 15:28:23 +0000
Subject: changeset in /hg/icedtea: 2007-11-15  Lillian Angel  <langel@red...
Message-ID: <hg.6f68705ce17c.1195140503.-6899778133799504387@icedtea.classpath.org>

changeset 6f68705ce17c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6f68705ce17c
description:
	2007-11-15  Lillian Angel  <langel at redhat.com>

	        * .hgignore: Updated.

diffstat:

2 files changed, 39 insertions(+)
.hgignore |   35 +++++++++++++++++++++++++++++++++++
ChangeLog |    4 ++++

diffs (56 lines):

diff -r 82970c9037aa -r 6f68705ce17c .hgignore
--- a/.hgignore	Thu Nov 15 10:11:36 2007 -0500
+++ b/.hgignore	Thu Nov 15 10:27:37 2007 -0500
@@ -382,6 +382,41 @@ rt/sun/rmi/rmic/RMIGenerator.java
 rt/sun/rmi/rmic/RMIGenerator.java
 rt/sun/rmi/rmic/RemoteClass.java
 rt/sun/rmi/rmic/Util.java
+rt/javax/net/ssl/CertPathTrustManagerParameters.java
+rt/javax/net/ssl/HandshakeCompletedEvent.java
+rt/javax/net/ssl/HandshakeCompletedListener.java
+rt/javax/net/ssl/HostnameVerifier.java
+rt/javax/net/ssl/HttpsURLConnection.java
+rt/javax/net/ssl/KeyManager.java
+rt/javax/net/ssl/KeyManagerFactory.java
+rt/javax/net/ssl/KeyManagerFactorySpi.java
+rt/javax/net/ssl/KeyStoreBuilderParameters.java
+rt/javax/net/ssl/ManagerFactoryParameters.java
+rt/javax/net/ssl/SSLContext.java
+rt/javax/net/ssl/SSLContextSpi.java
+rt/javax/net/ssl/SSLEngine.java
+rt/javax/net/ssl/SSLEngineResult.java
+rt/javax/net/ssl/SSLException.java
+rt/javax/net/ssl/SSLHandshakeException.java
+rt/javax/net/ssl/SSLKeyException.java
+rt/javax/net/ssl/SSLParameters.java
+rt/javax/net/ssl/SSLPeerUnverifiedException.java
+rt/javax/net/ssl/SSLPermission.java
+rt/javax/net/ssl/SSLProtocolException.java
+rt/javax/net/ssl/SSLServerSocket.java
+rt/javax/net/ssl/SSLServerSocketFactory.java
+rt/javax/net/ssl/SSLSession.java
+rt/javax/net/ssl/SSLSessionBindingEvent.java
+rt/javax/net/ssl/SSLSessionBindingListener.java
+rt/javax/net/ssl/SSLSessionContext.java
+rt/javax/net/ssl/SSLSocket.java
+rt/javax/net/ssl/SSLSocketFactory.java
+rt/javax/net/ssl/TrustManager.java
+rt/javax/net/ssl/TrustManagerFactory.java
+rt/javax/net/ssl/TrustManagerFactorySpi.java
+rt/javax/net/ssl/X509ExtendedKeyManager.java
+rt/javax/net/ssl/X509KeyManager.java
+rt/javax/net/ssl/X509TrustManager.java
 generated/java/lang/CharacterData00.java
 generated/java/lang/CharacterData01.java
 generated/java/lang/CharacterData02.java
diff -r 82970c9037aa -r 6f68705ce17c ChangeLog
--- a/ChangeLog	Thu Nov 15 10:11:36 2007 -0500
+++ b/ChangeLog	Thu Nov 15 10:27:37 2007 -0500
@@ -1,3 +1,7 @@ 2007-11-15  Gary Benson  <gbenson at redhat
+2007-11-15  Lillian Angel  <langel at redhat.com>
+
+	* .hgignore: Updated.
+
 2007-11-15  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp


From langel at redhat.com  Thu Nov 15 07:37:41 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 15 Nov 2007 15:37:41 +0000
Subject: changeset in /hg/icedtea: 2007-11-15  Lillian Angel  <langel@red...
Message-ID: <hg.53c81bc2c2cf.1195141061.-6899778133799504387@icedtea.classpath.org>

changeset 53c81bc2c2cf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=53c81bc2c2cf
description:
	2007-11-15  Lillian Angel  <langel at redhat.com>

	        * tools-copy/tools-j2se-copy-files.txt: Removed.
	        * tools-copy/tools-jdk-copy-files.txt: Added.

diffstat:

3 files changed, 44 insertions(+), 39 deletions(-)
ChangeLog                            |    5 ++++
tools-copy/tools-j2se-copy-files.txt |   39 ----------------------------------
tools-copy/tools-jdk-copy-files.txt  |   39 ++++++++++++++++++++++++++++++++++

diffs (98 lines):

diff -r 6f68705ce17c -r 53c81bc2c2cf ChangeLog
--- a/ChangeLog	Thu Nov 15 10:27:37 2007 -0500
+++ b/ChangeLog	Thu Nov 15 10:36:40 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-15  Lillian Angel  <langel at redha
+2007-11-15  Lillian Angel  <langel at redhat.com>
+
+	* tools-copy/tools-j2se-copy-files.txt: Removed.
+	* tools-copy/tools-jdk-copy-files.txt: Added.
+
 2007-11-15  Lillian Angel  <langel at redhat.com>
 
 	* .hgignore: Updated.
diff -r 6f68705ce17c -r 53c81bc2c2cf tools-copy/tools-j2se-copy-files.txt
--- a/tools-copy/tools-j2se-copy-files.txt	Thu Nov 15 10:27:37 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-com/sun/jarsigner/
-com/sun/jdi/
-com/sun/jdi/connect/
-com/sun/jdi/request/
-com/sun/tools/attach/
-com/sun/tools/example/debug/expr/
-com/sun/tools/example/debug/tty/
-com/sun/tools/extcheck/
-com/sun/tools/script/shell/
-org/relaxng/datatype/
-org/relaxng/datatype/helpers/
-sun/applet/
-sun/applet/resources/
-sun/jvmstat/monitor/
-sun/jvmstat/monitor/remote/
-sun/jvmstat/perfdata/monitor/
-sun/jvmstat/perfdata/monitor/protocol/file/
-sun/jvmstat/perfdata/monitor/protocol/local/
-sun/jvmstat/perfdata/monitor/protocol/rmi/
-sun/jvmstat/perfdata/monitor/v1_0/
-sun/jvmstat/perfdata/monitor/v2_0/
-sun/rmi/rmic/
-sun/rmi/rmic/newrmic/
-sun/rmi/rmic/newrmic/jrmp/
-sun/tools/asm/
-sun/tools/attach/
-sun/tools/jar/
-sun/tools/java/
-sun/tools/javac/
-sun/tools/jinfo/
-sun/tools/jmap/
-sun/tools/jps/
-sun/tools/jstack/
-sun/tools/jstat/
-sun/tools/jstatd/
-sun/tools/native2ascii/
-sun/tools/serialver/
-sun/tools/tree/
-sun/tools/util/
diff -r 6f68705ce17c -r 53c81bc2c2cf tools-copy/tools-jdk-copy-files.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools-copy/tools-jdk-copy-files.txt	Thu Nov 15 10:36:40 2007 -0500
@@ -0,0 +1,39 @@
+com/sun/jarsigner/
+com/sun/jdi/
+com/sun/jdi/connect/
+com/sun/jdi/request/
+com/sun/tools/attach/
+com/sun/tools/example/debug/expr/
+com/sun/tools/example/debug/tty/
+com/sun/tools/extcheck/
+com/sun/tools/script/shell/
+org/relaxng/datatype/
+org/relaxng/datatype/helpers/
+sun/applet/
+sun/applet/resources/
+sun/jvmstat/monitor/
+sun/jvmstat/monitor/remote/
+sun/jvmstat/perfdata/monitor/
+sun/jvmstat/perfdata/monitor/protocol/file/
+sun/jvmstat/perfdata/monitor/protocol/local/
+sun/jvmstat/perfdata/monitor/protocol/rmi/
+sun/jvmstat/perfdata/monitor/v1_0/
+sun/jvmstat/perfdata/monitor/v2_0/
+sun/rmi/rmic/
+sun/rmi/rmic/newrmic/
+sun/rmi/rmic/newrmic/jrmp/
+sun/tools/asm/
+sun/tools/attach/
+sun/tools/jar/
+sun/tools/java/
+sun/tools/javac/
+sun/tools/jinfo/
+sun/tools/jmap/
+sun/tools/jps/
+sun/tools/jstack/
+sun/tools/jstat/
+sun/tools/jstatd/
+sun/tools/native2ascii/
+sun/tools/serialver/
+sun/tools/tree/
+sun/tools/util/


From langel at redhat.com  Thu Nov 15 10:00:36 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 15 Nov 2007 13:00:36 -0500
Subject: changeset in /hg/icedtea: 2007-11-15 Lillian Angel <langel@red...
In-Reply-To: <473BE1C8.5010701@gatech.edu>
References: <hg.9f98682ecbbb.1195079375.-6899778133799504387@icedtea.classpath.org>
	<473BE1C8.5010701@gatech.edu>
Message-ID: <473C8944.2090707@redhat.com>



Matthew Flaschen wrote:
> Lillian Angel wrote:
>> 	        * rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Likewise.
> 
> In theory, it should be possible to replace all this JPEG code with
> calls to javax.imageio.*
> 
> I started this by implementing createJPEGDecoder in the JPEGCodec class.
>  The stub of JPEGImageDecoder was actually incorrect, because the stub
> was an (incomplete) class while JPEGImageDecoder is an interface
> (http://java.sun.com/j2se/1.5.0/docs/guide/2d/api-jpeg/com/sun/image/codec/jpeg/JPEGImageDecoder.html).
>  So I wrote a proper JPEGImageDecoder interface, then used that
> implement a private class in JPEGCodec, ImageIOJPEGImageDecoder.
> 
> Finally, I made a ImageFormatException stub to match the interface.  The
> files I worked on are attached as a hg diff.

I tried building the plugs with your patch (make plugs) and I am 
getting these errors:

[...]
5. ERROR in rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java (at line 57)
         public JPEGDecodeParam getJPEGDecodeParam();
                ^^^^^^^^^^^^^^^
JPEGDecodeParam cannot be resolved to a type
----------
6. ERROR in rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java (at line 59)
         public void setJPEGDecodeParam(JPEGDecodeParam jdp);
                                        ^^^^^^^^^^^^^^^
JPEGDecodeParam cannot be resolved to a type
----------
6 problems (6 errors)make: *** [stamps/rt-class-files.stamp] Error 255


Lillian


From gbenson at redhat.com  Fri Nov 16 04:50:48 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 16 Nov 2007 12:50:48 +0000
Subject: IcedTea porting guide
Message-ID: <20071116125047.GB3630@redhat.com>

Hi all,

Andrew Haley pointed out that since I committed my IcedTea PPC port
the very instant it built, what is there is essentially a record of
the bare minimum of what is needed to bring up OpenJDK on a new
platform.  He suggested I write an overview of what I did, to serve
as a guide to future porters.  If you're interested you can read it
here:

  http://gbenson.livejournal.com/2007/11/16/

Cheers,
Gary


From gbenson at redhat.com  Fri Nov 16 05:18:38 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 16 Nov 2007 13:18:38 +0000
Subject: changeset in /hg/icedtea: 2007-11-16  Gary Benson  <gbenson@redh...
Message-ID: <hg.1f7f39188e9f.1195219118.-6899778133799504387@icedtea.classpath.org>

changeset 1f7f39188e9f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1f7f39188e9f
description:
	2007-11-16  Gary Benson  <gbenson at redhat.com>

		* contrib: New directory.
		* Makefile.am (EXTRA_DIST): Added the above.
		* Makefile.in: Regenerated.

		* contrib/templater: Imported.

diffstat:

70 files changed, 9306 insertions(+), 2 deletions(-)
ChangeLog                                                                          |    8 
Makefile.am                                                                        |    2 
Makefile.in                                                                        |    2 
contrib/templater/README                                                           |    2 
contrib/templater/generate.py                                                      |  184 +
contrib/templater/hotspot/build/linux/makefiles/CPUS.make                          |   46 
contrib/templater/hotspot/build/linux/platform_CPUS                                |   19 
contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.cpp                         | 1375 +++++++++
contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.hpp                         |  408 ++
contrib/templater/hotspot/src/cpu/CPU/vm/bytecodeInterpreter_CPU.hpp               |  103 
contrib/templater/hotspot/src/cpu/CPU/vm/bytecodeInterpreter_CPU.inline.hpp        |  281 ++
contrib/templater/hotspot/src/cpu/CPU/vm/bytecodes_CPU.cpp                         |   32 
contrib/templater/hotspot/src/cpu/CPU/vm/bytecodes_CPU.hpp                         |   25 
contrib/templater/hotspot/src/cpu/CPU/vm/bytes_CPU.hpp                             |  204 +
contrib/templater/hotspot/src/cpu/CPU/vm/codeBuffer_CPU.hpp                        |   27 
contrib/templater/hotspot/src/cpu/CPU/vm/copy_CPU.hpp                              |  166 +
contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreterGenerator_CPU.hpp           |   30 
contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreter_CPU.cpp                    | 1380 ++++++++++
contrib/templater/hotspot/src/cpu/CPU/vm/cppInterpreter_CPU.hpp                    |   32 
contrib/templater/hotspot/src/cpu/CPU/vm/debug_CPU.cpp                             |   32 
contrib/templater/hotspot/src/cpu/CPU/vm/disassembler_CPU.hpp                      |   46 
contrib/templater/hotspot/src/cpu/CPU/vm/dump_CPU.cpp                              |   37 
contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.cpp                             |  131 
contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.hpp                             |   74 
contrib/templater/hotspot/src/cpu/CPU/vm/frame_CPU.inline.hpp                      |  195 +
contrib/templater/hotspot/src/cpu/CPU/vm/globals_CPU.hpp                           |   55 
contrib/templater/hotspot/src/cpu/CPU/vm/icBuffer_CPU.cpp                          |   52 
contrib/templater/hotspot/src/cpu/CPU/vm/icache_CPU.cpp                            |  107 
contrib/templater/hotspot/src/cpu/CPU/vm/icache_CPU.hpp                            |   45 
contrib/templater/hotspot/src/cpu/CPU/vm/interp_masm_CPU.cpp                       |  121 
contrib/templater/hotspot/src/cpu/CPU/vm/interp_masm_CPU.hpp                       |   36 
contrib/templater/hotspot/src/cpu/CPU/vm/interpreterGenerator_CPU.hpp              |   37 
contrib/templater/hotspot/src/cpu/CPU/vm/interpreterRT_CPU.cpp                     |  329 ++
contrib/templater/hotspot/src/cpu/CPU/vm/interpreterRT_CPU.hpp                     |  155 +
contrib/templater/hotspot/src/cpu/CPU/vm/interpreter_CPU.cpp                       |  187 +
contrib/templater/hotspot/src/cpu/CPU/vm/interpreter_CPU.hpp                       |   56 
contrib/templater/hotspot/src/cpu/CPU/vm/javaFrameAnchor_CPU.hpp                   |   79 
contrib/templater/hotspot/src/cpu/CPU/vm/jniFastGetField_CPU.cpp                   |   67 
contrib/templater/hotspot/src/cpu/CPU/vm/jniTypes_CPU.hpp                          |  108 
contrib/templater/hotspot/src/cpu/CPU/vm/jni_CPU.h                                 |   32 
contrib/templater/hotspot/src/cpu/CPU/vm/nativeInst_CPU.hpp                        |  170 +
contrib/templater/hotspot/src/cpu/CPU/vm/registerMap_CPU.hpp                       |   39 
contrib/templater/hotspot/src/cpu/CPU/vm/register_CPU.cpp                          |   53 
contrib/templater/hotspot/src/cpu/CPU/vm/register_CPU.hpp                          |  260 +
contrib/templater/hotspot/src/cpu/CPU/vm/register_definitions_CPU.cpp              |  117 
contrib/templater/hotspot/src/cpu/CPU/vm/relocInfo_CPU.cpp                         |   68 
contrib/templater/hotspot/src/cpu/CPU/vm/relocInfo_CPU.hpp                         |   34 
contrib/templater/hotspot/src/cpu/CPU/vm/sharedRuntime_CPU.cpp                     |  252 +
contrib/templater/hotspot/src/cpu/CPU/vm/stubGenerator_CPU.cpp                     |  524 +++
contrib/templater/hotspot/src/cpu/CPU/vm/stubRoutines_CPU.hpp                      |   58 
contrib/templater/hotspot/src/cpu/CPU/vm/vmStructs_CPU.hpp                         |   52 
contrib/templater/hotspot/src/cpu/CPU/vm/vm_version_CPU.hpp                        |   32 
contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.cpp                             |   45 
contrib/templater/hotspot/src/cpu/CPU/vm/vmreg_CPU.inline.hpp                      |   32 
contrib/templater/hotspot/src/cpu/CPU/vm/vtableStubs_CPU.cpp                       |   47 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/atomic_linux_CPU.inline.hpp      |  162 +
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/bytes_linux_CPU.inline.hpp       |   43 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/globals_linux_CPU.hpp            |   43 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/linux_ppc.s                      |   76 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/linux_ppc64.s                    |   96 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/orderAccess_linux_CPU.inline.hpp |  101 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.cpp                 |  313 ++
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/os_linux_CPU.hpp                 |   36 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/prefetch_linux_CPU.inline.hpp    |   42 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/threadLS_linux_CPU.cpp           |   42 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/threadLS_linux_CPU.hpp           |   32 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/thread_linux_CPU.hpp             |   85 
contrib/templater/hotspot/src/os_cpu/linux_CPU/vm/vmStructs_linux_CPU.hpp          |   45 
contrib/templater/j2se/src/solaris/bin/CPUS/jvm.cfg                                |   44 
contrib/templater/j2se/src/solaris/bin/ergo_CPU.c                                  |   58 

diffs (truncated from 9603 to 500 lines):

diff -r 53c81bc2c2cf -r 1f7f39188e9f ChangeLog
--- a/ChangeLog	Thu Nov 15 10:36:40 2007 -0500
+++ b/ChangeLog	Fri Nov 16 13:18:29 2007 +0000
@@ -1,3 +1,11 @@ 2007-11-15  Lillian Angel  <langel at redha
+2007-11-16  Gary Benson  <gbenson at redhat.com>
+
+	* contrib: New directory.
+	* Makefile.am (EXTRA_DIST): Added the above.
+	* Makefile.in: Regenerated.
+
+	* contrib/templater: Imported.
+
 2007-11-15  Lillian Angel  <langel at redhat.com>
 
 	* tools-copy/tools-j2se-copy-files.txt: Removed.
diff -r 53c81bc2c2cf -r 1f7f39188e9f Makefile.am
--- a/Makefile.am	Thu Nov 15 10:36:40 2007 -0500
+++ b/Makefile.am	Fri Nov 16 13:18:29 2007 +0000
@@ -29,7 +29,7 @@ install:
 	clean-copy clean-rt clean-gcjwebplugin
 
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
-	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy
+	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib
 
 # OpenJDK build environment.
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
diff -r 53c81bc2c2cf -r 1f7f39188e9f Makefile.in
--- a/Makefile.in	Thu Nov 15 10:36:40 2007 -0500
+++ b/Makefile.in	Fri Nov 16 13:18:29 2007 +0000
@@ -191,7 +191,7 @@ OPENJDK_DATE = 30_oct_2007
 OPENJDK_DATE = 30_oct_2007
 OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
-	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy
+	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib
 
 
 # OpenJDK build environment.
diff -r 53c81bc2c2cf -r 1f7f39188e9f contrib/templater/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/templater/README	Fri Nov 16 13:18:29 2007 +0000
@@ -0,0 +1,2 @@
+Please read http://gbenson.livejournal.com/2007/11/16/
+Thank you goodbye
diff -r 53c81bc2c2cf -r 1f7f39188e9f contrib/templater/generate.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/templater/generate.py	Fri Nov 16 13:18:29 2007 +0000
@@ -0,0 +1,184 @@
+import os
+import re
+
+ENDIAN, BITS, RWINDOW = 0, 1, 2
+
+cpus = {"ia64":  ("little", 64, True),
+        "ppc":   ("big",    32, False),
+        "ppc64": ("big",    64, False),
+        "s390":  ("little", 32, False),
+        "s390x": ("little", 64, False)}
+
+modes = {"ia64":  ("ia64",),
+         "ppc":   ("ppc", "ppc64"),
+         "s390":  ("s390", "s390x")}
+                  
+def isLittleEndian(cpu):
+    if cpus[cpu][ENDIAN] == "little":
+        return True
+    return ""
+
+def is64bit(cpu):
+    # Only use this one for files with CPUS in their paths
+    if cpus[cpu][BITS] == 64:
+        return True
+    return ""
+
+def isRegisterWindow(cpu):
+    if cpus[cpu][RWINDOW]:
+        return True
+    return ""
+
+def preprocess(src, cpu):
+    other_cpus = [key.upper() for key in modes.keys() if key != cpu]
+    cpu = cpu.upper()
+    things = re.compile(r"(.*?)(/\*|//|^[ \t]*#)(.*)", re.S | re.M)
+    ends = {"/*": "*/"}
+    COPY, COND_TRUE, COND_FALSE = 1, 2, 3
+    mode = [COPY]
+    dst = ""
+    while src:
+        thing = things.match(src)
+        if not thing:
+            if mode[-1] != COND_FALSE:
+                dst += src
+            break
+        before, thing, src = thing.groups()
+        src = thing + src
+        if mode[-1] != COND_FALSE:
+            dst += before
+        end = ends.get(thing, "\n")
+        index = src.find(end)
+        assert index >= 0
+        index += len(end)
+        thing = src[:index]
+        src = src[index:]
+        if not thing.startswith("#"):
+            if mode[-1] != COND_FALSE:
+                dst += thing
+            continue
+        args = thing.strip().split()
+        cmd = args.pop(0)
+        if cmd == "#":
+            cmd += args.pop(0)
+
+        if cmd in ("#include", "#define", "#undef"):
+            if mode[-1] != COND_FALSE:
+                dst += thing
+        elif cmd in ("#ifdef", "#ifndef"):
+            us, them = {
+                "#ifdef": (COND_TRUE, COND_FALSE),
+                "#ifndef": (COND_FALSE, COND_TRUE)}[cmd]
+            [what] = args
+            if what == cpu:
+                mode.append(us)
+            elif what in other_cpus:
+                mode.append(them)
+            else:
+                mode.append(COPY)
+                dst += thing
+        elif cmd == "#if":
+            for check in [cpu] + other_cpus:
+                assert "defined(%s)" % check not in args
+            mode.append(COPY)
+            dst += thing
+        elif cmd == "#else":
+            if mode[-1] == COND_TRUE:
+                mode[-1] = COND_FALSE
+            elif mode[-1] == COND_FALSE:
+                mode[-1] = COND_TRUE
+            else:
+                dst += thing
+        elif cmd == "#endif":
+            if mode[-1] == COPY:
+                dst += thing
+            mode.pop()
+        else:
+            assert False
+
+    assert mode == [COPY]
+    return dst.replace("_LP64", "PPC64")
+
+def untabify(line):
+    bits = line.split("\t")
+    line = bits.pop(0)
+    for bit in bits:
+        line += " " * (8 - len(line) % 8)
+        line += bit
+    return line
+
+def template(src, dst, basecpu, cpu):
+    bits = open(src, "r").read().split("@@")
+    assert len(bits) & 1
+    for i in xrange(1, len(bits), 2):
+        result = eval(bits[i].strip())
+        if not result:
+            result = ""
+        bits[i] = result
+    result = "".join(bits)
+    if src.split(".")[-1] in ("c", "h", "cpp", "hpp"):
+        result = preprocess(result, cpu)
+    if src.split(".")[-1] != "c":
+        result = "\n".join(
+            [untabify(line.rstrip()) for line in result.split("\n")])
+    if os.path.exists(dst):
+        existing = open(dst, "r").read()
+        if result == existing:
+            return
+    trim = os.getcwd() + os.sep
+    assert dst.startswith(trim)
+    print "creating", dst[len(trim):]
+    dir = os.path.dirname(dst)
+    if not os.path.isdir(dir):
+        os.makedirs(dir)
+    open(dst, "w").write(result)
+
+def skip(item):
+    prefixes, suffixes = ["."], ["~", ".orig", ".rej"]
+    for prefix in prefixes:
+        if item.startswith(prefix):
+            return True
+    for suffix in suffixes:
+        if item.endswith(suffix):
+            return True
+    return False
+
+def visit((srcdir, dstdir, cpus), dir, items):
+    if ".hg" in items:
+        items.remove(".hg")
+    for item in items:
+        if skip(item):
+            continue
+        path = os.path.join(dir, item)
+        if not os.path.isfile(path):
+            continue
+        if path.find("CPU") == -1:
+            continue
+        multi = path.find("CPUS") >= 0
+        trim = srcdir + os.sep
+        assert path.startswith(trim)
+        trim = len(trim)
+        for basecpu in cpus:
+            for cpu in modes[basecpu]:
+                template(
+                    path, os.path.join(dstdir,path[trim:] \
+                                           .replace("CPUS", cpu) \
+                                           .replace("CPU", basecpu)),
+                    basecpu, cpu)
+                if not multi:
+                    break
+
+if __name__ == "__main__":
+    import sys
+    srcdir = os.path.dirname(os.path.abspath(sys.argv[0]))
+    dstdir = os.path.join(os.getcwd(), "ports")
+    if not os.path.isdir(dstdir):
+        print >>sys.stderr, "run me within the IcedTea toplevel directory"
+        sys.exit(1)
+    if len(sys.argv) < 2:
+        cpus = modes.keys()
+        cpus.sort()
+        cpus = "|".join(cpus)
+        print >>sys.stderr, "usage: %s %s..." % (sys.argv[0], cpus)
+        sys.exit(1)
+    os.path.walk(srcdir, visit, (srcdir, dstdir, sys.argv[1:]))
diff -r 53c81bc2c2cf -r 1f7f39188e9f contrib/templater/hotspot/build/linux/makefiles/CPUS.make
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/templater/hotspot/build/linux/makefiles/CPUS.make	Fri Nov 16 13:18:29 2007 +0000
@@ -0,0 +1,46 @@
+#
+# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007 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.
+#
+#
+
+# Not included in includeDB because it has no dependencies
+Obj_Files += linux_@@cpu@@.o
+
+# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
+@@
+
+isLittleEndian(cpu) and """
+# Specify that the CPU is little endian
+CFLAGS += -DVM_LITTLE_ENDIAN
+"""
+@@@@
+
+is64bit(cpu) and """
+# Specify that the CPU is 64 bit
+CFLAGS += -D_LP64=1
+"""
+@@
+OPT_CFLAGS/compactingPermGenGen.o = -O1
diff -r 53c81bc2c2cf -r 1f7f39188e9f contrib/templater/hotspot/build/linux/platform_CPUS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/templater/hotspot/build/linux/platform_CPUS	Fri Nov 16 13:18:29 2007 +0000
@@ -0,0 +1,19 @@
+os_family = linux
+
+arch = @@basecpu@@
+
+arch_model = @@basecpu@@
+
+os_arch = linux_@@basecpu@@
+
+os_arch_model = linux_@@basecpu@@
+
+lib_arch = @@basecpu@@
+
+compiler = gcc
+
+gnu_dis_arch = @@basecpu@@
+
+sysdefs = -DLINUX -D_GNU_SOURCE -D@@basecpu.upper()@@@@
+basecpu == "ppc" and (" -D" + (cpu == "ppc" and "PPC32" or "PPC64"))
+@@ -DCC_INTERP -DXXX_EVIL_EVIL_EVIL
diff -r 53c81bc2c2cf -r 1f7f39188e9f contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/templater/hotspot/src/cpu/CPU/vm/assembler_CPU.cpp	Fri Nov 16 13:18:29 2007 +0000
@@ -0,0 +1,1375 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *  
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_assembler_@@cpu@@.cpp.incl"
+
+#ifdef PPC
+
+// Fill empty space with zeros.
+// (0x00000000 is an illegal instruction on ppc)
+
+int AbstractAssembler::code_fill_byte()
+{
+  return 0x00;
+}
+
+// Instruction emitters for the various forms.
+// Every instruction should ultimately come through one of these.
+
+void Assembler::emit_instruction(int opcode, int li, bool aa, bool lk)
+{
+  // I-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(li & ~0xffffff), "invalid operand");
+  emit_long(opcode << 26 | li << 2 | aa << 1 | lk);
+}
+void Assembler::emit_instruction(int opcode, int bo, int bi, int bd,
+				 bool aa, bool lk) {
+  // B-form (includes SC-form)
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(bo & ~0x1f),     "invalid operand");
+  assert(!(bi & ~0x1f),     "invalid operand");
+  assert(!(bd & ~0x3fff),   "invalid operand");
+  emit_long(opcode << 26 | bo << 21 | bi << 16 | bd << 2 | aa << 1 | lk);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c)
+{
+  // D-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(a & ~0x1f),      "invalid operand");
+  assert(!(b & ~0x1f),      "invalid operand");
+  if (c < 0) {
+    assert((c & ~0xffff) == ~0xffff, "invalid operand");
+    c &= 0xffff;
+  }
+  else
+    assert(!(c & ~0xffff),  "invalid operand");
+  emit_long(opcode << 26 | a << 21 | b << 16 | c);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c, int d)
+{
+  // DS-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(a & ~0x1f),      "invalid operand");
+  assert(!(b & ~0x1f),      "invalid operand");
+  if (c < 0) {
+    assert((c & ~0x3fff) == ~0x3fff, "invalid operand");
+    c &= 0x3fff;
+  }
+  else
+    assert(!(c & ~0x3fff), "invalid operand");
+  assert(!(d & ~0x3),       "invalid operand");
+  emit_long(opcode << 26 | a << 21 | b << 16 | c << 2 | d);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c, int xo,
+				 bool rc) {
+  // X-form
+  assert(!(opcode & ~0x3f), "invalid opcode");
+  assert(!(a & ~0x1f),      "invalid operand");
+  assert(!(b & ~0x1f),      "invalid operand");
+  assert(!(c & ~0x1f),      "invalid operand");
+  assert(!(xo & ~0x3ff),    "invalid operand");
+  emit_long(opcode << 26 | a << 21 | b << 16 | c << 11 | xo << 1 | rc);
+}
+void Assembler::emit_instruction(int opcode, int a, int b, int c, int d,
+				 int e, bool rc) {
+  switch (opcode) {
+  case 21:
+    // M-form    
+    assert(!(a & ~0x1f),    "invalid operand");
+    assert(!(b & ~0x1f),    "invalid operand");
+    assert(!(c & ~0x1f),    "invalid operand");
+    assert(!(d & ~0x1f),    "invalid operand");
+    assert(!(e & ~0x1f),    "invalid operand");
+    break;
+
+  case 30:
+    // MD-form
+    assert(!(a & ~0x1f),    "invalid operand");
+    assert(!(b & ~0x1f),    "invalid operand");
+    assert(!(c & ~0x3f),    "invalid operand");
+    assert(!(d & ~0x3f),    "invalid operand");
+    assert(!(e & ~0x07),    "invalid operand");
+    {
+      int C = c & 0x1f;
+      int D = d & 0x1f;
+      int E = (d & 0x20) >> 1 | e << 1 | (c & 0x20) >> 5;
+
+      c = C; d = D; e = E;
+    }
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+  emit_long(opcode << 26 | a << 21 | b << 16 | c << 11 | d << 6 | e << 1 | rc);
+}
+
+// Wrappers for the instruction emitters.
+// These handle casting and stuff.
+
+void Assembler::emit_instruction(int opcode, Register a, Register b, int c)
+{
+  emit_instruction(opcode, a->encoding(), b->encoding(), c);
+}
+void Assembler::emit_instruction(int opcode, Register a, Register b, int c,
+				 int d) {
+  emit_instruction(opcode, a->encoding(), b->encoding(), c, d);
+}
+void Assembler::emit_instruction(int opcode, FloatRegister a, Register b,
+				 int c) {
+  emit_instruction(opcode, a->encoding(), b->encoding(), c);
+}
+void Assembler::emit_instruction(int opcode, Register a, const Address& b)
+{
+  emit_instruction(opcode, a, b.base(), b.displacement());
+}
+void Assembler::emit_instruction(int opcode, Register a, const Address& b,
+				 int c) {
+  emit_instruction(opcode, a, b.base(), b.displacement() >> 2, c);
+}
+void Assembler::emit_instruction(int opcode, FloatRegister a, const Address& b)
+{
+  emit_instruction(opcode, a, b.base(), b.displacement());
+}
+void Assembler::emit_instruction(int opcode, Register a, int b, int c,
+				 int xo, bool rc) {
+  emit_instruction(opcode, a->encoding(), b, c, xo, rc);
+}
+void Assembler::emit_instruction(int opcode, Register a,  Register b,
+				 Register c, int xo, bool rc) {
+  emit_instruction(opcode, a->encoding(), b->encoding(), c->encoding(),
+		   xo, rc);
+}
+void Assembler::emit_instruction(int opcode, Register a,
+				 SpecialPurposeRegister b, int c, int xo,
+				 bool rc) {
+  emit_instruction(opcode, a->encoding(), b->encoding(), c, xo, rc);
+}
+void Assembler::emit_instruction(int opcode, SpecialPurposeRegister a,
+				 Register b, int c, int xo, bool rc) {
+  emit_instruction(opcode, a->encoding(), b->encoding(), c, xo, rc);
+}
+void Assembler::emit_instruction(int opcode, Register a, Register b,
+				 int c, int d, int e, bool rc) {
+  emit_instruction(opcode, a->encoding(), b->encoding(), c, d, e, rc);
+}
+void Assembler::emit_instruction(int opcode, int a, Register b, Register c,
+				 int d,	bool rc) {
+  emit_instruction(opcode, a, b->encoding(), c->encoding(), d, rc);
+}
+void Assembler::emit_instruction(int opcode, ConditionRegister a, bool l,
+				 Register b, Register c, int d, bool rc) {
+  emit_instruction(opcode, a->encoding() << 2 | l, b, c, d, rc);
+}
+void Assembler::emit_instruction(int opcode, ConditionRegister a, bool l,
+				 Register b, int c) {
+  emit_instruction(opcode, a->encoding() << 2 | l, b->encoding(), c);


From langel at redhat.com  Fri Nov 16 06:20:10 2007
From: langel at redhat.com (Lillian Angel)
Date: Fri, 16 Nov 2007 14:20:10 +0000
Subject: changeset in /hg/icedtea: 2007-11-16  Lillian Angel  <langel@red...
Message-ID: <hg.2989dbf0b643.1195222810.-6899778133799504387@icedtea.classpath.org>

changeset 2989dbf0b643 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2989dbf0b643
description:
	2007-11-16  Lillian Angel  <langel at redhat.com>

	        * AUTHORS: Added Mathhew Flaschen.

	2007-11-16  Matthew Flaschen  <matthew.flaschen at gatech.edu>

	        * rt/com/sun/image/codec/jpeg/JPEGCodec.java: Partially implemented.
	        * rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Implemented.
	        * rt/com/sun/image/codec/jpeg/ImageFormatException.java: New Class,
	        implemented.
	        * rt/com/sun/image/codec/jpeg/JPEGDecodeParam.java: New Class,
	        stubbed.

diffstat:

6 files changed, 217 insertions(+), 11 deletions(-)
AUTHORS                                               |    1 
ChangeLog                                             |   13 ++
rt/com/sun/image/codec/jpeg/ImageFormatException.java |   51 ++++++++
rt/com/sun/image/codec/jpeg/JPEGCodec.java            |   98 +++++++++++++++--
rt/com/sun/image/codec/jpeg/JPEGDecodeParam.java      |   44 +++++++
rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java     |   21 ++-

diffs (296 lines):

diff -r 1f7f39188e9f -r 2989dbf0b643 AUTHORS
--- a/AUTHORS	Fri Nov 16 13:18:29 2007 +0000
+++ b/AUTHORS	Fri Nov 16 09:19:22 2007 -0500
@@ -5,6 +5,7 @@ Gary Benson <gbenson at redhat.com>
 Gary Benson <gbenson at redhat.com>
 Tania Bento <tbento at redhat.com>
 Thomas Fitzsimmons <fitzsim at redhat.com>
+Matthew Flaschen <matthew.flaschen at gatech.edu>
 Kyle Galloway <kgallowa at redhat.com>
 Andrew Haley <aph at redhat.com>
 Matthias Klose <doko at ubuntu.com>
diff -r 1f7f39188e9f -r 2989dbf0b643 ChangeLog
--- a/ChangeLog	Fri Nov 16 13:18:29 2007 +0000
+++ b/ChangeLog	Fri Nov 16 09:19:22 2007 -0500
@@ -1,3 +1,16 @@ 2007-11-16  Gary Benson  <gbenson at redhat
+2007-11-16  Lillian Angel  <langel at redhat.com>
+
+	* AUTHORS: Added Mathhew Flaschen.
+
+2007-11-16  Matthew Flaschen  <matthew.flaschen at gatech.edu>
+
+	* rt/com/sun/image/codec/jpeg/JPEGCodec.java: Partially implemented.
+	* rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Implemented.
+	* rt/com/sun/image/codec/jpeg/ImageFormatException.java: New Class,
+	implemented.
+	* rt/com/sun/image/codec/jpeg/JPEGDecodeParam.java: New Class,
+	stubbed.
+
 2007-11-16  Gary Benson  <gbenson at redhat.com>
 
 	* contrib: New directory.
diff -r 1f7f39188e9f -r 2989dbf0b643 rt/com/sun/image/codec/jpeg/ImageFormatException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/com/sun/image/codec/jpeg/ImageFormatException.java	Fri Nov 16 09:19:22 2007 -0500
@@ -0,0 +1,51 @@
+/* ImageFormatException.java
+   Copyright (C) 2007 Matthew Flaschen
+
+   This file is part of IcedTea
+
+   IcedTea is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   IcedTea is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Classpath; 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 com.sun.image.codec.jpeg;
+
+public class ImageFormatException extends RuntimeException
+{
+	public ImageFormatException()
+	{
+		this("");
+	}
+
+	public ImageFormatException(String s)
+	{
+		super(s);
+	}
+}
diff -r 1f7f39188e9f -r 2989dbf0b643 rt/com/sun/image/codec/jpeg/JPEGCodec.java
--- a/rt/com/sun/image/codec/jpeg/JPEGCodec.java	Fri Nov 16 13:18:29 2007 +0000
+++ b/rt/com/sun/image/codec/jpeg/JPEGCodec.java	Fri Nov 16 09:19:22 2007 -0500
@@ -1,5 +1,6 @@
 /* JPEGCodec.java -- 
    Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007 Matthew Flaschen
 
    This file is part of GNU Classpath.
 
@@ -39,22 +40,107 @@ package com.sun.image.codec.jpeg;
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import com.sun.image.codec.jpeg.*;
+import java.io.IOException;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.Raster;
+
+import javax.imageio.*;
+import javax.imageio.stream.*;
+import javax.imageio.plugins.jpeg.*;
+
+import java.util.Iterator;
 
 public class JPEGCodec
 {
 
-	public JPEGCodec()
-	{
-	}	
-
 	public static JPEGImageDecoder createJPEGDecoder(InputStream is)
 	{
-		return null;
+		return new ImageIOJPEGImageDecoder(is);
 	}
 
 	public static JPEGImageEncoder createJPEGEncoder(OutputStream os)
 	{
 		return null;
 	}
+
+	public static JPEGImageDecoder createJPEGDecoder(InputStream src, JPEGDecodeParam jdp)
+	{
+		return null; 
+	}
+        
+	public static JPEGImageEncoder createJPEGEncoder(OutputStream dest, JPEGEncodeParam jep)
+	{
+		return null;
+	}
+        
+	public static JPEGEncodeParam getDefaultJPEGEncodeParam(BufferedImage bi)
+	{
+		return null;
+	}
+        
+	public static JPEGEncodeParam getDefaultJPEGEncodeParam(int numBands, int colorID)
+	{
+		return null;
+	}
+		
+	public static JPEGEncodeParam getDefaultJPEGEncodeParam(JPEGDecodeParam jdp)
+	{
+		return null;
+	}
+        
+	public static JPEGEncodeParam getDefaultJPEGEncodeParam(Raster ras, int colorID)
+	{
+		return null;
+	}
+        
+
+	private static class ImageIOJPEGImageDecoder implements JPEGImageDecoder
+	{
+		
+		private static final String JPGMime = "image/jpeg";
+    
+		private ImageReader JPGReader;
+		
+		private InputStream in;
+		
+		private ImageIOJPEGImageDecoder (InputStream newIs)
+		{
+			in = newIs;
+			
+			Iterator<ImageReader> JPGReaderIter = ImageIO.getImageReadersByMIMEType(JPGMime);
+			if(JPGReaderIter.hasNext())
+			{
+				JPGReader  = JPGReaderIter.next();
+			}
+			
+			JPGReader.setInput(new MemoryCacheImageInputStream(in));
+		}
+
+		public BufferedImage decodeAsBufferedImage() throws IOException, ImageFormatException
+		{
+			return JPGReader.read(0);
+		}
+		
+		public Raster decodeAsRaster() throws IOException, ImageFormatException
+		{
+			return JPGReader.readRaster(0, null);
+		}
+		
+		public InputStream getInputStream()
+		{
+			return in;
+		}
+		
+		public JPEGDecodeParam getJPEGDecodeParam()
+		{
+			return null;
+		}
+
+		public void setJPEGDecodeParam(JPEGDecodeParam jdp)
+		{
+			return;
+		}
+
+	}
 }
diff -r 1f7f39188e9f -r 2989dbf0b643 rt/com/sun/image/codec/jpeg/JPEGDecodeParam.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/com/sun/image/codec/jpeg/JPEGDecodeParam.java	Fri Nov 16 09:19:22 2007 -0500
@@ -0,0 +1,44 @@
+/* JPEGImageDecoder.java -- 
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007 Matthew Flaschen
+
+   This file is part of GNU Classpath.
+
+   GNU Classpath is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GNU Classpath 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 GNU Classpath; 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 com.sun.image.codec.jpeg;
+
+public interface JPEGDecodeParam
+{
+
+}
diff -r 1f7f39188e9f -r 2989dbf0b643 rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java
--- a/rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java	Fri Nov 16 13:18:29 2007 +0000
+++ b/rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java	Fri Nov 16 09:19:22 2007 -0500
@@ -1,5 +1,6 @@
 /* JPEGImageDecoder.java -- 
    Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007 Matthew Flaschen
 
    This file is part of GNU Classpath.
 
@@ -38,12 +39,22 @@
 
 package com.sun.image.codec.jpeg;
 import java.awt.image.BufferedImage;
+import java.awt.image.Raster;
 
-public class JPEGImageDecoder
+import java.io.InputStream;
+import java.io.IOException;
+
+
+public interface JPEGImageDecoder
 {
 
-	public BufferedImage decodeAsBufferedImage()
-	{
-		return null;
-	}
+	public BufferedImage decodeAsBufferedImage() throws IOException, ImageFormatException;
+	
+	public Raster decodeAsRaster() throws IOException, ImageFormatException;
+	
+	public InputStream getInputStream();
+
+	public JPEGDecodeParam getJPEGDecodeParam();
+
+	public void setJPEGDecodeParam(JPEGDecodeParam jdp);
 }


From langel at redhat.com  Fri Nov 16 06:21:15 2007
From: langel at redhat.com (Lillian Angel)
Date: Fri, 16 Nov 2007 09:21:15 -0500
Subject: changeset in /hg/icedtea: 2007-11-15 Lillian Angel <langel@red...
In-Reply-To: <473D16D6.70701@gatech.edu>
References: <hg.9f98682ecbbb.1195079375.-6899778133799504387@icedtea.classpath.org>
	<473BE1C8.5010701@gatech.edu> <473C8944.2090707@redhat.com>
	<473D16D6.70701@gatech.edu>
Message-ID: <473DA75B.5050003@redhat.com>

Matthew Flaschen wrote:
> Lillian Angel wrote:
>
>   
>> 5. ERROR in rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java (at line 57)
>>         public JPEGDecodeParam getJPEGDecodeParam();
>>                ^^^^^^^^^^^^^^^
>> JPEGDecodeParam cannot be resolved to a type
>>     
>
> I forgot to add the JPEGDecodeParam stub to the patch.  It's attached,
> just an empty stub because it's unused for now.
>   

Thanks! I committed your patches.


Lillian


From bugzilla-daemon at icedtea.classpath.org  Fri Nov 16 06:28:55 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 16 Nov 2007 14:28:55 +0000
Subject: [Bug 79] security type applet doesnt work
Message-ID: <E1It2Bj-0006Ok-UY@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=79





------- Comment #1 from langel at redhat.com  2007-11-16 14:28 -------
This does not work for openjdk's appletviewer (or jdk1.5.0) either:

$ ./openjdk/control/build/linux-i586/bin/appletviewer
https://www1.skatteverket.se/es/eskd/login.do?method=cbt


Applet was not granted necessary rights and is unable to run.
Please contact your support line if this problem persists.
Message class 'null' instantiation error.
Applet cannot start.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From gbenson at redhat.com  Fri Nov 16 08:31:25 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 16 Nov 2007 16:31:25 +0000
Subject: changeset in /hg/icedtea: Braino
Message-ID: <hg.a728abeb98e8.1195230685.-6899778133799504387@icedtea.classpath.org>

changeset a728abeb98e8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a728abeb98e8
description:
	Braino

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
ChangeLog |    2 +-

diffs (12 lines):

diff -r 2989dbf0b643 -r a728abeb98e8 ChangeLog
--- a/ChangeLog	Fri Nov 16 09:19:22 2007 -0500
+++ b/ChangeLog	Fri Nov 16 16:31:19 2007 +0000
@@ -33,7 +33,7 @@ 2007-11-15  Gary Benson  <gbenson at redhat
 	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
 	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
 	(bcl): New instruction.
-	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
 	(set_last_Java_frame): Preserve the link stack.
 
 2007-11-15  Gary Benson  <gbenson at redhat.com>


From gbenson at redhat.com  Fri Nov 16 08:33:11 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 16 Nov 2007 16:33:11 +0000
Subject: changeset in /hg/icedtea: 2007-11-16  Gary Benson  <gbenson@redh...
Message-ID: <hg.9c486bf59c8e.1195230791.-6899778133799504387@icedtea.classpath.org>

changeset 9c486bf59c8e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c486bf59c8e
description:
	2007-11-16  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(set_last_Java_frame): Really preserve the link stack.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog                                        |    5 +++++
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp |    2 +-

diffs (24 lines):

diff -r a728abeb98e8 -r 9c486bf59c8e ChangeLog
--- a/ChangeLog	Fri Nov 16 16:31:19 2007 +0000
+++ b/ChangeLog	Fri Nov 16 16:33:05 2007 +0000
@@ -1,3 +1,8 @@ 2007-11-16  Lillian Angel  <langel at redha
+2007-11-16  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(set_last_Java_frame): Really preserve the link stack.
+
 2007-11-16  Lillian Angel  <langel at redhat.com>
 
 	* AUTHORS: Added Mathhew Flaschen.
diff -r a728abeb98e8 -r 9c486bf59c8e ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Fri Nov 16 16:31:19 2007 +0000
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Fri Nov 16 16:33:05 2007 +0000
@@ -34,7 +34,7 @@ REGISTER_DEFINITION(Register, Rstate);
 
 void InterpreterMacroAssembler::set_last_Java_frame()
 {
-  bcl(31, 20, pc() + 4);  // magic branch that preserves the link stack
+  bcl(20, 31, pc() + 4);  // magic branch that preserves the link stack
   mflr(r0);
   store(r0, Address(Rthread, JavaThread::last_Java_pc_offset()));
   store(r1, Address(Rthread, JavaThread::last_Java_sp_offset()));


From avdyk at debian.org  Fri Nov 16 09:20:14 2007
From: avdyk at debian.org (Arnaud Vandyck)
Date: Fri, 16 Nov 2007 17:20:14 +0000 (UTC)
Subject: [icedtea/powerpc] still fails for me :'(
Message-ID: <loom.20071116T171656-655@post.gmane.org>

Hi all,

Tom told me on irc to send this to the list:

I'm trying to build icedtea on Debian (sid)/powerpc with the help of Gary
Benson. It still fails and here are the last log I have:
http://people.debian.org/~avdyk/icedtea/jvm_core_dump.html

I'm not sure I am subscribed on the list so do not hesitate to Cc me.

--
Arnaud Vandyck




From fitzsim at redhat.com  Fri Nov 16 14:37:14 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Fri, 16 Nov 2007 22:37:14 +0000
Subject: changeset in /hg/icedtea: 2007-11-16  Thomas Fitzsimmons  <fitzs...
Message-ID: <hg.281278286dd3.1195252634.-6899778133799504387@icedtea.classpath.org>

changeset 281278286dd3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=281278286dd3
description:
	2007-11-16  Thomas Fitzsimmons  <fitzsim at redhat.com>

		* Makefile.am (ICEDTEA_PATCHES): Add
		patches/icedtea-lcms-leak.patch.
		* Makefile.in: Regenerate.

diffstat:

3 files changed, 36 insertions(+), 28 deletions(-)
ChangeLog   |   62 ++++++++++++++++++++++++++++++++---------------------------
Makefile.am |    1 
Makefile.in |    1 

diffs (189 lines):

diff -r 9c486bf59c8e -r 281278286dd3 ChangeLog
--- a/ChangeLog	Fri Nov 16 16:33:05 2007 +0000
+++ b/ChangeLog	Fri Nov 16 17:37:09 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-16  Gary Benson  <gbenson at redhat
+2007-11-16  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add
+	patches/icedtea-lcms-leak.patch.
+	* Makefile.in: Regenerate.
+
 2007-11-16  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
@@ -89,7 +95,7 @@ 2007-11-15  Lillian Angel  <langel at redha
 2007-11-15  Lillian Angel  <langel at redhat.com>
 	    Joshua Sumali  <jsumali at redhat.com>
 
-	* Makefile.am: Changed j2se to jdk. 
+	* Makefile.am: Changed j2se to jdk.
 	(OPENJDK_VERSION): Updated to b23.
 	(OPENJDK_DATE): Likewise.
 	(OPENJDK_MD5SUM): Likewise.
@@ -522,7 +528,7 @@ 2007-10-14  Thomas Fitzsimmons  <fitzsim
 	* patches/icedtea-xinerama.patch: Likewise.
 
 2007-10-12  Lillian Angel  <langel at redhat.com>
-	
+
 	* NEWS: Updated for 1.4.
 
 2007-10-12  Andrew Haley  <aph at redhat.com>
@@ -568,7 +574,7 @@ 2007-10-05  Andrew Haley  <aph at redhat.co
 	* patches/icedtea-debuginfo.patch: Add
 	openjdk/hotspot/build/linux/makefiles/gcc.make.
 	Add -g to CFLAGS_REQUIRED in
-	openjdk/j2se/make/common/Defs-linux.gmk	
+	openjdk/j2se/make/common/Defs-linux.gmk
 
 2007-10-04  Thomas Fitzsimmons  <fitzsim at redhat.com>
 
@@ -838,9 +844,9 @@ 2007-09-04  Lillian Angel  <langel at redha
 2007-09-04  Lillian Angel  <langel at redhat.com>
 
 	* .hgignore: Updated to ignore tools/
-	* Makefile.am: Updated to b19. A version of tools.jar is now 
-	generated at the beginning of the build. It is now required to 
-	build other hotspot sources. rt.jar has been renamed to rt-closed.jar, 
+	* Makefile.am: Updated to b19. A version of tools.jar is now
+	generated at the beginning of the build. It is now required to
+	build other hotspot sources. rt.jar has been renamed to rt-closed.jar,
 	and ALT_CLOSED_JDK_IMPORT_PATH has been replaced with
 	ALT_BINARY_PLUGS_PATH, as per b19 changes.
 	* Makefile.in: Regenerated.
@@ -875,7 +881,7 @@ 2007-08-30  Lillian Angel  <langel at redha
 	* Makefile.in: Regenerated.
 
 2007-08-29  Lillian Angel  <langel at redhat.com>
-	
+
 	* Makefile.am: Should make lib/rt and lib/jce because javac
 	doesn't create the directories on the fly.
 	* Makefile.in: Regenerate
@@ -1026,7 +1032,7 @@ 2007-08-16  Lillian Angel  <langel at redha
 
 2007-08-16  Lillian Angel  <langel at redhat.com>
 
-	* Makefile.am: Removed targets to generated properties files. 
+	* Makefile.am: Removed targets to generated properties files.
 	* Makefile.in: Regenerated.
 
 2007-08-15  Lillian Angel  <langel at redhat.com>
@@ -1034,7 +1040,7 @@ 2007-08-15  Lillian Angel  <langel at redha
 	* Makefile.am: Added new patch.
 	* Makefile.in: Regenerated
 	* README: Added license header information
-	* patches/icedtea-license-headers.patch: New patch to patch scripts to 
+	* patches/icedtea-license-headers.patch: New patch to patch scripts to
 	use GPL	license header instead of proprietary one.
 
 2007-08-15  Thomas Fitzsimmons  <fitzsim at redhat.com>
@@ -1256,7 +1262,7 @@ 2007-07-18  Casey Marshall  <csm at gnu.org
 	new file.
 	* jce/gnu/java/security/icedtea/IcedTls.java: add
 	`CertBundleKeyStoreImpl' to provider.
-	
+
 2007-07-18  Thomas Fitzsimmons  <fitzsim at redhat.com>
 
 	* configure.ac: Bump version to 1.2.
@@ -1281,7 +1287,7 @@ 2007-07-18  Lillian Angel  <langel at redha
 
 	* jce/gnu/javax/crypto/jce/GnuCrypto.java: Added PBEWithMD5AndDES and
 	PBE providers.
-	* jce/gnu/javax/crypto/jce/cipher/CipherAdapter.java: 
+	* jce/gnu/javax/crypto/jce/cipher/CipherAdapter.java:
 	(engineUpdate): Fixed blockCount and buffer size.
 	(engineUpdate): Fixed blockCount.
 	* jce/gnu/javax/crypto/key/GnuPBEKey.java
@@ -1339,7 +1345,7 @@ 2007-07-11  Andrew Haley  <aph at redhat.co
 
 	* patches/icedtea-assembler_amd64.patch: New file.
 	* Makefile.am (ICEDTEA_PATCHES): Add icedtea-assembler_amd64.patch.
-	(icedtea-debug): New target 
+	(icedtea-debug): New target
 
 2007-07-08  Mark Wielaard  <mark at klomp.org>
 
@@ -1497,7 +1503,7 @@ 2007-07-05  Casey Marshall  <csm at gnu.org
 2007-07-05  Casey Marshall  <csm at gnu.org>
 
 	* jce/gnu/java/security/icedtea/IcedTls.java: New Class.
-	* jce/gnu/java/security/icedtea/GNUTlsRsaPreMasterSecretGeneratorImpl.java: 
+	* jce/gnu/java/security/icedtea/GNUTlsRsaPreMasterSecretGeneratorImpl.java:
 	New Class.
 	* jce/gnu/java/security/icedtea/GNUTlsPrfGeneratorImpl.java: New Class.
 	* jce/gnu/java/security/icedtea/GNUTlsMasterSecretGenerator.java: New Class.
@@ -1693,19 +1699,19 @@ 2007-06-27  Lillian Angel  <langel at redha
 
 2007-06-27  Lillian Angel  <langel at redhat.com>
 
-	* rt/java/util/Timer.java 
-	rt/javax/security/auth/callback/ChoiceCallback.java 
-	rt/javax/security/auth/callback/ConfirmationCallback.java 
-	rt/javax/security/auth/callback/LanguageCallback.java 
-	rt/javax/security/auth/callback/NameCallback.java 
-	rt/javax/security/auth/callback/TextInputCallback.java 
-	rt/javax/security/auth/callback/TextOutputCallback.java 
-	rt/javax/security/sasl/AuthenticationException.java 
-	rt/javax/security/sasl/Sasl.java 
-	rt/javax/security/sasl/SaslClient.java 
-	rt/javax/security/sasl/SaslClientFactory.java 
-	rt/javax/security/sasl/SaslException.java 
-	rt/javax/security/sasl/SaslServer.java 
+	* rt/java/util/Timer.java
+	rt/javax/security/auth/callback/ChoiceCallback.java
+	rt/javax/security/auth/callback/ConfirmationCallback.java
+	rt/javax/security/auth/callback/LanguageCallback.java
+	rt/javax/security/auth/callback/NameCallback.java
+	rt/javax/security/auth/callback/TextInputCallback.java
+	rt/javax/security/auth/callback/TextOutputCallback.java
+	rt/javax/security/sasl/AuthenticationException.java
+	rt/javax/security/sasl/Sasl.java
+	rt/javax/security/sasl/SaslClient.java
+	rt/javax/security/sasl/SaslClientFactory.java
+	rt/javax/security/sasl/SaslException.java
+	rt/javax/security/sasl/SaslServer.java
 	rt/javax/security/sasl/SaslServerFactory.java: Removed from repo. They
 	are being copied from the openjdk src anyways.
 
@@ -2290,7 +2296,7 @@ 2007-06-20  Francis Kung  <fkung at redhat.
 	* configure: Likewise.
 
 2007-06-20  Lillian Angel  <langel at redhat.com>
-	
+
 	* patches/icedtea-copy-plugs.patch: Fixed paths.
 
 2007-06-20  Lillian Angel  <langel at redhat.com>
@@ -2378,7 +2384,7 @@ 2007-06-14  Lillian Angel  <langel at redha
 2007-06-14  Lillian Angel  <langel at redhat.com>
 
 	* icedtea-version.patch: Changes LAUNCHER_NAME to "java" instead of
-	"openjdk". Also, removes -MILESTONE from RELEASE string. "java 
+	"openjdk". Also, removes -MILESTONE from RELEASE string. "java
 	-version" now outputs the expected string.
 	* Makefile.am: Added new patch to list.
 
diff -r 9c486bf59c8e -r 281278286dd3 Makefile.am
--- a/Makefile.am	Fri Nov 16 16:33:05 2007 +0000
+++ b/Makefile.am	Fri Nov 16 17:37:09 2007 -0500
@@ -203,6 +203,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-core-build.patch \
 	patches/icedtea-linker-options.patch \
 	patches/icedtea-ports.patch \
+	patches/icedtea-lcms-leak.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 9c486bf59c8e -r 281278286dd3 Makefile.in
--- a/Makefile.in	Fri Nov 16 16:33:05 2007 +0000
+++ b/Makefile.in	Fri Nov 16 17:37:09 2007 -0500
@@ -311,6 +311,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-core-build.patch \
 	patches/icedtea-linker-options.patch \
 	patches/icedtea-ports.patch \
+	patches/icedtea-lcms-leak.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 


From fitzsim at redhat.com  Fri Nov 16 15:04:37 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Fri, 16 Nov 2007 23:04:37 +0000
Subject: changeset in /hg/icedtea: - Add patches/icedtea-lcms-leak.patch.
Message-ID: <hg.b496ec5da0f0.1195254277.-6899778133799504387@icedtea.classpath.org>

changeset b496ec5da0f0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b496ec5da0f0
description:
	- Add patches/icedtea-lcms-leak.patch.

diffstat:

2 files changed, 15 insertions(+)
ChangeLog                       |    1 +
patches/icedtea-lcms-leak.patch |   14 ++++++++++++++

diffs (29 lines):

diff -r 281278286dd3 -r b496ec5da0f0 ChangeLog
--- a/ChangeLog	Fri Nov 16 17:37:09 2007 -0500
+++ b/ChangeLog	Fri Nov 16 18:04:31 2007 -0500
@@ -3,6 +3,7 @@ 2007-11-16  Thomas Fitzsimmons  <fitzsim
 	* Makefile.am (ICEDTEA_PATCHES): Add
 	patches/icedtea-lcms-leak.patch.
 	* Makefile.in: Regenerate.
+	* patches/icedtea-lcms-leak.patch: New file.
 
 2007-11-16  Gary Benson  <gbenson at redhat.com>
 
diff -r 281278286dd3 -r b496ec5da0f0 patches/icedtea-lcms-leak.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-lcms-leak.patch	Fri Nov 16 18:04:31 2007 -0500
@@ -0,0 +1,14 @@
+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c.orig	2007-11-15 19:07:12.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2007-11-15 19:09:31.000000000 -0500
+@@ -183,9 +183,10 @@
+     sProf.pf = cmsOpenProfileFromMem((LPVOID)dataArray, (DWORD) dataSize);
+ 
+     if (sProf.pf == NULL) {
++        (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
+         JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
+     }
+-
++    (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
+     return sProf.j;
+ }
+ 


From fitzsim at redhat.com  Fri Nov 16 15:08:18 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Fri, 16 Nov 2007 18:08:18 -0500
Subject: Re-implemented ecj support
In-Reply-To: <47320CDA.90604@redhat.com>
References: <47320CDA.90604@redhat.com>
Message-ID: <473E22E2.6000807@redhat.com>

Lillian Angel wrote:
> Hi,
> 
> I have just added ecj support back into IcedTea.
> 
> To build with ecj and bootstrap:
> ./configure && make
> 
> To bootstrap with an old IcedTea build:
> ./configure --with-icedtea [/usr/lib/jvm/java-icedtea] && make
> OR
> ./configure --with-icedtea-home=/path/to/icedtea && make
> 
> Use --with-gcj-home=/path/to/gcj to specify where gcj is installed, 
> default location is /usr/lib/jvm/java-gcj. This is needed to link a few 
> corba libs using libgcj.

Please update INSTALL with these new instructions.

Tom


From langel at redhat.com  Fri Nov 16 20:16:32 2007
From: langel at redhat.com (Lillian Angel)
Date: Sat, 17 Nov 2007 04:16:32 +0000
Subject: changeset in /hg/icedtea: 2007-11-16  Lillian Angel  <langel@red...
Message-ID: <hg.23ab73c70156.1195272992.-6899778133799504387@icedtea.classpath.org>

changeset 23ab73c70156 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=23ab73c70156
description:
	2007-11-16  Lillian Angel  <langel at redhat.com>

	        * INSTALL: Updated.

diffstat:

2 files changed, 10 insertions(+), 5 deletions(-)
ChangeLog |    4 ++++
INSTALL   |   11 ++++++-----

diffs (42 lines):

diff -r b496ec5da0f0 -r 23ab73c70156 ChangeLog
--- a/ChangeLog	Fri Nov 16 18:04:31 2007 -0500
+++ b/ChangeLog	Fri Nov 16 23:15:44 2007 -0500
@@ -1,3 +1,7 @@ 2007-11-16  Thomas Fitzsimmons  <fitzsim
+2007-11-16  Lillian Angel  <langel at redhat.com>
+
+	* INSTALL: Updated.
+
 2007-11-16  Thomas Fitzsimmons  <fitzsim at redhat.com>
 
 	* Makefile.am (ICEDTEA_PATCHES): Add
diff -r b496ec5da0f0 -r 23ab73c70156 INSTALL
--- a/INSTALL	Fri Nov 16 18:04:31 2007 -0500
+++ b/INSTALL	Fri Nov 16 23:15:44 2007 -0500
@@ -30,21 +30,22 @@ libpng-devel
 libpng-devel
 libjpeg-devel
 zlib-devel
-java-1.7.0-icedtea-devel (or IcedTea <= b19 built)
 
 See ./configure --help if you need to override defaults.
 
+To bootstrap IcedTea with ecj:
 ./configure 
-	--with-icedtea-home=/path/to/old/icedtea 
-		[default /usr/lib/jvm/java-icedtea]
 make
+
+To build IcedTea with an older version of IcedTea, use:
+./configure --with-icedtea [default location: /usr/lib/jvm/java-icedtea]
+make
+
 
 There is currently no install target.
 
 IcedTea ends up in openjdk/control/build/linux-i586 or
 openjdk/control/build/linux-amd64 when the build completes.
-
-This builds IcedTea against a previously built IcedTea.
 
 
 Rebuilding The IcedTea Plugs


From matthew.flaschen at gatech.edu  Fri Nov 16 20:27:38 2007
From: matthew.flaschen at gatech.edu (Matthew Flaschen)
Date: Fri, 16 Nov 2007 23:27:38 -0500
Subject: changeset in /hg/icedtea: 2007-11-16 Lillian Angel <langel@red...
In-Reply-To: <hg.23ab73c70156.1195272992.-6899778133799504387@icedtea.classpath.org>
References: <hg.23ab73c70156.1195272992.-6899778133799504387@icedtea.classpath.org>
Message-ID: <473E6DBA.8030707@gatech.edu>

Lillian Angel wrote:

> +To build IcedTea with an older version of IcedTea, use:
> +./configure --with-icedtea [default location: /usr/lib/jvm/java-icedtea]

I think this should mention --with-icedtea-home explicitly.

Matt Flaschen


From langel at redhat.com  Fri Nov 16 20:34:12 2007
From: langel at redhat.com (Lillian Angel)
Date: Sat, 17 Nov 2007 04:34:12 +0000
Subject: changeset in /hg/icedtea: 2007-11-16  Lillian Angel  <langel@red...
Message-ID: <hg.61c781bb57eb.1195274052.-6899778133799504387@icedtea.classpath.org>

changeset 61c781bb57eb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=61c781bb57eb
description:
	2007-11-16  Lillian Angel  <langel at redhat.com>

	        * Makefile.am
	        (stamps/bootstrap-directory-ecj.stamp): Fixed file checks.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 10 insertions(+), 4 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |    4 ++--
Makefile.in |    4 ++--

diffs (51 lines):

diff -r 23ab73c70156 -r 61c781bb57eb ChangeLog
--- a/ChangeLog	Fri Nov 16 23:15:44 2007 -0500
+++ b/ChangeLog	Fri Nov 16 23:33:25 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-16  Lillian Angel  <langel at redha
+2007-11-16  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am
+	(stamps/bootstrap-directory-ecj.stamp): Fixed file checks.
+	* Makefile.in: Regenerated.
+
 2007-11-16  Lillian Angel  <langel at redhat.com>
 
 	* INSTALL: Updated.
diff -r 23ab73c70156 -r 61c781bb57eb Makefile.am
--- a/Makefile.am	Fri Nov 16 23:15:44 2007 -0500
+++ b/Makefile.am	Fri Nov 16 23:33:25 2007 -0500
@@ -363,13 +363,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
-	if bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
 		mkdir -p bootstrap/ecj/lib ; \
 		ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	            $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
 	fi
-	if bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
 	then \
 		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 			bootstrap/ecj/jre/lib/rt.jar; \
diff -r 23ab73c70156 -r 61c781bb57eb Makefile.in
--- a/Makefile.in	Fri Nov 16 23:15:44 2007 -0500
+++ b/Makefile.in	Fri Nov 16 23:33:25 2007 -0500
@@ -857,13 +857,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
-	if bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
 		mkdir -p bootstrap/ecj/lib ; \
 		ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	            $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
 	fi
-	if bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
 	then \
 		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 			bootstrap/ecj/jre/lib/rt.jar; \


From langel at redhat.com  Fri Nov 16 20:38:04 2007
From: langel at redhat.com (Lillian Angel)
Date: Sat, 17 Nov 2007 04:38:04 +0000
Subject: changeset in /hg/icedtea: Fixed INSTALL info
Message-ID: <hg.116975475f18.1195274284.-6899778133799504387@icedtea.classpath.org>

changeset 116975475f18 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=116975475f18
description:
	Fixed INSTALL info

diffstat:

2 files changed, 7 insertions(+), 5 deletions(-)
ChangeLog |    8 ++++----
INSTALL   |    4 +++-

diffs (34 lines):

diff -r 61c781bb57eb -r 116975475f18 ChangeLog
--- a/ChangeLog	Fri Nov 16 23:33:25 2007 -0500
+++ b/ChangeLog	Fri Nov 16 23:37:17 2007 -0500
@@ -1,12 +1,12 @@ 2007-11-16  Lillian Angel  <langel at redha
+2007-11-16  Lillian Angel  <langel at redhat.com>
+
+	* INSTALL: Updated.
+
 2007-11-16  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am
 	(stamps/bootstrap-directory-ecj.stamp): Fixed file checks.
 	* Makefile.in: Regenerated.
-
-2007-11-16  Lillian Angel  <langel at redhat.com>
-
-	* INSTALL: Updated.
 
 2007-11-16  Thomas Fitzsimmons  <fitzsim at redhat.com>
 
diff -r 61c781bb57eb -r 116975475f18 INSTALL
--- a/INSTALL	Fri Nov 16 23:33:25 2007 -0500
+++ b/INSTALL	Fri Nov 16 23:37:17 2007 -0500
@@ -38,7 +38,9 @@ make
 make
 
 To build IcedTea with an older version of IcedTea, use:
-./configure --with-icedtea [default location: /usr/lib/jvm/java-icedtea]
+./configure --with-icedtea 
+	[default location: /usr/lib/jvm/java-icedtea, 
+		to specifiy location use --with-icedtea-home=/path/to/icedtea]
 make
 
 


From fitzsim at redhat.com  Sat Nov 17 09:45:29 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Sat, 17 Nov 2007 17:45:29 +0000
Subject: changeset in /hg/icedtea: 2007-11-17  Thomas Fitzsimmons  <fitzs...
Message-ID: <hg.5eb5942a3b60.1195321529.-6899778133799504387@icedtea.classpath.org>

changeset 5eb5942a3b60 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5eb5942a3b60
description:
	2007-11-17  Thomas Fitzsimmons  <fitzsim at redhat.com>

		* patches/icedtea-lcms-leak.patch: Release array immediately after
		cmsOpenProfileFromMem.

diffstat:

2 files changed, 11 insertions(+), 9 deletions(-)
ChangeLog                       |    5 +++++
patches/icedtea-lcms-leak.patch |   15 ++++++---------

diffs (36 lines):

diff -r 116975475f18 -r 5eb5942a3b60 ChangeLog
--- a/ChangeLog	Fri Nov 16 23:37:17 2007 -0500
+++ b/ChangeLog	Sat Nov 17 12:45:23 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-16  Lillian Angel  <langel at redha
+2007-11-17  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* patches/icedtea-lcms-leak.patch: Release array immediately after
+	cmsOpenProfileFromMem.
+
 2007-11-16  Lillian Angel  <langel at redhat.com>
 
 	* INSTALL: Updated.
diff -r 116975475f18 -r 5eb5942a3b60 patches/icedtea-lcms-leak.patch
--- a/patches/icedtea-lcms-leak.patch	Fri Nov 16 23:37:17 2007 -0500
+++ b/patches/icedtea-lcms-leak.patch	Sat Nov 17 12:45:23 2007 -0500
@@ -1,14 +1,11 @@
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c.orig	2007-11-15 19:07:12.000000000 -0500
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2007-11-15 19:09:31.000000000 -0500
-@@ -183,9 +183,10 @@
+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c.orig	2007-11-17 11:07:47.000000000 -0500
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2007-11-17 11:12:47.000000000 -0500
+@@ -182,6 +182,8 @@
+ 
      sProf.pf = cmsOpenProfileFromMem((LPVOID)dataArray, (DWORD) dataSize);
  
++    (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
++
      if (sProf.pf == NULL) {
-+        (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
          JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
      }
--
-+    (*env)->ReleaseByteArrayElements (env, data, dataArray, 0);
-     return sProf.j;
- }
- 


From gbenson at redhat.com  Mon Nov 19 08:04:01 2007
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 19 Nov 2007 16:04:01 +0000
Subject: changeset in /hg/icedtea: 2007-11-19  Gary Benson  <gbenson@redh...
Message-ID: <hg.6407cd2d690d.1195488241.-6899778133799504387@icedtea.classpath.org>

changeset 6407cd2d690d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6407cd2d690d
description:
	2007-11-19  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_native_entry): Add a missing safepoint reload.

diffstat:

2 files changed, 6 insertions(+)
ChangeLog                                           |    5 +++++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp |    1 +

diffs (23 lines):

diff -r 5eb5942a3b60 -r 6407cd2d690d ChangeLog
--- a/ChangeLog	Sat Nov 17 12:45:23 2007 -0500
+++ b/ChangeLog	Mon Nov 19 11:03:52 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-17  Thomas Fitzsimmons  <fitzsim
+2007-11-19  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_native_entry): Add a missing safepoint reload.
+
 2007-11-17  Thomas Fitzsimmons  <fitzsim at redhat.com>
 
 	* patches/icedtea-lcms-leak.patch: Release array immediately after
diff -r 5eb5942a3b60 -r 6407cd2d690d ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Sat Nov 17 12:45:23 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Mon Nov 19 11:03:52 2007 -0500
@@ -590,6 +590,7 @@ address InterpreterGenerator::generate_n
 
   // Make the call
   __ call (function);
+  __ fixup_after_potential_safepoint ();
 
   // The result will be in r3 (and maybe r4 on 32-bit) or f1.
   // Wherever it is, we need to store it before calling anything


From gbenson at redhat.com  Tue Nov 20 04:05:05 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 20 Nov 2007 12:05:05 +0000
Subject: changeset in /hg/icedtea: 2007-11-20  Gary Benson  <gbenson@redh...
Message-ID: <hg.84279fc19d9d.1195560305.-6899778133799504387@icedtea.classpath.org>

changeset 84279fc19d9d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=84279fc19d9d
description:
	2007-11-20  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp
		(noreg): Declare.
		* ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp
		(noreg): Define.

		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(set_last_Java_frame): Optionally preserve the link register.

		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(call_VM, call_VM_leaf, call_VM_base, call_VM_leaf_base,
		call_VM_pass_args): New methods.
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(call_VM_base, call_VM_leaf_base): Likewise.

		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_native_entry): Use call_VM and call_VM_leaf
		when making VM calls.
		* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
		(generate_slow_signature_handler): Likewise.

diffstat:

9 files changed, 257 insertions(+), 21 deletions(-)
ChangeLog                                                 |   25 ++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp            |  113 +++++++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp            |   57 ++++++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp       |   18 +-
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp          |   36 ++++
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp          |    9 -
ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp          |   16 -
ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp |    2 
ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp             |    2 

diffs (404 lines):

diff -r 6407cd2d690d -r 84279fc19d9d ChangeLog
--- a/ChangeLog	Mon Nov 19 11:03:52 2007 -0500
+++ b/ChangeLog	Tue Nov 20 07:05:00 2007 -0500
@@ -1,3 +1,28 @@ 2007-11-19  Gary Benson  <gbenson at redhat
+2007-11-20  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp
+	(noreg): Declare.
+	* ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp
+	(noreg): Define.
+
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(set_last_Java_frame): Optionally preserve the link register.
+
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(call_VM, call_VM_leaf, call_VM_base, call_VM_leaf_base,
+	call_VM_pass_args): New methods.
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(call_VM_base, call_VM_leaf_base): Likewise.
+
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_native_entry): Use call_VM and call_VM_leaf
+	when making VM calls.
+	* ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
+	(generate_slow_signature_handler): Likewise.
+
 2007-11-19  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
@@ -1200,6 +1200,119 @@ void MacroAssembler::cmpxchg_(Register e
   bind(done);
 }
 
+void MacroAssembler::call_VM_pass_args(Register arg_1,
+                                       Register arg_2,
+                                       Register arg_3)
+{
+  if (arg_1 != r4) {
+    assert(arg_2 != r4, "smashed argument");
+    assert(arg_3 != r4, "smashed argument");
+    mr(r4, arg_1);
+  }
+
+  if (arg_2 == noreg) {
+    assert (arg_3 == noreg, "what?");
+    return;
+  }
+
+  if (arg_2 != r5) {
+    assert(arg_3 != r5, "smashed argument");
+    mr(r5, arg_2);
+  }
+
+  if (arg_3 != noreg && arg_3 != r6) {
+    mr(r6, arg_3);
+  }
+}
+                                  
+void MacroAssembler::call_VM_base(Register oop_result,
+                                  address entry_point,
+                                  CallVMFlags flags)
+{
+  StackFrame frame;
+
+  if (flags & CALL_VM_PRESERVE_LR)
+    prolog(frame);
+
+  mr(r3, Rthread);
+  call(entry_point);
+
+  if (flags & CALL_VM_PRESERVE_LR)
+    epilog(frame);
+
+  if (!(flags & CALL_VM_NO_EXCEPTION_CHECKS)) {
+    Label ok;
+    load(r0, Address(Rthread, Thread::pending_exception_offset()));
+    compare (r0, 0);
+    beq(ok);
+    unimplemented(__FILE__, __LINE__);
+    bind(ok);
+  }
+
+  if (oop_result->is_valid()) {
+    unimplemented(__FILE__, __LINE__);
+  }
+}
+
+void MacroAssembler::call_VM(Register oop_result, 
+                             address entry_point, 
+                             CallVMFlags flags)
+{
+  call_VM_base(oop_result, entry_point, flags);
+}
+void MacroAssembler::call_VM(Register oop_result, 
+                             address entry_point, 
+                             Register arg_1, 
+                             CallVMFlags flags)
+{
+  call_VM_pass_args(arg_1);
+  call_VM_base(oop_result, entry_point, flags);
+}
+void MacroAssembler::call_VM(Register oop_result,
+                             address entry_point,
+                             Register arg_1, Register arg_2,
+                             CallVMFlags flags)
+{
+  call_VM_pass_args(arg_1, arg_2);
+  call_VM_base(oop_result, entry_point, flags);
+}
+void MacroAssembler::call_VM(Register oop_result,
+                             address entry_point, 
+                             Register arg_1, Register arg_2, Register arg_3,
+                             CallVMFlags flags)
+{
+  call_VM_pass_args(arg_1, arg_2, arg_3);
+  call_VM_base(oop_result, entry_point, flags);
+}
+
+void MacroAssembler::call_VM_leaf_base(address entry_point)
+{
+  mr(r3, Rthread);
+  call(entry_point);
+}
+
+void MacroAssembler::call_VM_leaf(address entry_point)
+{
+  call_VM_leaf_base(entry_point);
+}
+void MacroAssembler::call_VM_leaf(address entry_point, Register arg_1)
+{
+  call_VM_pass_args(arg_1);
+  call_VM_leaf_base(entry_point);
+}
+void MacroAssembler::call_VM_leaf(address entry_point, Register arg_1,
+                                  Register arg_2)
+{
+  call_VM_pass_args(arg_1, arg_2);
+  call_VM_leaf_base(entry_point);
+}
+void MacroAssembler::call_VM_leaf(address entry_point, Register arg_1,
+                                  Register arg_2, Register arg_3)
+{
+  call_VM_pass_args(arg_1, arg_2, arg_3);
+  call_VM_leaf_base(entry_point);
+}
+
 // Write serialization page so VM thread can do a pseudo remote membar.
 void MacroAssembler::serialize_memory(Register tmp1, Register tmp2)
 {
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Tue Nov 20 07:05:00 2007 -0500
@@ -311,12 +311,43 @@ class StackFrame {
 };
 
 
+// Flags for MacroAssembler::call_VM
+
+enum CallVMFlags {
+  CALL_VM_DEFAULTS            = 0,
+  CALL_VM_NO_EXCEPTION_CHECKS = 1,
+  CALL_VM_PRESERVE_LR         = 2
+};
+
+
 // MacroAssembler extends Assembler by frequently used macros.
 //
 // Instructions for which a 'better' code sequence exists depending
 // on arguments should also go in here.
 
 class MacroAssembler : public Assembler {
+ protected:
+  // Support for VM calls
+  //
+  // This is the base routine called by the different versions of
+  // call_VM_leaf. The interpreter may customize this version by
+  // overriding it for its purposes (e.g., to save/restore additional
+  // registers when doing a VM call).
+  virtual void call_VM_leaf_base(address entry_point);
+  
+  // This is the base routine called by the different versions of
+  // call_VM. The interpreter may customize this version by overriding
+  // it for its purposes (e.g., to save/restore additional registers
+  // when doing a VM call).
+  virtual void call_VM_base(Register oop_result,
+                            address entry_point,
+                            CallVMFlags flags);
+
+ private:
+  void call_VM_pass_args(Register arg_1,
+                         Register arg_2 = noreg,
+                         Register arg_3 = noreg);
+  
  public:
   MacroAssembler(CodeBuffer* code) : Assembler(code) {}
 
@@ -353,6 +384,32 @@ class MacroAssembler : public Assembler 
 
   void cmpxchg_(Register exchange, Register dst, Register compare);
 
+  // Support for VM calls
+  void call_VM(Register oop_result, 
+               address entry_point, 
+               CallVMFlags flags = CALL_VM_DEFAULTS);
+  void call_VM(Register oop_result, 
+               address entry_point, 
+               Register arg_1, 
+               CallVMFlags flags = CALL_VM_DEFAULTS);
+  void call_VM(Register oop_result,
+               address entry_point,
+               Register arg_1, Register arg_2,
+               CallVMFlags flags = CALL_VM_DEFAULTS);
+  void call_VM(Register oop_result,
+               address entry_point, 
+               Register arg_1, Register arg_2, Register arg_3,
+               CallVMFlags flags = CALL_VM_DEFAULTS);
+
+  void call_VM_leaf(address entry_point);
+  void call_VM_leaf(address entry_point,
+                    Register arg_1);
+  void call_VM_leaf(address entry_point,
+                    Register arg_1, Register arg_2);
+  void call_VM_leaf(address entry_point,
+                    Register arg_1, Register arg_2, Register arg_3);
+
+  // Support for serializing memory accesses between threads
   void serialize_memory(Register tmp1, Register tmp2);
 
   void calc_padding_for_alignment(Register dst, Register src, int align);
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
@@ -521,10 +521,11 @@ address InterpreterGenerator::generate_n
   __ load (handler, signature_handler_addr);
   __ compare (handler, 0);
   __ bne (got_signature_handler);
-  __ mr (r3, Rthread);
-  __ mr (r4, Rmethod);
-  __ call (CAST_FROM_FN_PTR(address, InterpreterRuntime::prepare_native_call));
-  __ fixup_after_potential_safepoint ();
+  __ call_VM (noreg,
+              CAST_FROM_FN_PTR(address,
+                               InterpreterRuntime::prepare_native_call),
+              Rmethod,
+              CALL_VM_NO_EXCEPTION_CHECKS);
   __ load (r0, Address(Rthread, Thread::pending_exception_offset()));
   __ compare (r0, 0);
   __ bne (return_to_caller);
@@ -619,7 +620,8 @@ address InterpreterGenerator::generate_n
   }
 
   // Check for safepoint operation in progress and/or pending
-  // suspend requests
+  // suspend requests.  We use a leaf call in order to leave
+  // the last_Java_frame setup undisturbed.
   Label block, no_block;
 
   __ load (r3, (intptr_t) SafepointSynchronize::address_of_state());
@@ -630,9 +632,9 @@ address InterpreterGenerator::generate_n
   __ compare (r0, 0);
   __ beq (no_block);
   __ bind (block);
-  __ mr (r3, Rthread);
-  __ call (CAST_FROM_FN_PTR(address,
-       JavaThread::check_special_condition_for_native_trans));
+  __ call_VM_leaf (
+       CAST_FROM_FN_PTR(address, 
+                        JavaThread::check_special_condition_for_native_trans));
   __ fixup_after_potential_safepoint ();
   __ bind (no_block);
 
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
@@ -30,14 +30,48 @@ REGISTER_DEFINITION(Register, Rstate);
 REGISTER_DEFINITION(Register, Rstate);
 #endif
 
+// Interpreter-specific support for VM calls
+
+void InterpreterMacroAssembler::call_VM_base(Register oop_result,
+                                             address entry_point,
+                                             CallVMFlags flags)
+{
+  // Set the Java frame anchor
+  set_last_Java_frame(flags & CALL_VM_PRESERVE_LR ? r3 : noreg);
+
+  // Make the call
+  MacroAssembler::call_VM_base(oop_result, entry_point, flags);
+
+  // Clear the Java frame anchor
+  reset_last_Java_frame();
+
+  // Reload anything that may have changed if there was a safepoint
+  fixup_after_potential_safepoint();
+}
+
+void InterpreterMacroAssembler::call_VM_leaf_base(address entry_point)
+{
+  // Make the call
+  MacroAssembler::call_VM_leaf_base(entry_point);
+}
+
 // Set the last Java frame pointer
+// NB trashes LR unless you pass it a register to store it in
 
-void InterpreterMacroAssembler::set_last_Java_frame()
+void InterpreterMacroAssembler::set_last_Java_frame(Register lr_save)
 {
+  assert_different_registers(lr_save, r0);
+
+  if (lr_save->is_valid())
+    mflr(lr_save);
+
   bcl(20, 31, pc() + 4);  // magic branch that preserves the link stack
   mflr(r0);
   store(r0, Address(Rthread, JavaThread::last_Java_pc_offset()));
   store(r1, Address(Rthread, JavaThread::last_Java_sp_offset()));
+
+  if (lr_save->is_valid())
+    mtlr(lr_save);
 }
 
 // Clear the last Java frame pointer
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.hpp	Tue Nov 20 07:05:00 2007 -0500
@@ -33,11 +33,18 @@ REGISTER_DECLARATION(Register, Rstate, r
 #endif // CC_INTERP
 
 class InterpreterMacroAssembler : public MacroAssembler {
+ protected:
+  // Support for VM calls
+  virtual void call_VM_leaf_base(address entry_point);
+  virtual void call_VM_base(Register oop_result,
+                            address entry_point,
+                            CallVMFlags flags);
+
  public:
   InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
 
   // Frame anchor tracking
-  void set_last_Java_frame();
+  void set_last_Java_frame(Register lr_save = noreg);
   void reset_last_Java_frame();
 
   // Object locking
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
@@ -83,18 +83,12 @@ address AbstractInterpreterGenerator::ge
   __ maybe_extend_frame (required_bytes, available_bytes);
 
   // Fill in the parameter list space and register images
-  StackFrame frame;
-
-  __ mr (r3, Rthread);
-  __ mr (r4, Rmethod);
-  __ mr (r5, Rlocals);
   __ la (r6, Address(r1, StackFrame::link_area_words * wordSize));
-
-  __ prolog (frame);
-  __ call (CAST_FROM_FN_PTR(address,
-                            InterpreterRuntime::slow_signature_handler));
-  __ fixup_after_potential_safepoint ();
-  __ epilog (frame);
+  __ call_VM (noreg,
+              CAST_FROM_FN_PTR(address,
+                               InterpreterRuntime::slow_signature_handler),
+              Rmethod, Rlocals, r6,
+              CALL_VM_PRESERVE_LR);
 
   // Load the register images into the registers
   const Register src = r11;
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/register_definitions_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
@@ -25,6 +25,8 @@
 
 #include "incls/_precompiled.incl"
 #include "incls/_register_definitions_ppc.cpp.incl"
+
+REGISTER_DEFINITION(Register, noreg);
 
 REGISTER_DEFINITION(Register, r0);
 REGISTER_DEFINITION(Register, r1);
diff -r 6407cd2d690d -r 84279fc19d9d ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp	Mon Nov 19 11:03:52 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp	Tue Nov 20 07:05:00 2007 -0500
@@ -63,6 +63,8 @@ class RegisterImpl : public AbstractRegi
   }
   const char* name() const;
 };
+
+CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
 
 // The integer registers of the ppc architecture
 CONSTANT_REGISTER_DECLARATION(Register, r0,   (0));


From gbenson at redhat.com  Tue Nov 20 05:37:00 2007
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 20 Nov 2007 13:37:00 +0000
Subject: changeset in /hg/icedtea: 2007-11-20  Gary Benson  <gbenson@redh...
Message-ID: <hg.207c632eea9e.1195565820.-6899778133799504387@icedtea.classpath.org>

changeset 207c632eea9e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=207c632eea9e
description:
	2007-11-20  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(bcctrl, bctrl): New methods.

		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(call): Use bctrl instead of blrl to preserve the link stack.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_normal_entry, generate_native_entry,
		generate_convert_result): Likewise.
		* ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
		(generate_call_stub): Likewise.

diffstat:

5 files changed, 36 insertions(+), 12 deletions(-)
ChangeLog                                           |   14 ++++++++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp      |   12 ++++++++++--
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp      |    2 ++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp |   16 ++++++++--------
ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp  |    4 ++--

diffs (137 lines):

diff -r 84279fc19d9d -r 207c632eea9e ChangeLog
--- a/ChangeLog	Tue Nov 20 07:05:00 2007 -0500
+++ b/ChangeLog	Tue Nov 20 08:36:56 2007 -0500
@@ -1,3 +1,17 @@ 2007-11-20  Gary Benson  <gbenson at redhat
+2007-11-20  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(bcctrl, bctrl): New methods.
+
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(call): Use bctrl instead of blrl to preserve the link stack.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_normal_entry, generate_native_entry,
+	generate_convert_result): Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+	(generate_call_stub): Likewise.
+
 2007-11-20  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/register_ppc.hpp
diff -r 84279fc19d9d -r 207c632eea9e ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Tue Nov 20 08:36:56 2007 -0500
@@ -241,6 +241,10 @@ void Assembler::bc(int bo, int bi, addre
 {
   emit_instruction(16, bo, bi, branch_target(pc(), a, 14), false, false);
 }
+void Assembler::bcctrl(int bo, int bi)
+{
+  emit_instruction(19, bo, bi, 0, 528, true);
+}
 void Assembler::bcl(int bo, int bi, address a)
 {
   emit_instruction(16, bo, bi, branch_target(pc(), a, 14), false, true);
@@ -448,6 +452,10 @@ void Assembler::stdx(Register src, Regis
 
 // Standard mnemonics common to 32- and 64-bit implementations
 
+void Assembler::bctrl()
+{
+  bcctrl(20, 0);
+}
 void Assembler::bdnz(Label& l)
 {
   bc(16, 0, l);
@@ -989,8 +997,8 @@ void MacroAssembler::call(Register func)
   func = r0;
 #endif // PPC64
 
-  mtlr(func);
-  blrl();
+  mtctr(func);
+  bctrl();
 
 #ifdef PPC64
   ld (r2, Address(r1, 40));
diff -r 84279fc19d9d -r 207c632eea9e ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Tue Nov 20 07:05:00 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Tue Nov 20 08:36:56 2007 -0500
@@ -114,6 +114,7 @@ class Assembler : public AbstractAssembl
   void andi_(Register dst, Register a, int b);
   void b(address a);
   void bc(int bo, int bi, address a);
+  void bcctrl(int bo, int bi);
   void bcl(int bo, int bi, address a);
   void bclr(int bo, int bi);
   void bclrl(int bo, int bi);
@@ -170,6 +171,7 @@ class Assembler : public AbstractAssembl
 #endif // PPC64
 
   // Standard mnemonics common to 32- and 64-bit implementations
+  void bctrl();
   void bdnz(Label& l);
   void beq(Label& l);
   void beqlr();
diff -r 84279fc19d9d -r 207c632eea9e ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Tue Nov 20 08:36:56 2007 -0500
@@ -553,8 +553,8 @@ address InterpreterGenerator::generate_n
 #endif
 
   // Call signature handler
-  __ mtlr (handler);
-  __ blrl ();
+  __ mtctr (handler);
+  __ bctrl ();
   __ mr (handler, r0);
 
   // Pass JNIEnv
@@ -686,8 +686,8 @@ address InterpreterGenerator::generate_n
   __ mr (r4, r4_save);
 #endif
   __ fmr (f1, f1_save);
-  __ mtlr (handler);
-  __ blrl ();
+  __ mtctr (handler);
+  __ bctrl ();
 
   // Unwind the current activation and return
   __ bind (return_to_caller);
@@ -846,8 +846,8 @@ address InterpreterGenerator::generate_n
 
   // Non-interpreted methods are dispatched normally -----------------
   __ bind (call_non_interpreted_method);
-  __ mtlr (r0);
-  __ blrl ();
+  __ mtctr (r0);
+  __ bctrl ();
 
   // Restore Rstate
   __ load (Rstate, Address(r1, StackFrame::back_chain_offset * wordSize));
@@ -1260,8 +1260,8 @@ void CppInterpreterGenerator::generate_c
   __ lwz (r0, Address(Rmethod, methodOopDesc::result_index_offset()));
   __ shift_left (r0, r0, LogBytesPerWord);
   __ load_indexed (r0, r5, r0);
-  __ mtlr (r0);
-  __ blrl ();
+  __ mtctr (r0);
+  __ bctrl ();
 }
 
 // Remove the activation created by generate_compute_interpreter_state.
diff -r 84279fc19d9d -r 207c632eea9e ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Tue Nov 20 07:05:00 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Tue Nov 20 08:36:56 2007 -0500
@@ -265,8 +265,8 @@ class StubGenerator: public StubCodeGene
     __ mr (Rmethod, method);
     __ mr (Rlocals, locals);
     __ mr (Rthread, thread);
-    __ mtlr (entry_point);
-    __ blrl();
+    __ mtctr (entry_point);
+    __ bctrl();
 
     // This is used to identify call_stub stack frames
     return_address = __ pc();


From gbenson at redhat.com  Thu Nov 22 00:20:47 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 22 Nov 2007 08:20:47 +0000
Subject: changeset in /hg/icedtea: 2007-11-22  Gary Benson  <gbenson@redh...
Message-ID: <hg.fa015cc6070f.1195719647.-6899778133799504387@icedtea.classpath.org>

changeset fa015cc6070f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fa015cc6070f
description:
	2007-11-22  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-core-build.patch
		* patches/icedtea-ports.patch:
		Build libjvm.so as client rather than server
		* patches/icedtea-ecj.patch: Remake for the above.
		* ports/jdk/src/solaris/bin/ppc/jvm.cfg
		* ports/jdk/src/solaris/bin/ppc64/jvm.cfg:
		Updated for the above.

diffstat:

6 files changed, 187 insertions(+), 72 deletions(-)
ChangeLog                               |   10 +
patches/icedtea-core-build.patch        |   65 +----------
patches/icedtea-ecj.patch               |    6 -
patches/icedtea-ports.patch             |  170 +++++++++++++++++++++++++++++--
ports/jdk/src/solaris/bin/ppc/jvm.cfg   |    4 
ports/jdk/src/solaris/bin/ppc64/jvm.cfg |    4 

diffs (355 lines):

diff -r 207c632eea9e -r fa015cc6070f ChangeLog
--- a/ChangeLog	Tue Nov 20 08:36:56 2007 -0500
+++ b/ChangeLog	Thu Nov 22 03:20:24 2007 -0500
@@ -1,3 +1,13 @@ 2007-11-20  Gary Benson  <gbenson at redhat
+2007-11-22  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch
+	* patches/icedtea-ports.patch:
+	Build libjvm.so as client rather than server
+	* patches/icedtea-ecj.patch: Remake for the above.
+	* ports/jdk/src/solaris/bin/ppc/jvm.cfg
+	* ports/jdk/src/solaris/bin/ppc64/jvm.cfg:
+	Updated for the above.
+
 2007-11-20  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
diff -r 207c632eea9e -r fa015cc6070f patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Tue Nov 20 08:36:56 2007 -0500
+++ b/patches/icedtea-core-build.patch	Thu Nov 22 03:20:24 2007 -0500
@@ -74,20 +74,20 @@ diff -ru openjdk.orig/hotspot/make/Makef
  endif
  
  # Bin files (windows)
-@@ -268,8 +288,13 @@
+@@ -264,8 +284,13 @@
+ ifneq ($(OSNAME),windows)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
  	$(install-file)
++ifneq ($(findstring ppc,$(ARCH)),)
++$(EXPORT_CLIENT_DIR)/%.so:       $(CORE_DIR)/%.so
++	$(install-file)
++else
+ $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
+ 	$(install-file)
++endif
  $(EXPORT_CLIENT_DIR)/64/%.so:    $(C1_DIR)/%.so
  	$(install-file)
-+ifneq ($(findstring ppc,$(ARCH)),)
-+$(EXPORT_SERVER_DIR)/%.so:       $(CORE_DIR)/%.so
-+	$(install-file)
-+else
  $(EXPORT_SERVER_DIR)/%.so:       $(C2_DIR)/%.so
- 	$(install-file)
-+endif
- $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
- 	$(install-file)
- endif
 diff -ru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
 --- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2007-10-12 08:46:18.000000000 +0100
 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 09:40:57.000000000 +0000
@@ -104,48 +104,3 @@ diff -ru openjdk.orig/hotspot/src/share/
  #endif // TIERED
  #endif // KERNEL
 
-diff -ru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
---- openjdk.orig/jdk/make/java/redist/Makefile	2007-10-12 08:54:05.000000000 +0100
-+++ openjdk/jdk/make/java/redist/Makefile	2007-11-08 09:40:57.000000000 +0000
-@@ -94,8 +94,14 @@
-   endif
- 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)
-   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
-                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
- endif
-@@ -119,8 +125,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
-@@ -158,10 +163,11 @@
-   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
- endif 
- 
--ifeq ($(ARCH_DATA_MODEL), 32)
--
--IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-+ifeq ($(INCLUDE_CLIENT), true)
-+  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-+endif
- 
-+ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), solaris)
- #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
- 
diff -r 207c632eea9e -r fa015cc6070f patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Tue Nov 20 08:36:56 2007 -0500
+++ b/patches/icedtea-ecj.patch	Thu Nov 22 03:20:24 2007 -0500
@@ -266,9 +266,9 @@
  	@$(java-vm-cleanup)
 --- openjdk.old/corba/make/common/Defs-linux.gmk	2007-10-12 03:49:13.000000000 -0400
 +++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2007-10-31 13:57:35.000000000 -0400
-@@ -256,7 +256,7 @@
- #
- VM_NAME         = server
+@@ -260,7 +260,7 @@
+   VM_NAME       = server
+ endif
  JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
 -JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
 +JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -lgcj $(JVMLIB)
diff -r 207c632eea9e -r fa015cc6070f patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch	Tue Nov 20 08:36:56 2007 -0500
+++ b/patches/icedtea-ports.patch	Thu Nov 22 03:20:24 2007 -0500
@@ -37,24 +37,28 @@ diff -ru openjdk.orig/hotspot/build/linu
  JDK_INCLUDE_SUBDIR=linux
  
  # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-@@ -94,20 +111,16 @@
+@@ -94,20 +94,20 @@
  
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
-+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+-EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
 -ifeq ($(ARCH_DATA_MODEL), 32)
 -  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
--  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
--  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
--  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
-+ifneq ($(HS_ARCH), ppc)
++EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
++ifeq ($(HS_ARCH), ppc)
+   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
+   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
++else
++  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
++  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
++  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
 +  ifeq ($(ARCH_DATA_MODEL), 32)
 +    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
 +    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
-+    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
++    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
 +  endif
    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
    EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
@@ -267,6 +271,19 @@ diff -ru openjdk.orig/jdk/make/common/De
 +LDFLAGS_COMMON_ppc64    += -m64
  CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
  LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
+ 
+@@ -258,7 +262,11 @@ endif
+ # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+ # the library itself should not.
+ #
+-VM_NAME         = server
++ifneq ("$(findstring ppc,$(ARCH))", "")
++  VM_NAME       = client
++else
++  VM_NAME       = server
++endif
+ JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
+ JAVALIB         = -ljava $(JVMLIB)
  
 diff -ru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
 --- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk	2007-11-08 11:34:54.000000000 +0000
@@ -330,6 +347,126 @@ diff -r 29c822b7c8b2 openjdk-ecj/jdk/mak
  endif
  
  
+diff -r e0f34106b206 openjdk-ecj/jdk/make/common/shared/Defs-linux.gmk
+--- openjdk/jdk/make/common/shared/Defs-linux.gmk	Wed Nov 21 11:02:08 2007 +0000
++++ openjdk/jdk/make/common/shared/Defs-linux.gmk	Wed Nov 21 11:26:37 2007 +0000
+@@ -160,14 +160,12 @@ HOTSPOT_IMPORT_PATH:=$(call AltCheckValu
+ HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
+ 
+ # HOTSPOT_CLIENT_PATH: location of client jvm library file.
+-ifeq ($(ARCH_DATA_MODEL), 32)
+-  ifdef ALT_HOTSPOT_CLIENT_PATH
+-    HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
+-  else
+-    HOTSPOT_CLIENT_PATH   =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
+-  endif
+-  HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
++ifdef ALT_HOTSPOT_CLIENT_PATH
++  HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
++else
++  HOTSPOT_CLIENT_PATH   =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
+ endif
++HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
+ 
+ # HOTSPOT_SERVER_PATH: location of server jvm library file.
+ ifdef ALT_HOTSPOT_SERVER_PATH
+diff -ru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
+--- openjdk.orig/jdk/make/java/redist/Makefile	2007-10-12 08:54:05.000000000 +0100
++++ openjdk/jdk/make/java/redist/Makefile	2007-11-08 09:40:57.000000000 +0000
+@@ -67,8 +67,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 +93,30 @@
+   endif
+ 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)
+   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
+                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
+ 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
++
+ ifeq ($(PLATFORM), windows)
+ #  Windows     vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  Windows
+ 
+@@ -119,8 +136,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
+@@ -151,17 +167,21 @@
+ #  NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  NOT Windows
+ 
+ IMPORT_LIST += \
+-        $(LIB_LOCATION)/$(LIBJSIG_NAME) \
+-	$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
++        $(LIB_LOCATION)/$(LIBJSIG_NAME)
+ 
+ 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
+ 
+-IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
++ifeq ($(INCLUDE_SERVER), true)
++  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
++endif
+ 
++ifeq ($(ARCH_DATA_MODEL), 32)
+ ifeq ($(PLATFORM), solaris)
+ #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
+ 
+@@ -195,7 +215,13 @@ endif # PLATFORM
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
+ 	$(install-import-file)
+ 
+-$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_SERVER_PATH)/$(LIBJSIG_NAME)
++ifeq ($(INCLUDE_SERVER), true)
++  LIBJSIG_IMPORT_PATH = $(HOTSPOT_SERVER_PATH)
++else
++  LIBJSIG_IMPORT_PATH = $(HOTSPOT_CLIENT_PATH)
++endif
++
++$(LIB_LOCATION)/$(LIBJSIG_NAME): $(LIBJSIG_IMPORT_PATH)/$(LIBJSIG_NAME)
+ 	$(install-import-file)
+ 
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
 diff -ru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
 --- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk	2007-11-08 11:36:15.000000000 +0000
@@ -373,6 +510,19 @@ diff -ru openjdk.orig/corba/make/common/
 +LDFLAGS_COMMON_ppc64    += -m64
  CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
  LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
+ 
+@@ -250,7 +254,11 @@ endif
+ # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+ # the library itself should not.
+ #
+-VM_NAME         = server
++ifneq ("$(findstring ppc,$(ARCH))", "")
++  VM_NAME       = client
++else
++  VM_NAME       = server
++endif
+ JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
+ JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
  
 diff -ru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk-ecj/corba/make/common/shared/Compiler-gcc.gmk
 --- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk	2007-11-09 14:12:27.000000000 +0000
diff -r 207c632eea9e -r fa015cc6070f ports/jdk/src/solaris/bin/ppc/jvm.cfg
--- a/ports/jdk/src/solaris/bin/ppc/jvm.cfg	Tue Nov 20 08:36:56 2007 -0500
+++ b/ports/jdk/src/solaris/bin/ppc/jvm.cfg	Thu Nov 22 03:20:24 2007 -0500
@@ -36,9 +36,9 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--server KNOWN
+-client KNOWN
 -hotspot ERROR
 -classic WARN
--client IGNORE
+-server IGNORE
 -native ERROR
 -green ERROR
diff -r 207c632eea9e -r fa015cc6070f ports/jdk/src/solaris/bin/ppc64/jvm.cfg
--- a/ports/jdk/src/solaris/bin/ppc64/jvm.cfg	Tue Nov 20 08:36:56 2007 -0500
+++ b/ports/jdk/src/solaris/bin/ppc64/jvm.cfg	Thu Nov 22 03:20:24 2007 -0500
@@ -36,9 +36,9 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--server KNOWN
+-client KNOWN
 -hotspot ERROR
 -classic WARN
--client IGNORE
+-server IGNORE
 -native ERROR
 -green ERROR


From gbenson at redhat.com  Thu Nov 22 00:25:47 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 22 Nov 2007 08:25:47 +0000
Subject: changeset in /hg/icedtea: 2007-11-22  Gary Benson  <gbenson@redh...
Message-ID: <hg.94c2e42c06f5.1195719947.-6899778133799504387@icedtea.classpath.org>

changeset 94c2e42c06f5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=94c2e42c06f5
description:
	2007-11-22  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-core-build.patch
		* patches/icedtea-ports.patch: Rearrange such that removing
		the core build patch will cause a compiler 1 build.

diffstat:

3 files changed, 43 insertions(+), 7 deletions(-)
ChangeLog                        |    6 ++++++
patches/icedtea-core-build.patch |   27 ++++++++++++++++++++-------
patches/icedtea-ports.patch      |   17 +++++++++++++++++

diffs (101 lines):

diff -r fa015cc6070f -r 94c2e42c06f5 ChangeLog
--- a/ChangeLog	Thu Nov 22 03:20:24 2007 -0500
+++ b/ChangeLog	Thu Nov 22 03:25:43 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-22  Gary Benson  <gbenson at redhat
+2007-11-22  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch
+	* patches/icedtea-ports.patch: Rearrange such that removing
+	the core build patch will cause a compiler 1 build.
+
 2007-11-22  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-core-build.patch
diff -r fa015cc6070f -r 94c2e42c06f5 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Thu Nov 22 03:20:24 2007 -0500
+++ b/patches/icedtea-core-build.patch	Thu Nov 22 03:25:43 2007 -0500
@@ -14,8 +14,8 @@ diff -ru openjdk.orig/control/make/hotsp
  HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
  HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
 diff -ru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile	2007-10-12 08:45:12.000000000 +0100
-+++ openjdk/hotspot/make/Makefile	2007-11-08 09:40:57.000000000 +0000
+--- openjdk.orig/hotspot/make/Makefile	2007-10-30 08:46:19.000000000 +0000
++++ openjdk/hotspot/make/Makefile	2007-11-21 16:10:20.000000000 +0000
 @@ -91,6 +91,15 @@
  all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
  all_optimized: optimized optimized1 optimizedkernel docs export_optimized
@@ -38,12 +38,25 @@ diff -ru openjdk.orig/hotspot/make/Makef
  
 +$(CORE_VM_TARGETS):
 +	$(CD) $(GAMMADIR)/make; \
-+	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
++	$(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
 +
  # Build compiler1 (client) rule, different for platforms
  generic_build1:
  	$(MKDIR) -p $(OUTPUTDIR)
-@@ -207,17 +220,24 @@
+@@ -177,6 +190,12 @@
+ 	@$(ECHO) "No kernel ($(VM_TARGET)) for OS_NAME=$(OSNAME)"
+ 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:
+@@ -207,17 +226,24 @@
  C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
  C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
  KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
@@ -74,7 +87,7 @@ diff -ru openjdk.orig/hotspot/make/Makef
  endif
  
  # Bin files (windows)
-@@ -264,8 +284,13 @@
+@@ -264,8 +290,13 @@
  ifneq ($(OSNAME),windows)
  $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
  	$(install-file)
@@ -97,10 +110,10 @@ diff -ru openjdk.orig/hotspot/src/share/
  #else
 +#if defined(COMPILER1) || defined(COMPILER2)
    #define VMTYPE COMPILER1_PRESENT("Client")   \
-                  COMPILER2_PRESENT("Server")   
+                  COMPILER2_PRESENT("Server")
 +#else
 +  #define VMTYPE "Core"
 +#endif // COMPILER1 || COMPILER2
  #endif // TIERED
  #endif // KERNEL
-
+ 
diff -r fa015cc6070f -r 94c2e42c06f5 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch	Thu Nov 22 03:20:24 2007 -0500
+++ b/patches/icedtea-ports.patch	Thu Nov 22 03:25:43 2007 -0500
@@ -1,3 +1,20 @@ diff -ru openjdk.orig/hotspot/build/linu
+diff -ru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
+--- openjdk.orig/hotspot/make/Makefile	2007-11-21 14:49:24.000000000 +0000
++++ openjdk/hotspot/make/Makefile	2007-11-21 14:50:04.000000000 +0000
+@@ -167,9 +167,13 @@
+                       BuildUser=$(USERNAME) \
+ 		      $(MAKE_ARGS) $(VM_TARGET)
+ else
++  ifeq ($(findstring ppc,$(ARCH)),)
+ 	$(CD) $(OUTPUTDIR); \
+ 	    $(MAKE) -f $(ABS_OS_MAKEFILE) \
+ 		      $(MAKE_ARGS) $(VM_TARGET)
++  else
++	@$(ECHO) "No compiler2 ($(VM_TARGET)) for ARCH=$(ARCH)"
++  endif
+ endif
+ 
+ generic_buildkernel:
 diff -ru openjdk.orig/hotspot/build/linux/makefiles/buildtree.make openjdk/hotspot/build/linux/makefiles/buildtree.make
 --- openjdk.orig/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/build/linux/makefiles/buildtree.make	2007-11-08 11:36:15.000000000 +0000


From gbenson at redhat.com  Thu Nov 22 02:35:13 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 22 Nov 2007 10:35:13 +0000
Subject: changeset in /hg/icedtea: 2007-11-22  Gary Benson  <gbenson@redh...
Message-ID: <hg.696dc5660f4f.1195727713.-6899778133799504387@icedtea.classpath.org>

changeset 696dc5660f4f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=696dc5660f4f
description:
	2007-11-22  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp
		(StackAlignmentInBytes): New constant.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(StackFrame::generate_prolog,
		MacroAssembler::maybe_extend_frame,
		MacroAssembler::dump_int): Use the above.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(CppInterpreterGenerator::generate_compute_interpreter_state,
		AbstractInterpreter::size_top_interpreter_activation): Likewise.
		* ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
		(generate_call_stub): Likewise.

diffstat:

5 files changed, 49 insertions(+), 7 deletions(-)
ChangeLog                                              |   14 ++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp         |    8 +++-
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp    |    6 +--
ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp |   26 ++++++++++++++++
ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp     |    2 -

diffs (125 lines):

diff -r 94c2e42c06f5 -r 696dc5660f4f ChangeLog
--- a/ChangeLog	Thu Nov 22 03:25:43 2007 -0500
+++ b/ChangeLog	Thu Nov 22 05:35:08 2007 -0500
@@ -1,3 +1,17 @@ 2007-11-22  Gary Benson  <gbenson at redhat
+2007-11-22  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp
+	(StackAlignmentInBytes): New constant.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(StackFrame::generate_prolog,
+	MacroAssembler::maybe_extend_frame,
+	MacroAssembler::dump_int): Use the above.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(CppInterpreterGenerator::generate_compute_interpreter_state,
+	AbstractInterpreter::size_top_interpreter_activation): Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+	(generate_call_stub): Likewise.
+
 2007-11-22  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-core-build.patch
diff -r 94c2e42c06f5 -r 696dc5660f4f ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 22 03:25:43 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 22 05:35:08 2007 -0500
@@ -826,7 +826,7 @@ void StackFrame::generate_prolog(MacroAs
   // Calculate the aligned frame size
   while (true) {
     _frame_size = unaligned_size();
-    if (_frame_size % 16 == 0)
+    if (_frame_size % StackAlignmentInBytes == 0)
       break;
     _locals++;
   }
@@ -1362,7 +1362,7 @@ void MacroAssembler::maybe_extend_frame(
   const Register padding     = available_bytes;
 
   sub(extra_bytes, required_bytes, available_bytes);
-  calc_padding_for_alignment(padding, extra_bytes, 16);
+  calc_padding_for_alignment(padding, extra_bytes, StackAlignmentInBytes);
   add(extra_bytes, extra_bytes, padding);
 
   // Extend the frame
@@ -1466,7 +1466,9 @@ void MacroAssembler::dump_int(const char
   prolog(frame);
   if (src == r1) {
     int framesize = frame.unaligned_size();
-    framesize += (16 - (framesize & 15)) & 15;
+    framesize += (StackAlignmentInBytes -
+                  (framesize & (StackAlignmentInBytes - 1))) &
+                 (StackAlignmentInBytes - 1);
     addi(r4, r1, framesize);
   }
   else if (src != r4) {
diff -r 94c2e42c06f5 -r 696dc5660f4f ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Thu Nov 22 03:25:43 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Thu Nov 22 05:35:08 2007 -0500
@@ -1101,7 +1101,7 @@ void CppInterpreterGenerator::generate_c
   __ bne (CRsync, not_synchronized_1);
   __ addi (frame_size, frame_size, monitor_size);
   __ bind (not_synchronized_1);
-  __ calc_padding_for_alignment (padding, frame_size, 16);
+  __ calc_padding_for_alignment (padding, frame_size, StackAlignmentInBytes);
   __ add (frame_size, frame_size, padding);
 
   // Save the link register and create the new frame
@@ -1345,7 +1345,7 @@ int AbstractInterpreter::size_top_interp
 
   int call_stub_frame = round_to(
     StubRoutines::call_stub_base_size() +
-    method->max_locals() * wordSize, 16);
+    method->max_locals() * wordSize, StackAlignmentInBytes);
 
   int interpreter_frame = round_to(
     frame.unaligned_size() +
@@ -1353,7 +1353,7 @@ int AbstractInterpreter::size_top_interp
     method->max_stack() * wordSize +
     (method->is_synchronized() ?
      frame::interpreter_frame_monitor_size() * wordSize : 0) +
-    sizeof(BytecodeInterpreter), 16);
+    sizeof(BytecodeInterpreter), StackAlignmentInBytes);
 
   return (call_stub_frame + interpreter_frame) / wordSize;
 }
diff -r 94c2e42c06f5 -r 696dc5660f4f ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp	Thu Nov 22 03:25:43 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp	Thu Nov 22 05:35:08 2007 -0500
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1999-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+const int StackAlignmentInBytes = 16;
diff -r 94c2e42c06f5 -r 696dc5660f4f ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Thu Nov 22 03:25:43 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Thu Nov 22 05:35:08 2007 -0500
@@ -175,7 +175,7 @@ class StubGenerator: public StubCodeGene
     const Register padding    = r12;
 
     __ addi (frame_size, parameter_bytes, StubRoutines::call_stub_base_size());
-    __ calc_padding_for_alignment (padding, frame_size, 16);
+    __ calc_padding_for_alignment (padding, frame_size, StackAlignmentInBytes);
     __ add (frame_size, frame_size, padding);
 
     // Save the link register and create the new frame


From gbenson at redhat.com  Thu Nov 22 04:35:47 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 22 Nov 2007 12:35:47 +0000
Subject: changeset in /hg/icedtea: 2007-11-22  Gary Benson  <gbenson@redh...
Message-ID: <hg.d0d6c2e291d7.1195734947.-6899778133799504387@icedtea.classpath.org>

changeset d0d6c2e291d7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d0d6c2e291d7
description:
	2007-11-22  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(verify_oop): New method.
		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_result_handler_for,
		generate_tosca_to_stack_converter,
		generate_stack_to_stack_converter,
		generate_stack_to_native_abi_converter,
		generate_normal_entry): Add calls to the above.
		* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
		(fixup_after_potential_safepoint): Likewise.

diffstat:

5 files changed, 32 insertions(+)
ChangeLog                                           |   14 ++++++++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp      |    8 ++++++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp      |    3 +++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp |    6 ++++++
ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp    |    1 +

diffs (114 lines):

diff -r 696dc5660f4f -r d0d6c2e291d7 ChangeLog
--- a/ChangeLog	Thu Nov 22 05:35:08 2007 -0500
+++ b/ChangeLog	Thu Nov 22 07:35:40 2007 -0500
@@ -1,3 +1,17 @@ 2007-11-22  Gary Benson  <gbenson at redhat
+2007-11-22  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(verify_oop): New method.
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_result_handler_for,
+	generate_tosca_to_stack_converter,
+	generate_stack_to_stack_converter,
+	generate_stack_to_native_abi_converter,
+	generate_normal_entry): Add calls to the above.
+	* ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
+	(fixup_after_potential_safepoint): Likewise.
+
 2007-11-22  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/globalDefinitions_ppc.hpp
diff -r 696dc5660f4f -r d0d6c2e291d7 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 22 05:35:08 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 22 07:35:40 2007 -0500
@@ -1333,6 +1333,14 @@ void MacroAssembler::serialize_memory(Re
   stwx(tmp1, tmp2, tmp1);
 }
 
+void MacroAssembler::verify_oop(Register reg, const char* s)
+{
+  if (!VerifyOops)
+    return;
+
+  Unimplemented();
+}
+
 void MacroAssembler::calc_padding_for_alignment(
   Register dst, Register src, int align) {
 #ifdef ASSERT
diff -r 696dc5660f4f -r d0d6c2e291d7 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 22 05:35:08 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 22 07:35:40 2007 -0500
@@ -414,6 +414,9 @@ class MacroAssembler : public Assembler 
   // Support for serializing memory accesses between threads
   void serialize_memory(Register tmp1, Register tmp2);
 
+  // Support for VerifyOops
+  void verify_oop(Register reg, const char* s = "broken oop");
+
   void calc_padding_for_alignment(Register dst, Register src, int align);
   void maybe_extend_frame(Register required_bytes, Register available_bytes);
   void get_mirror_handle(Register dst);
diff -r 696dc5660f4f -r d0d6c2e291d7 ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Thu Nov 22 05:35:08 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Thu Nov 22 07:35:40 2007 -0500
@@ -142,6 +142,7 @@ address CppInterpreterGenerator::generat
 
   case T_OBJECT:
     __ load (r3, STATE(_oop_temp));
+    __ verify_oop (r3);
     break;
 
   default:
@@ -199,6 +200,7 @@ address CppInterpreterGenerator::generat
     break;
 
   case T_OBJECT:
+    __ verify_oop (r3);
     __ store (r3, Address(Rlocals, 0));
     __ subi (Rlocals, Rlocals, wordSize);
     break;
@@ -260,6 +262,7 @@ address CppInterpreterGenerator::generat
   case T_OBJECT:
     __ load (stack, STATE(_stack));
     __ load (r0, Address(stack, wordSize));
+    __ verify_oop (r0);
     __ store (r0, Address(Rlocals, 0));
     __ subi (Rlocals, Rlocals, wordSize);
     break;
@@ -320,6 +323,7 @@ address CppInterpreterGenerator::generat
   case T_OBJECT:
     __ load (stack, STATE(_stack));
     __ load (r3, Address(stack, wordSize));
+    __ verify_oop (r3);
     break;
 
   default:
@@ -829,6 +833,7 @@ address InterpreterGenerator::generate_n
   __ bind (call_method);
 
   __ load (Rmethod, STATE(_result._to_call._callee));
+  __ verify_oop(Rmethod);
   __ load (Rlocals, STATE(_stack));
   __ lhz (r0, Address(Rmethod, methodOopDesc::size_of_parameters_offset()));
   __ shift_left (r0, r0, LogBytesPerWord);
@@ -880,6 +885,7 @@ address InterpreterGenerator::generate_n
   __ store (Rlocals, STATE(_stack));
   __ load (Rlocals, STATE(_locals));
   __ load (Rmethod, STATE(_method));
+  __ verify_oop(Rmethod);
   __ load (r0, BytecodeInterpreter::method_resume);
   __ stw (r0, STATE(_msg));
   __ b (call_interpreter);
diff -r 696dc5660f4f -r d0d6c2e291d7 ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 22 05:35:08 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/interp_masm_ppc.cpp	Thu Nov 22 07:35:40 2007 -0500
@@ -182,6 +182,7 @@ void InterpreterMacroAssembler::fixup_af
 {
 #ifdef CC_INTERP
   load(Rmethod, STATE(_method));
+  verify_oop(Rmethod);
 #else
   Unimplemented();
 #endif


From fitzsim at redhat.com  Thu Nov 22 08:36:10 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Thu, 22 Nov 2007 16:36:10 +0000
Subject: changeset in /hg/icedtea: 2007-11-22  Thomas Fitzsimmons  <fitzs...
Message-ID: <hg.ea42067a27f0.1195749370.-6899778133799504387@icedtea.classpath.org>

changeset ea42067a27f0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ea42067a27f0
description:
	2007-11-22  Thomas Fitzsimmons  <fitzsim at redhat.com>

		* rt/java/awt/color/ICC_Profile.java (ICC_Profile(byte[])): Remove
		duplicate ProfileHeader creation.
		* rt/gnu/java/awt/color/TagEntry.java
		(TagEntry(int,int,int,byte[])): Check for invalid tag size.

diffstat:

3 files changed, 12 insertions(+), 3 deletions(-)
ChangeLog                           |    7 +++++++
rt/gnu/java/awt/color/TagEntry.java |    4 ++++
rt/java/awt/color/ICC_Profile.java  |    4 +---

diffs (43 lines):

diff -r d0d6c2e291d7 -r ea42067a27f0 ChangeLog
--- a/ChangeLog	Thu Nov 22 07:35:40 2007 -0500
+++ b/ChangeLog	Thu Nov 22 11:36:04 2007 -0500
@@ -1,3 +1,10 @@ 2007-11-22  Gary Benson  <gbenson at redhat
+2007-11-22  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* rt/java/awt/color/ICC_Profile.java (ICC_Profile(byte[])): Remove
+	duplicate ProfileHeader creation.
+	* rt/gnu/java/awt/color/TagEntry.java
+	(TagEntry(int,int,int,byte[])): Check for invalid tag size.
+
 2007-11-22  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
diff -r d0d6c2e291d7 -r ea42067a27f0 rt/gnu/java/awt/color/TagEntry.java
--- a/rt/gnu/java/awt/color/TagEntry.java	Thu Nov 22 07:35:40 2007 -0500
+++ b/rt/gnu/java/awt/color/TagEntry.java	Thu Nov 22 11:36:04 2007 -0500
@@ -60,6 +60,10 @@ public class TagEntry
     this.signature = sig;
     this.offset = offset;
     this.size = size;
+    // Prevent invalid tag data from exhausting heap memory.  See
+    // <https://bugzilla.redhat.com/show_bug.cgi?id=318621>.
+    if (size > data.length)
+      throw new IllegalArgumentException("Invalid tag size.");
     this.data = new byte[size];
     System.arraycopy(data, offset, this.data, 0, size);
   }
diff -r d0d6c2e291d7 -r ea42067a27f0 rt/java/awt/color/ICC_Profile.java
--- a/rt/java/awt/color/ICC_Profile.java	Thu Nov 22 07:35:40 2007 -0500
+++ b/rt/java/awt/color/ICC_Profile.java	Thu Nov 22 11:36:04 2007 -0500
@@ -328,10 +328,8 @@ public class ICC_Profile implements Seri
    */
   public static ICC_Profile getInstance(byte[] data)
   {
+    // get header and verify it
     ProfileHeader header = new ProfileHeader(data);
-
-    // get header and verify it
-    header = new ProfileHeader(data);
     header.verifyHeader(data.length);
 
     Hashtable tags = createTagTable(data);


From gbenson at redhat.com  Fri Nov 23 01:19:23 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 23 Nov 2007 09:19:23 +0000
Subject: changeset in /hg/icedtea: 2007-11-23  Gary Benson  <gbenson@redh...
Message-ID: <hg.6b18217ddef3.1195809562.-6899778133799504387@icedtea.classpath.org>

changeset 6b18217ddef3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6b18217ddef3
description:
	2007-11-23  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp: New file.
		* ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp: Likewise.
		* ports/hotspot/src/cpu/ppc/vm/c1_globals_ppc.hpp: Likewise.

		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		(MacroAssembler::null_check): New methods.
		(MacroAssembler::needs_explicit_null_check): Likewise.
		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
		(MacroAssembler::null_check): Likewise.
		* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_ppc.cpp
		(MacroAssembler::needs_explicit_null_check): Likewise.
		* ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp
		(NativeInstruction::is_jump): Likewise.
		(nativeInstruction_at): Likewise.
		(NativeMovRegMem): New class.
		(nativeMovRegMem_at): New method.
		(NativeGeneralJump): New class.
		(nativeGeneralJump_at): New method.
		* ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp
		(SharedRuntime::c_calling_convention): Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp
		(VMRegImpl::as_Register): Likewise.
		* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp
		(VMRegImpl::as_Register): Likewise.

		* patches/icedtea-ports.patch
		(hotspot/src/share/vm/c1/c1_LIR.hpp): Add special cases for PPC.
		hotspot/src/share/vm/c1/c1_LIR.cpp): Likewise.

diffstat:

21 files changed, 1395 insertions(+)
ChangeLog                                                     |   43 +
patches/icedtea-ports.patch                                   |   44 +
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp                |   12 
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp                |    4 
ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp             |   97 ++
ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp                  |   72 ++
ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp              |   60 +
ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp              |   36 +
ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp          |  352 ++++++++++
ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp          |   33 
ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp          |  268 +++++++
ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp            |   62 +
ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp        |   42 +
ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp        |   29 
ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp              |   37 +
ports/hotspot/src/cpu/ppc/vm/c1_globals_ppc.hpp               |   74 ++
ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp               |   58 +
ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp            |    7 
ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp                    |    5 
ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp                    |   29 
ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp |   31 

diffs (truncated from 1528 to 500 lines):

diff -r ea42067a27f0 -r 6b18217ddef3 ChangeLog
--- a/ChangeLog	Thu Nov 22 11:36:04 2007 -0500
+++ b/ChangeLog	Fri Nov 23 04:19:17 2007 -0500
@@ -1,3 +1,46 @@ 2007-11-22  Thomas Fitzsimmons  <fitzsim
+2007-11-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp: New file.
+	* ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_FpuStackSim_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp: Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/c1_globals_ppc.hpp: Likewise.
+
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	(MacroAssembler::null_check): New methods.
+	(MacroAssembler::needs_explicit_null_check): Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+	(MacroAssembler::null_check): Likewise.
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_ppc.cpp
+	(MacroAssembler::needs_explicit_null_check): Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp
+	(NativeInstruction::is_jump): Likewise.
+	(nativeInstruction_at): Likewise.
+	(NativeMovRegMem): New class.
+	(nativeMovRegMem_at): New method.
+	(NativeGeneralJump): New class.
+	(nativeGeneralJump_at): New method.
+	* ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp
+	(SharedRuntime::c_calling_convention): Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.hpp
+	(VMRegImpl::as_Register): Likewise.
+	* ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp
+	(VMRegImpl::as_Register): Likewise.
+
+	* patches/icedtea-ports.patch
+	(hotspot/src/share/vm/c1/c1_LIR.hpp): Add special cases for PPC.
+	hotspot/src/share/vm/c1/c1_LIR.cpp): Likewise.
+
 2007-11-22  Thomas Fitzsimmons  <fitzsim at redhat.com>
 
 	* rt/java/awt/color/ICC_Profile.java (ICC_Profile(byte[])): Remove
diff -r ea42067a27f0 -r 6b18217ddef3 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch	Thu Nov 22 11:36:04 2007 -0500
+++ b/patches/icedtea-ports.patch	Fri Nov 23 04:19:17 2007 -0500
@@ -275,6 +275,50 @@ diff -ru openjdk.orig/hotspot/src/share/
  #define FIX_THIS(code) report_assertion_failure("FIX_THIS",__FILE__, __LINE__, "")
  
  #define define_pd_global(type, name, value) const type pd_##name = value;
+--- openjdk.orig/hotspot/src/share/vm/c1/c1_LIR.hpp	2007-10-30 08:46:25.000000000 +0000
++++ openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp	2007-11-22 16:12:59.000000000 +0000
+@@ -422,9 +422,7 @@
+   XMMRegister as_xmm_double_reg() const;
+   // for compatibility with RInfo
+   int fpu () const                                  { return lo_reg_half(); }
+-#endif
+-
+-#ifdef SPARC
++#else
+   FloatRegister as_float_reg   () const;
+   FloatRegister as_double_reg  () const;
+ #endif
+@@ -549,6 +547,9 @@
+   static LIR_Opr single_xmm(int reg)            { return (LIR_Opr)((reg  << LIR_OprDesc::reg1_shift) |                                     LIR_OprDesc::float_type  | LIR_OprDesc::fpu_register | LIR_OprDesc::single_size | LIR_OprDesc::is_xmm_mask); }
+   static LIR_Opr double_xmm(int reg)            { return (LIR_Opr)((reg  << LIR_OprDesc::reg1_shift) | (reg  << LIR_OprDesc::reg2_shift) | LIR_OprDesc::double_type | LIR_OprDesc::fpu_register | LIR_OprDesc::double_size | LIR_OprDesc::is_xmm_mask); }
+ #endif
++#ifdef PPC
++  static LIR_Opr double_fpu(int reg)            { Unimplemented(); }
++#endif
+ 
+ 
+   static LIR_Opr virtual_register(int index, BasicType type) {
+--- openjdk.orig/hotspot/src/share/vm/c1/c1_LIR.cpp	2007-10-30 08:46:25.000000000 +0000
++++ openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp	2007-11-22 16:12:59.000000000 +0000
+@@ -63,6 +63,18 @@
+ 
+ #endif
+ 
++#ifdef PPC
++
++FloatRegister LIR_OprDesc::as_float_reg() const {
++  Unimplemented();
++}
++
++FloatRegister LIR_OprDesc::as_double_reg() const {
++  Unimplemented();
++}
++
++#endif
++
+ LIR_Opr LIR_OprFact::illegalOpr = LIR_OprFact::illegal();
+ 
+ LIR_Opr LIR_OprFact::value_type(ValueType* type) {
 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
diff -r ea42067a27f0 -r 6b18217ddef3 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Thu Nov 22 11:36:04 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp	Fri Nov 23 04:19:17 2007 -0500
@@ -1333,6 +1333,18 @@ void MacroAssembler::serialize_memory(Re
   stwx(tmp1, tmp2, tmp1);
 }
 
+void MacroAssembler::null_check(Register reg, int offset) {
+  if (needs_explicit_null_check((intptr_t) offset)) {
+    // provoke OS NULL exception if reg = NULL by
+    // accessing M[reg] w/o changing any registers
+    Unimplemented();
+  }
+  else {
+    // nothing to do, (later) access of M[reg + offset]
+    // will provoke OS NULL exception if reg = NULL
+  }
+}
+
 void MacroAssembler::verify_oop(Register reg, const char* s)
 {
   if (!VerifyOops)
diff -r ea42067a27f0 -r 6b18217ddef3 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Thu Nov 22 11:36:04 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Fri Nov 23 04:19:17 2007 -0500
@@ -414,6 +414,10 @@ class MacroAssembler : public Assembler 
   // Support for serializing memory accesses between threads
   void serialize_memory(Register tmp1, Register tmp2);
 
+  // Support for NULL-checks
+  void null_check(Register reg, int offset = -1);
+  static bool needs_explicit_null_check(intptr_t offset);
+
   // Support for VerifyOops
   void verify_oop(Register reg, const char* s = "broken oop");
 
diff -r ea42067a27f0 -r 6b18217ddef3 ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp	Fri Nov 23 04:19:17 2007 -0500
@@ -0,0 +1,97 @@
+/*
+ * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_c1_CodeStubs_ppc.cpp.incl"
+
+RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index,
+                               bool throw_index_out_of_bounds_exception)
+{
+  Unimplemented();
+}
+
+void RangeCheckStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
+
+void DivByZeroStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
+
+NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result,
+                                 ciInstanceKlass* klass, CodeEmitInfo* info,
+                                 Runtime1::StubID stub_id)
+{
+  Unimplemented();
+}
+
+void NewInstanceStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
+
+MonitorEnterStub::MonitorEnterStub(LIR_Opr obj_reg, LIR_Opr lock_reg,
+                                   CodeEmitInfo* info)
+  : MonitorAccessStub(obj_reg, lock_reg)
+{
+  Unimplemented();
+}
+
+void MonitorEnterStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
+
+void MonitorExitStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
+
+#ifdef XXX_EVIL_EVIL_EVIL
+int PatchingStub::_patch_info_offset = 0;
+#endif
+
+void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
+
+ArrayStoreExceptionStub::ArrayStoreExceptionStub(CodeEmitInfo* info)
+  : _info(info)
+{
+  Unimplemented();
+}
+
+void ArrayStoreExceptionStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
+
+void ArrayCopyStub::emit_code(LIR_Assembler* ce)
+{
+  Unimplemented();
+}
diff -r ea42067a27f0 -r 6b18217ddef3 ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp	Fri Nov 23 04:19:17 2007 -0500
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+// native word offsets from memory address (big endian)
+enum {
+  pd_lo_word_offset_in_bytes = BytesPerWord,
+  pd_hi_word_offset_in_bytes = 0
+};
+
+// are explicit rounding operations required to implement the strictFP mode?
+enum {
+#ifdef XXX_EVIL_EVIL_EVIL
+  pd_strict_fp_requires_explicit_rounding = false
+#endif
+};
+
+// registers
+enum {
+#ifdef XXX_EVIL_EVIL_EVIL
+  // numbers of registers used during code emission
+  pd_nof_cpu_regs_frame_map = 0,
+  pd_nof_fpu_regs_frame_map = 0,
+
+  // numbers of registers killed by calls
+  pd_nof_caller_save_cpu_regs_frame_map = 1,
+  pd_nof_caller_save_fpu_regs_frame_map = 1,
+
+  // numbers of registers visible to register allocator
+  pd_nof_cpu_regs_reg_alloc = 0,
+  pd_nof_fpu_regs_reg_alloc = 0,
+
+  // numbers of registers visible to linear scan
+  pd_nof_cpu_regs_linearscan = 0,
+  pd_nof_fpu_regs_linearscan = 0,
+  pd_nof_xmm_regs_linearscan = 0,
+
+  // specifics
+  pd_first_cpu_reg = 0,
+  pd_last_cpu_reg  = 0,
+  pd_first_fpu_reg = 0,
+  pd_last_fpu_reg  = 0,
+#endif
+};
+
+// encoding of float value in debug info
+enum {
+#ifdef XXX_EVIL_EVIL_EVIL
+  pd_float_saved_as_double = false
+#endif
+};
diff -r ea42067a27f0 -r 6b18217ddef3 ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp	Fri Nov 23 04:19:17 2007 -0500
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_c1_FrameMap_ppc.cpp.incl"
+
+void FrameMap::init()
+{
+  Unimplemented();
+}
+
+LIR_Opr FrameMap::map_to_opr(BasicType type, VMRegPair* reg, bool)
+{
+  Unimplemented();
+}
+
+LIR_Opr FrameMap::_caller_save_cpu_regs[] = { 0, };
+LIR_Opr FrameMap::_caller_save_fpu_regs[] = { 0, };
+
+bool FrameMap::validate_frame()
+{
+  Unimplemented();
+}
+
+VMReg FrameMap::fpu_regname(int n)
+{
+  Unimplemented();
+}
+
+LIR_Opr FrameMap::stack_pointer()
+{
+  Unimplemented();
+}
+
+bool FrameMap::is_caller_save_register(LIR_Opr reg)
+{
+  Unimplemented();
+}
diff -r ea42067a27f0 -r 6b18217ddef3 ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp	Fri Nov 23 04:19:17 2007 -0500
@@ -0,0 +1,36 @@
+/*
+ * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+ public:
+  enum {
+#ifdef XXX_EVIL_EVIL_EVIL
+    first_available_sp_in_frame = 0,
+    frame_pad_in_bytes = 0
+#endif
+  };
+
+  static VMReg fpu_regname(int n);
+
+  static bool is_caller_save_register(LIR_Opr reg);
diff -r ea42067a27f0 -r 6b18217ddef3 ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp	Fri Nov 23 04:19:17 2007 -0500
@@ -0,0 +1,352 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007 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.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_c1_LIRAssembler_ppc.cpp.incl"
+
+void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op)
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::align_call(LIR_Code code)
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::osr_entry()
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info )
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op)
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::prefetchw(LIR_Opr src)
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool /* unaligned */)
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info)
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::emit_compare_and_swap(LIR_OpCompareAndSwap* op)
+{
+  Unimplemented();
+}
+
+void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool /* unaligned */)
+{


From bugzilla-daemon at icedtea.classpath.org  Fri Nov 23 11:23:28 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 23 Nov 2007 19:23:28 +0000
Subject: [Bug 80] New: README refers to specific out of date OpenJDK build
Message-ID: <E1Ive7c-0000Fa-JI@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=80

           Summary: README refers to specific out of date OpenJDK build
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: trivial
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: psj at familyjenner.co.uk


README refers to a specific out of date OpenJDK build number in the Java
compatibility section:

"At this time the build from which IcedTea was constructed corresponds to an
early build (b21) of JDK 7."

Current IcedTea is based on build b23 and not b21. But I suggest the build
number is removed from README becuase it doesn't add anything (that can't be
found in Makefile.am) and to avoid the maintenance of having to update README
for each OpenJDK update.

Trivial issue - but thought I would log it since I spotted 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 langel at redhat.com  Fri Nov 23 11:27:13 2007
From: langel at redhat.com (Lillian Angel)
Date: Fri, 23 Nov 2007 19:27:13 +0000
Subject: changeset in /hg/icedtea: 2007-11-23  Lillian Angel  <langel@red...
Message-ID: <hg.2439b5677f3f.1195846033.-6899778133799504387@icedtea.classpath.org>

changeset 2439b5677f3f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2439b5677f3f
description:
	2007-11-23  Lillian Angel  <langel at redhat.com>

	        Fixes Bug #80
	        * README: Updated

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog |    5 +++++
README    |    2 +-

diffs (24 lines):

diff -r 6b18217ddef3 -r 2439b5677f3f ChangeLog
--- a/ChangeLog	Fri Nov 23 04:19:17 2007 -0500
+++ b/ChangeLog	Fri Nov 23 14:26:22 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-23  Gary Benson  <gbenson at redhat
+2007-11-23  Lillian Angel  <langel at redhat.com>
+	
+	Fixes Bug #80
+	* README: Updated
+
 2007-11-23  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp: New file.
diff -r 6b18217ddef3 -r 2439b5677f3f README
--- a/README	Fri Nov 23 04:19:17 2007 -0500
+++ b/README	Fri Nov 23 14:26:22 2007 -0500
@@ -46,7 +46,7 @@ Java compatibility
 
 IcedTea is derived from OpenJDK, Sun's open-source implementation of
 the Java SE platform.  At this time the build from which IcedTea was
-constructed corresponds to an early build (b21) of JDK 7.  When JDK 7
+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


From bugzilla-daemon at icedtea.classpath.org  Fri Nov 23 11:27:23 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 23 Nov 2007 19:27:23 +0000
Subject: [Bug 80] README refers to specific out of date OpenJDK build
Message-ID: <E1IveBP-0000Fy-Jc@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=80


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #1 from langel at redhat.com  2007-11-23 19:27 -------
Thanks
fixed


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 25 09:32:20 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 25 Nov 2007 17:32:20 +0000
Subject: [Bug 81] New: PrinterJob.PageDialog null pointer exception
Message-ID: <E1IwLLA-0003V5-10@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81

           Summary: PrinterJob.PageDialog null pointer exception
           Product: IcedTea
           Version: unspecified
          Platform: PC
               URL: http://java.sun.com/javase/6/docs/technotes/guides/jps/s
                    pec/appendix_2DPrinterJob.fm.html#997825
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mrsam at courier-mta.com


The example code from this URL throws a null pointer exception.

This is with Fedora 8 java-1.7.0-icedtea-devel:

$ javac Print2DPrinterJob.java
$ java Print2DPrinterJob
selected printer hp_LaserJet_1320_series
Exception in thread "main" java.lang.NullPointerException: null attribute
        at
sun.print.IPPPrintService.isAttributeValueSupported(IPPPrintService.java:1176)
        at
sun.print.ServiceDialog$OrientationPanel.updateInfo(ServiceDialog.java:2165)
        at
sun.print.ServiceDialog$PageSetupPanel.updateInfo(ServiceDialog.java:1281)
        at sun.print.ServiceDialog.initPageDialog(ServiceDialog.java:284)
        at sun.print.ServiceDialog.<init>(ServiceDialog.java:261)
        at sun.print.RasterPrinterJob.pageDialog(RasterPrinterJob.java:684)
        at Print2DPrinterJob.<init>(Print2DPrinterJob.java:35)
        at Print2DPrinterJob.main(Print2DPrinterJob.java:62)

If I comment out the calls to PrinterJob.PageDialog() and
PrinterJob.PrintDialog(), the print job goes through without throwing an
exception.

Perhaps these functions are not implemented in icedtea -- but there seems to be
no mention of this on the wiki.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 25 10:04:52 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 25 Nov 2007 18:04:52 +0000
Subject: [Bug 81] PrinterJob.PageDialog null pointer exception
Message-ID: <E1IwLqe-0003Vx-Hg@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81


neugens at limasoftware.net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |neugens at limasoftware.net




------- Comment #1 from neugens at limasoftware.net  2007-11-25 18:04 -------
I think it's a bug in the jdk itself, java 1.6.0.03 also fails with an NPE.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 25 10:09:28 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 25 Nov 2007 18:09:28 +0000
Subject: [Bug 81] PrinterJob.PageDialog null pointer exception
Message-ID: <E1IwLv6-0003WP-FY@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81





------- Comment #2 from aph at redhat.com  2007-11-25 18:09 -------
If this is a bug in 1.6 and 1.7, we should push it upstream and close it here.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 25 11:32:14 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 25 Nov 2007 19:32:14 +0000
Subject: [Bug 81] PrinterJob.PageDialog null pointer exception
Message-ID: <E1IwNDC-0003Xo-VN@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81





------- Comment #3 from neugens at limasoftware.net  2007-11-25 19:32 -------
I think that the problem is in line 2162 (5 in this snippet) of
sun.print.ServiceDialog class:

1. OrientationRequested or = (OrientationRequested)asCurrent.get(orCategory);
2. if (or == null ||
3.     !psCurrent.isAttributeValueSupported(or, docFlavor, asCurrent)) {
4.
5.     or = (OrientationRequested) psCurrent.
6.                                 getDefaultAttributeValue(orCategory);

What happens is that in line 1 "or" is correctly initialized to the supplied
value (OrientationRequested.LANDSCAPE), but then
psCurrent.isAttributeValueSupported return false, forcing to query a default
value for the OrientationRequested attribute.

getDefaultAttributeValue contains this call:

if (!isAttributeCategorySupported(category)) {
    return null;
}

So it looks to me like a circular reference, the key is not supported, so we
ask for a default value, but we don't have a default value because the key is
not supported.

I've attached a patch to workaround this, but it's not tested.

I think a better solution would be to fix this circular reference problem
adding support for OrientationRequested under linux.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 25 11:34:18 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 25 Nov 2007 19:34:18 +0000
Subject: [Bug 81] PrinterJob.PageDialog null pointer exception
Message-ID: <E1IwNFC-0003Xx-SV@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81





------- Comment #4 from neugens at limasoftware.net  2007-11-25 19:34 -------
Created an attachment (id=30)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=30&action=view)
Simple untested workaround


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 25 12:03:29 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 25 Nov 2007 20:03:29 +0000
Subject: [Bug 81] PrinterJob.PageDialog null pointer exception
Message-ID: <E1IwNhR-0003YT-A4@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81





------- Comment #5 from neugens at limasoftware.net  2007-11-25 20:03 -------
aph: I agree this is an upstream bug, I've submitted this bug to Sun's
bugzilla. I'm waiting for a bug id, I'll close this bug with a reference to
upstream as soon as I get it.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 26 03:42:18 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 26 Nov 2007 11:42:18 +0000
Subject: [Bug 81] PrinterJob.PageDialog null pointer exception
Message-ID: <E1IwcLy-0004Xw-BM@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=81


neugens at limasoftware.net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                URL|http://java.sun.com/javase/6|http://bugs.sun.com/bugdatab
                   |/docs/technotes/guides/jps/s|ase/view_bug.do?bug_id=66336
                   |pec/appendix_2DPrinterJob.fm|56
                   |.html#997825                |




------- Comment #6 from neugens at limasoftware.net  2007-11-26 11:42 -------
Sun has assigned this ID:

http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6633656

It will be visible in a couple of days.

I'm changing the URL referred in this bug to track the upstream one, thus
replacing the old URL pointing to the test source.

For reference, this URL was:

http://java.sun.com/javase/6/docs/technotes/guides/jps/spec/appendix_2DPrinterJob.fm.html#997825


-- 
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  Wed Nov 28 13:37:27 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Wed, 28 Nov 2007 22:37:27 +0100
Subject: [icedtea patch]  DISTRIBUTION_PATCHES / jni include dir
In-Reply-To: <46D5BF29.2010007@ubuntu.com>
References: <46D5BF29.2010007@ubuntu.com>
Message-ID: <474DDF97.50903@ubuntu.com>

Matthias Klose schrieb:
>  - when building with gcc version != gcj version, the jni headers are
>    not found. maybe this should become a new configure flag
>    --with-jni-include=<dir>

This is an updated patch for the current b23 build. The second chunk adds the
symlinks for the stage1 build (using ecj), the first chunk adds it for the
stage2 build. Without the latter one, we still build using the jni headers from
gcj, not the ones from the stage1 build.

  Matthias

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: include.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071128/f10c6c87/include.diff 

From gbenson at redhat.com  Thu Nov 29 02:42:24 2007
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 29 Nov 2007 10:42:24 +0000
Subject: changeset in /hg/icedtea: 2007-11-29  Gary Benson  <gbenson@redh...
Message-ID: <hg.6f014ef4585c.1196332943.-6899778133799504387@icedtea.classpath.org>

changeset 6f014ef4585c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6f014ef4585c
description:
	2007-11-29  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_ppc.cpp
		(MacroAssembler::needs_explicit_null_check): Fix broken definition.

diffstat:

2 files changed, 7 insertions(+), 1 deletion(-)
ChangeLog                                                     |    5 +++++
ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp |    3 ++-

diffs (24 lines):

diff -r 2439b5677f3f -r 6f014ef4585c ChangeLog
--- a/ChangeLog	Fri Nov 23 14:26:22 2007 -0500
+++ b/ChangeLog	Thu Nov 29 05:42:17 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-23  Lillian Angel  <langel at redha
+2007-11-29  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_ppc.cpp
+	(MacroAssembler::needs_explicit_null_check): Fix broken definition.
+
 2007-11-23  Lillian Angel  <langel at redhat.com>
 	
 	Fixes Bug #80
diff -r 2439b5677f3f -r 6f014ef4585c ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp
--- a/ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp	Fri Nov 23 14:26:22 2007 -0500
+++ b/ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_linux_ppc.cpp	Thu Nov 29 05:42:17 2007 -0500
@@ -26,6 +26,7 @@
 #include "incls/_precompiled.incl"
 #include "incls/_assembler_linux_ppc.cpp.incl"
 
-bool MacroAssembler::needs_explicit_null_check(int offset) {
+bool MacroAssembler::needs_explicit_null_check(intptr_t offset)
+{
   Unimplemented();
 }


From xjakub at fi.muni.cz  Thu Nov 29 05:24:05 2007
From: xjakub at fi.muni.cz (Milos Jakubicek)
Date: Thu, 29 Nov 2007 14:24:05 +0100
Subject: how to change default System Properties in Icedtea?
Message-ID: <474EBD75.2070909@fi.muni.cz>

Hi,

I would like to change the default System Properties in Icedtea (like
java.vendor, java.version etc.) because I have to use a bloody java
applet (homebanking) checking whether I have Java version 1.6.X.

So I would like to change the displayed information about version,
vendor etc. to be able to use my homebanking (since I have an 64bit
machine the easiest way for me how to use java plugin in 64bit firefox
is with Icedtea).

I've searched for any related information for more than two hours, but I
didn't find anything:( (and I'm even not sure, if it is possible).

Any help appreciated, thanks
Milos Jakubicek


From langel at redhat.com  Thu Nov 29 06:50:04 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 29 Nov 2007 09:50:04 -0500
Subject: [icedtea patch]  DISTRIBUTION_PATCHES / jni include dir
In-Reply-To: <474DDF97.50903@ubuntu.com>
References: <46D5BF29.2010007@ubuntu.com> <474DDF97.50903@ubuntu.com>
Message-ID: <474ED19C.3070603@redhat.com>



Matthias Klose wrote:
> Matthias Klose schrieb:
>>  - when building with gcc version != gcj version, the jni headers are
>>    not found. maybe this should become a new configure flag
>>    --with-jni-include=<dir>
> 
> This is an updated patch for the current b23 build. The second chunk adds the
> symlinks for the stage1 build (using ecj), the first chunk adds it for the
> stage2 build. Without the latter one, we still build using the jni headers from
> gcj, not the ones from the stage1 build.

Thanks for this patch, I will test it out and commit it for you.

Lillian


From langel at redhat.com  Thu Nov 29 07:02:04 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 29 Nov 2007 10:02:04 -0500
Subject: [icedtea patch]  DISTRIBUTION_PATCHES / jni include dir
In-Reply-To: <474ED19C.3070603@redhat.com>
References: <46D5BF29.2010007@ubuntu.com> <474DDF97.50903@ubuntu.com>
	<474ED19C.3070603@redhat.com>
Message-ID: <474ED46C.7060900@redhat.com>



Lillian Angel wrote:
> 
> 
> Matthias Klose wrote:
>> Matthias Klose schrieb:
>>>  - when building with gcc version != gcj version, the jni headers are
>>>    not found. maybe this should become a new configure flag
>>>    --with-jni-include=<dir>
>>
>> This is an updated patch for the current b23 build. The second chunk 
>> adds the
>> symlinks for the stage1 build (using ecj), the first chunk adds it for 
>> the
>> stage2 build. Without the latter one, we still build using the jni 
>> headers from
>> gcj, not the ones from the stage1 build.
> 
> Thanks for this patch, I will test it out and commit it for you.


@@ -363,6 +366,11 @@
  	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
  	mkdir -p bootstrap/ecj/jre/lib
  	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) 
bootstrap/ecj/jre/lib/
+	mkdir -p bootstrap/ecj/include
+	for i in jni.h jni_md.h gcj linux; do \
+	  rm -f bootstrap/ecj/include/$$i; \
+	  ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
+	done
  	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
  	then \
  		mkdir -p bootstrap/ecj/lib ; \

This actually creates broken links. jni_md.h does not exist under 
$(SYSTEM_GCJ_DIR)/include, nor does gcj under 
$(SYSTEM_GCJ_DIR)/include. I am not sure this is a good idea- I think 
the patch needs more stringent conditions.

Thanks,
Lillian


From doko at ubuntu.com  Thu Nov 29 07:17:08 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Thu, 29 Nov 2007 16:17:08 +0100
Subject: [icedtea patch]  DISTRIBUTION_PATCHES / jni include dir
In-Reply-To: <474ED46C.7060900@redhat.com>
References: <46D5BF29.2010007@ubuntu.com> <474DDF97.50903@ubuntu.com>
	<474ED19C.3070603@redhat.com> <474ED46C.7060900@redhat.com>
Message-ID: <474ED7F4.4010807@ubuntu.com>

Lillian Angel schrieb:
> @@ -363,6 +366,11 @@
>      ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
>      mkdir -p bootstrap/ecj/jre/lib
>      ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
> bootstrap/ecj/jre/lib/
> +    mkdir -p bootstrap/ecj/include
> +    for i in jni.h jni_md.h gcj linux; do \
> +      rm -f bootstrap/ecj/include/$$i; \
> +      ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
> +    done
>      if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
>      then \
>          mkdir -p bootstrap/ecj/lib ; \
> 
> This actually creates broken links. jni_md.h does not exist under
> $(SYSTEM_GCJ_DIR)/include, nor does gcj under $(SYSTEM_GCJ_DIR)/include.
> I am not sure this is a good idea- I think the patch needs more
> stringent conditions.

well, half of the symlinks in java-gcj-compat are created by the packaging
tools, which are different between distributions. So maybe it's better:

  ln -s `$(CC) -print-filename=include/$$i` bootstrap/ecj/include/$$i; \

Does this work for you?


From langel at redhat.com  Thu Nov 29 07:22:15 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 29 Nov 2007 10:22:15 -0500
Subject: [icedtea patch]  DISTRIBUTION_PATCHES / jni include dir
In-Reply-To: <474ED7F4.4010807@ubuntu.com>
References: <46D5BF29.2010007@ubuntu.com> <474DDF97.50903@ubuntu.com>
	<474ED19C.3070603@redhat.com> <474ED46C.7060900@redhat.com>
	<474ED7F4.4010807@ubuntu.com>
Message-ID: <474ED927.9050008@redhat.com>



Matthias Klose wrote:
> Lillian Angel schrieb:
>> @@ -363,6 +366,11 @@
>>      ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
>>      mkdir -p bootstrap/ecj/jre/lib
>>      ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
>> bootstrap/ecj/jre/lib/
>> +    mkdir -p bootstrap/ecj/include
>> +    for i in jni.h jni_md.h gcj linux; do \
>> +      rm -f bootstrap/ecj/include/$$i; \
>> +      ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
>> +    done
>>      if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
>>      then \
>>          mkdir -p bootstrap/ecj/lib ; \
>>
>> This actually creates broken links. jni_md.h does not exist under
>> $(SYSTEM_GCJ_DIR)/include, nor does gcj under $(SYSTEM_GCJ_DIR)/include.
>> I am not sure this is a good idea- I think the patch needs more
>> stringent conditions.
> 
> well, half of the symlinks in java-gcj-compat are created by the packaging
> tools, which are different between distributions. So maybe it's better:
> 
>   ln -s `$(CC) -print-filename=include/$$i` bootstrap/ecj/include/$$i; \
> 
> Does this work for you?

Nope.

$ make stamps/bootstrap-directory-ecj.stamp
mkdir -p bootstrap/ecj/bin stamps/
ln -sf /usr/bin/gij bootstrap/ecj/bin/java
ln -sf /usr/bin/gjavah bootstrap/ecj/bin/javah
ln -sf /usr/bin/grmic bootstrap/ecj/bin/rmic
ln -sf /usr/bin/gjar bootstrap/ecj/bin/jar
ln -sf ../../../javac bootstrap/ecj/bin/javac
ln -sf ../../../javap bootstrap/ecj/bin/javap
mkdir -p bootstrap/ecj/lib/endorsed
ln -sf /usr/share/java/xalan-j2.jar 
bootstrap/ecj/lib/endorsed/xalan-j2.jar
ln -sf /usr/share/java/xalan-j2-serializer.jar \
           bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
ln -sf /usr/share/java/xerces-j2.jar 
bootstrap/ecj/lib/endorsed/xerces-j2.jar
mkdir -p bootstrap/ecj/jre/lib
ln -sf /usr/lib/jvm/java-gcj/jre/lib/i386 bootstrap/ecj/jre/lib/
mkdir -p bootstrap/ecj/include
for i in jni.h jni_md.h gcj linux; do \
           rm -f bootstrap/ecj/include/$i; \
           ln -s `gcc -print-filename=include/$i` 
bootstrap/ecj/include/$i; \
         done
gcc: unrecognized option '-print-filename=include/jni.h'
gcc: no input files
gcc: unrecognized option '-print-filename=include/jni_md.h'
gcc: no input files
gcc: unrecognized option '-print-filename=include/gcj'
gcc: no input files
gcc: unrecognized option '-print-filename=include/linux'
gcc: no input files
if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
         then \
                 mkdir -p bootstrap/ecj/lib ; \
                 ln -sf 
/notnfs/langel/icedtea-b23/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 
/notnfs/langel/icedtea-b23/bootstrap/ecj/lib/tools.jar; \
         fi
if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
         then \
                 cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
                         bootstrap/ecj/jre/lib/rt.jar; \
         fi
mkdir -p stamps
touch stamps/bootstrap-directory-ecj.stamp



From doko at ubuntu.com  Thu Nov 29 10:03:21 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Thu, 29 Nov 2007 19:03:21 +0100
Subject: [icedtea patch]  DISTRIBUTION_PATCHES / jni include dir
In-Reply-To: <474ED7F4.4010807@ubuntu.com>
References: <46D5BF29.2010007@ubuntu.com>
	<474DDF97.50903@ubuntu.com>	<474ED19C.3070603@redhat.com>
	<474ED46C.7060900@redhat.com> <474ED7F4.4010807@ubuntu.com>
Message-ID: <474EFEE9.8060207@ubuntu.com>

Matthias Klose schrieb:
> Lillian Angel schrieb:
>> @@ -363,6 +366,11 @@
>>      ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
>>      mkdir -p bootstrap/ecj/jre/lib
>>      ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
>> bootstrap/ecj/jre/lib/
>> +    mkdir -p bootstrap/ecj/include
>> +    for i in jni.h jni_md.h gcj linux; do \
>> +      rm -f bootstrap/ecj/include/$$i; \
>> +      ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
>> +    done
>>      if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
>>      then \
>>          mkdir -p bootstrap/ecj/lib ; \
>>
>> This actually creates broken links. jni_md.h does not exist under
>> $(SYSTEM_GCJ_DIR)/include, nor does gcj under $(SYSTEM_GCJ_DIR)/include.
>> I am not sure this is a good idea- I think the patch needs more
>> stringent conditions.

this one should be more robust. It only creates the symlinks for files and
directories that it does find. Note that gcj's jni.h includes jni_md.h which
apparently is not found on Fedora in /usr/lib/jvm/java-gcj/include, but needs to
be available in some system path. Not a problem if gcc version = gcj version.

Checked on Debian and Ubuntu.

  Matthias
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: include.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071129/2066b4cb/include.diff 

From langel at redhat.com  Thu Nov 29 11:11:14 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 29 Nov 2007 14:11:14 -0500
Subject: [icedtea patch]  DISTRIBUTION_PATCHES / jni include dir
In-Reply-To: <474EFEE9.8060207@ubuntu.com>
References: <46D5BF29.2010007@ubuntu.com>
	<474DDF97.50903@ubuntu.com>	<474ED19C.3070603@redhat.com>
	<474ED46C.7060900@redhat.com> <474ED7F4.4010807@ubuntu.com>
	<474EFEE9.8060207@ubuntu.com>
Message-ID: <474F0ED2.5050606@redhat.com>



Matthias Klose wrote:
> Matthias Klose schrieb:
>> Lillian Angel schrieb:
>>> @@ -363,6 +366,11 @@
>>>      ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
>>>      mkdir -p bootstrap/ecj/jre/lib
>>>      ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
>>> bootstrap/ecj/jre/lib/
>>> +    mkdir -p bootstrap/ecj/include
>>> +    for i in jni.h jni_md.h gcj linux; do \
>>> +      rm -f bootstrap/ecj/include/$$i; \
>>> +      ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
>>> +    done
>>>      if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
>>>      then \
>>>          mkdir -p bootstrap/ecj/lib ; \
>>>
>>> This actually creates broken links. jni_md.h does not exist under
>>> $(SYSTEM_GCJ_DIR)/include, nor does gcj under $(SYSTEM_GCJ_DIR)/include.
>>> I am not sure this is a good idea- I think the patch needs more
>>> stringent conditions.
> 
> this one should be more robust. It only creates the symlinks for files and
> directories that it does find. Note that gcj's jni.h includes jni_md.h which
> apparently is not found on Fedora in /usr/lib/jvm/java-gcj/include, but needs to
> be available in some system path. Not a problem if gcc version = gcj version.
> 
> Checked on Debian and Ubuntu.

Thanks, I am testing it on Fedora. I like this version better.

Cheers,
Lillian


From langel at redhat.com  Thu Nov 29 11:28:21 2007
From: langel at redhat.com (Lillian Angel)
Date: Thu, 29 Nov 2007 19:28:21 +0000
Subject: changeset in /hg/icedtea: 2007-11-29  Matthias Klose  <doko@ubun...
Message-ID: <hg.4493fa89182d.1196364501.-6899778133799504387@icedtea.classpath.org>

changeset 4493fa89182d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4493fa89182d
description:
	2007-11-29  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am: Create symlinks to find jni header files.
	        * Makefile.in: Regenerate.

diffstat:

3 files changed, 25 insertions(+)
ChangeLog   |    5 +++++
Makefile.am |   10 ++++++++++
Makefile.in |   10 ++++++++++

diffs (66 lines):

diff -r 6f014ef4585c -r 4493fa89182d ChangeLog
--- a/ChangeLog	Thu Nov 29 05:42:17 2007 -0500
+++ b/ChangeLog	Thu Nov 29 14:27:16 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-29  Gary Benson  <gbenson at redhat
+2007-11-29  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Create symlinks to find jni header files.
+	* Makefile.in: Regenerate.
+
 2007-11-29  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_ppc/vm/assembler_ppc.cpp
diff -r 6f014ef4585c -r 4493fa89182d Makefile.am
--- a/Makefile.am	Thu Nov 29 05:42:17 2007 -0500
+++ b/Makefile.am	Thu Nov 29 14:27:16 2007 -0500
@@ -311,6 +311,9 @@ stamps/bootstrap-directory.stamp: stamps
 stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
 	rm -rf bootstrap/icedtea
 	ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+	if ! test -d bootstrap/icedtea/include; then \
+	  ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
+	fi
 	mkdir -p stamps
 	touch stamps/bootstrap-directory.stamp
 
@@ -363,6 +366,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	mkdir -p bootstrap/ecj/include
+	for i in $(SYSTEM_GCJ_DIR)/include/*; do \
+	  test -r $$i | continue; \
+	  i=`basename $$i`; \
+	  rm -f bootstrap/ecj/include/$$i; \
+	  ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
+	done
 	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
 		mkdir -p bootstrap/ecj/lib ; \
diff -r 6f014ef4585c -r 4493fa89182d Makefile.in
--- a/Makefile.in	Thu Nov 29 05:42:17 2007 -0500
+++ b/Makefile.in	Thu Nov 29 14:27:16 2007 -0500
@@ -813,6 +813,9 @@ stamps/bootstrap-directory.stamp: stamps
 stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
 	rm -rf bootstrap/icedtea
 	ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+	if ! test -d bootstrap/icedtea/include; then \
+	  ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
+	fi
 	mkdir -p stamps
 	touch stamps/bootstrap-directory.stamp
 
@@ -857,6 +860,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	mkdir -p bootstrap/ecj/include
+	for i in $(SYSTEM_GCJ_DIR)/include/*; do \
+	  test -r $$i | continue; \
+	  i=`basename $$i`; \
+	  rm -f bootstrap/ecj/include/$$i; \
+	  ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
+	done
 	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
 	then \
 		mkdir -p bootstrap/ecj/lib ; \


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 29 12:35:07 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 29 Nov 2007 20:35:07 +0000
Subject: [Bug 82] New: Configure.ac script fails to test for g++ or ant
Message-ID: <E1Ixq6F-000227-UA@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=82

           Summary: Configure.ac script fails to test for g++ or ant
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: ramsdell at mitre.org


Even though the configure script starts with PROG_CXX, the build choked on my
machine because g++ was not installed.  I had to install gcc-c++.  Ant was also
missing, but at least the documentation suggested it should have been
installed.

I'm running an up-to-date version of Fedora 8 and the current version of
icedtea from the mercurial repository.  It says it's version 1.4.


-- 
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 Nov 29 12:43:43 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 29 Nov 2007 20:43:43 +0000
Subject: [Bug 82] Configure.ac script fails to test for g++ or ant
Message-ID: <E1IxqEZ-00022j-60@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=82





------- Comment #1 from langel at redhat.com  2007-11-29 20:43 -------
Can you post your configure output?

I am pretty sure it checks for g++

...
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

...


-- 
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 Nov 29 13:09:27 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 29 Nov 2007 21:09:27 +0000
Subject: [Bug 82] Configure.ac script fails to test for g++ or ant
Message-ID: <E1IxqdT-00023g-4l@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=82





------- Comment #2 from ramsdell at mitre.org  2007-11-29 21:09 -------
Darn.  My OpenJDK build just completed successfully before I noticed your
message, so I deleted the Emacs shell window that had the information about the
g++ problem.  Perhaps what really happened was that g++ was there, but
libstdc++ was missing.  All I know is configure succeeded, but I had to install
gcc-c++ afterwards to make the build succeed.  And succeed it did.  I took
quite a while though.

John 


-- 
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 Nov 29 13:14:12 2007
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 29 Nov 2007 21:14:12 +0000
Subject: [Bug 82] Configure.ac script fails to test for g++ or ant
Message-ID: <E1Ixqi4-00023y-6S@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=82


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |INVALID




------- Comment #3 from langel at redhat.com  2007-11-29 21:14 -------
Ok this seems like a problem on your machine. 

lidstdc++ is a part of the gcc-4.1.2 package, which is listed in the build
requirements.


Closing this bug.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From doko at ubuntu.com  Fri Nov 30 05:01:13 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Fri, 30 Nov 2007 14:01:13 +0100
Subject: building with GCC-4.2 on amd64
Message-ID: <47500999.5010603@ubuntu.com>

When building with GCC 4.2 from the 4.2 branch, all the demos in demos/jfc and
the gcjwebplugin crash. Lowering the optimization for the jdk to -O2 results in
working demos and plugin. The build with GCC 4.1 does fail for me on amd64, GCC
4.3 from trunk works fine with -O2 and -O3. Appended is a patch to lower the
optimization.

  Matthias
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: gcc-jdk-opt-O2.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071130/0d969b42/gcc-jdk-opt-O2.diff 

From doko at ubuntu.com  Fri Nov 30 04:56:22 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Fri, 30 Nov 2007 13:56:22 +0100
Subject: [patch openjdk/icedtea] fix build failures with gcc-4.3
Message-ID: <47500876.8050900@ubuntu.com>

Fixes to build with current GCC from the trunk.

  Matthias
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: gcc-4.3.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071130/682fddee/gcc-4.3.diff 

From bero at arklinux.org  Fri Nov 30 08:27:18 2007
From: bero at arklinux.org (Bernhard Rosenkraenzer)
Date: Fri, 30 Nov 2007 10:27:18 -0600
Subject: [patch openjdk/icedtea] fix build failures with gcc-4.3
In-Reply-To: <47500876.8050900@ubuntu.com>
References: <47500876.8050900@ubuntu.com>
Message-ID: <fa08f21b29cd62cf6c17eadfa1c36bb9@mail2.arklinux.org>

On Fri, 30 Nov 2007 13:56:22 +0100, Matthias Klose <doko at ubuntu.com> wrote:
> Fixes to build with current GCC from the trunk.

We've been applying a similar patch for a while. Minor nit:

-#if _MSC_VER >= 1300 // Visual C++ 7.0 or later 
+#if _MSC_VER >= 1300 || (__GNUC__ * 10 + __GNUC_MINOR__ >= 43) // Visual
C++ 7.0 or later, GCC-4.3 or later
 #include <iostream> 
 #else
 #include <iostream.h>

I think it would be better to just use

#if defined(__GNUC__) || _MSC_VER >= 1300

#include <iostream> has worked in gcc forever, and #include <iostream.h>
has been deprecated (but accepted before 4.3) for ages -- so by doing the
right thing even for older gccs, we can get rid of warnings there.




From gbenson at redhat.com  Fri Nov 30 07:28:47 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 30 Nov 2007 15:28:47 +0000
Subject: changeset in /hg/icedtea: 2007-11-30  Gary Benson  <gbenson@redh...
Message-ID: <hg.f35ffd73f3c4.1196436527.-6899778133799504387@icedtea.classpath.org>

changeset f35ffd73f3c4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f35ffd73f3c4
description:
	2007-11-30  Gary Benson  <gbenson at redhat.com>

		Fixes Bug #83
		* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
		(JVM_handle_linux_signal): Handle segfaults when the memory
		serialization page is write protected.

diffstat:

2 files changed, 33 insertions(+)
ChangeLog                                              |    7 ++++
ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp |   26 ++++++++++++++++

diffs (50 lines):

diff -r 4493fa89182d -r f35ffd73f3c4 ChangeLog
--- a/ChangeLog	Thu Nov 29 14:27:16 2007 -0500
+++ b/ChangeLog	Fri Nov 30 10:28:41 2007 -0500
@@ -1,3 +1,10 @@ 2007-11-29  Matthias Klose  <doko at ubuntu
+2007-11-30  Gary Benson  <gbenson at redhat.com>
+
+	Fixes Bug #83
+	* ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+	(JVM_handle_linux_signal): Handle segfaults when the memory
+	serialization page is write protected.
+
 2007-11-29  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am: Create symlinks to find jni header files.
diff -r 4493fa89182d -r f35ffd73f3c4 ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
--- a/ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Thu Nov 29 14:27:16 2007 -0500
+++ b/ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Fri Nov 30 10:28:41 2007 -0500
@@ -108,6 +108,32 @@ JVM_handle_linux_signal(int sig,
     }
   }
 
+  JavaThread* thread = NULL;
+  VMThread* vmthread = NULL;
+  if (os::Linux::signal_handlers_are_installed) {
+    if (t != NULL ){
+      if(t->is_Java_thread()) {
+        thread = (JavaThread*)t;
+      }
+      else if(t->is_VM_thread()){
+        vmthread = (VMThread *)t;
+      }
+    }
+  }
+
+  if (info != NULL && thread != NULL) {
+    // Check to see if we caught the safepoint code in the process
+    // of write protecting the memory serialization page.  It write
+    // enables the page immediately after protecting it so we can
+    // just return to retry the write.
+    if (sig == SIGSEGV &&
+        os::is_memory_serialize_page(thread, (address) info->si_addr)) {
+      // Block current thread until permission is restored.
+      os::block_on_serialize_page_trap();
+      return true;
+    }
+  }
+
   const char *fmt = "caught unhandled signal %d";
   char buf[64];
 


From gbenson at redhat.com  Fri Nov 30 07:36:10 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 30 Nov 2007 15:36:10 +0000
Subject: changeset in /hg/icedtea: 2007-11-30  Gary Benson  <gbenson@redh...
Message-ID: <hg.a16c1b24fc25.1196436970.-6899778133799504387@icedtea.classpath.org>

changeset a16c1b24fc25 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a16c1b24fc25
description:
	2007-11-30  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
		(generate_native_entry): Add support for UseMembar.

diffstat:

2 files changed, 10 insertions(+), 2 deletions(-)
ChangeLog                                           |    5 +++++
ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp |    7 +++++--

diffs (30 lines):

diff -r f35ffd73f3c4 -r a16c1b24fc25 ChangeLog
--- a/ChangeLog	Fri Nov 30 10:28:41 2007 -0500
+++ b/ChangeLog	Fri Nov 30 10:36:04 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-30  Gary Benson  <gbenson at redhat
+2007-11-30  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
+	(generate_native_entry): Add support for UseMembar.
+
 2007-11-30  Gary Benson  <gbenson at redhat.com>
 
 	Fixes Bug #83
diff -r f35ffd73f3c4 -r a16c1b24fc25 ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Fri Nov 30 10:28:41 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp	Fri Nov 30 10:36:04 2007 -0500
@@ -618,9 +618,12 @@ address InterpreterGenerator::generate_n
   __ load (r0, _thread_in_native_trans);
   __ stw (r0, thread_state_addr);
 
-  // Write serialization page
+  // Ensure the new state is visible to the VM thread.
   if(os::is_MP()) {
-    __ serialize_memory (r3, r4);
+    if (UseMembar)
+      __ sync ();
+    else
+      __ serialize_memory (r3, r4);
   }
 
   // Check for safepoint operation in progress and/or pending


From gbenson at redhat.com  Fri Nov 30 08:19:37 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 30 Nov 2007 16:19:37 +0000
Subject: changeset in /hg/icedtea: 2007-11-30  Gary Benson  <gbenson@redh...
Message-ID: <hg.672e322acd28.1196439577.-6899778133799504387@icedtea.classpath.org>

changeset 672e322acd28 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=672e322acd28
description:
	2007-11-30  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-ports.patch
		(hotspot/src/share/vm/utilities/macros.hpp):
		Added PPC32_ONLY, NOT_PPC32, PPC64_ONLY and NOT_PPC64.

diffstat:

2 files changed, 23 insertions(+), 1 deletion(-)
ChangeLog                   |    6 ++++++
patches/icedtea-ports.patch |   18 +++++++++++++++++-

diffs (48 lines):

diff -r a16c1b24fc25 -r 672e322acd28 ChangeLog
--- a/ChangeLog	Fri Nov 30 10:36:04 2007 -0500
+++ b/ChangeLog	Fri Nov 30 11:19:33 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-30  Gary Benson  <gbenson at redhat
+2007-11-30  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-ports.patch
+	(hotspot/src/share/vm/utilities/macros.hpp):
+	Added PPC32_ONLY, NOT_PPC32, PPC64_ONLY and NOT_PPC64.
+
 2007-11-30  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/ppc/vm/cppInterpreter_ppc.cpp
diff -r a16c1b24fc25 -r 672e322acd28 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch	Fri Nov 30 10:36:04 2007 -0500
+++ b/patches/icedtea-ports.patch	Fri Nov 30 11:19:33 2007 -0500
@@ -260,7 +260,7 @@ diff -ru openjdk.orig/hotspot/src/share/
 diff -ru openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp openjdk/hotspot/src/share/vm/utilities/macros.hpp
 --- openjdk.orig/hotspot/src/share/vm/utilities/macros.hpp	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/src/share/vm/utilities/macros.hpp	2007-11-08 11:36:15.000000000 +0000
-@@ -176,6 +176,14 @@
+@@ -176,6 +176,30 @@
  #define NOT_SPARC(code) code
  #endif
  
@@ -270,6 +270,22 @@ diff -ru openjdk.orig/hotspot/src/share/
 +#else
 +#define PPC_ONLY(code)
 +#define NOT_PPC(code) code
++#endif
++
++#ifdef PPC32
++#define PPC32_ONLY(code) code
++#define NOT_PPC32(code)
++#else
++#define PPC32_ONLY(code)
++#define NOT_PPC32(code) code
++#endif
++
++#ifdef PPC64
++#define PPC64_ONLY(code) code
++#define NOT_PPC64(code)
++#else
++#define PPC64_ONLY(code)
++#define NOT_PPC64(code) code
 +#endif
 +
  #define FIX_THIS(code) report_assertion_failure("FIX_THIS",__FILE__, __LINE__, "")


From gbenson at redhat.com  Fri Nov 30 08:25:39 2007
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 30 Nov 2007 16:25:39 +0000
Subject: changeset in /hg/icedtea: 2007-11-30  Gary Benson  <gbenson@redh...
Message-ID: <hg.62c402e6e198.1196439939.-6899778133799504387@icedtea.classpath.org>

changeset 62c402e6e198 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=62c402e6e198
description:
	2007-11-30  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
		(Rthread, Rmethod, Rlocals): Reorder so Rthread is last.

diffstat:

2 files changed, 8 insertions(+), 3 deletions(-)
ChangeLog                                      |    5 +++++
ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp |    6 +++---

diffs (28 lines):

diff -r 672e322acd28 -r 62c402e6e198 ChangeLog
--- a/ChangeLog	Fri Nov 30 11:19:33 2007 -0500
+++ b/ChangeLog	Fri Nov 30 11:25:24 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-30  Gary Benson  <gbenson at redhat
+2007-11-30  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+	(Rthread, Rmethod, Rlocals): Reorder so Rthread is last.
+
 2007-11-30  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-ports.patch
diff -r 672e322acd28 -r 62c402e6e198 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Fri Nov 30 11:19:33 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp	Fri Nov 30 11:25:24 2007 -0500
@@ -27,9 +27,9 @@
 
 // Non-volatile registers used by the interpreter
 
-REGISTER_DECLARATION(Register, Rmethod, r31);
-REGISTER_DECLARATION(Register, Rlocals, r30);
-REGISTER_DECLARATION(Register, Rthread, r29);
+REGISTER_DECLARATION(Register, Rthread, r31);
+REGISTER_DECLARATION(Register, Rmethod, r30);
+REGISTER_DECLARATION(Register, Rlocals, r29);
 
 
 // Address is an abstraction used to represent a memory location


From Kelly.Ohair at Sun.COM  Fri Nov 30 09:04:43 2007
From: Kelly.Ohair at Sun.COM (Kelly O'Hair)
Date: Fri, 30 Nov 2007 09:04:43 -0800
Subject: building with GCC-4.2 on amd64
In-Reply-To: <47500999.5010603@ubuntu.com>
References: <47500999.5010603@ubuntu.com>
Message-ID: <475042AB.8080503@sun.com>

This kind of change concerns me a little.
Are we punishing the jdk performance of everybody because of a problem building
with GCC 4.2?

I know this is always a difficult situation, effectively we have a workaround
for an unknown problem. Whether it's a bug in GCC 4.2 or a bug in the jdk source
due to some code constructs that violate some C or C++ compiler assumptions.

My tendency is to file a bug against something, GCC or jdk, and then in the
makefiles, refer to this bug number, explaining that the opt level had to be
downgraded for this reason. That gives people like ma a fighting chance when
I decide to try and crank up the opt level 2 or 3 years from now. ;^)

Do other people have different ways of handling this?

In the hotspot Makefiles, they usually try and isolate the particular source file
that triggers the failure, and then only downgrade the opt level for that one
source file.

-kto

Matthias Klose wrote:
> When building with GCC 4.2 from the 4.2 branch, all the demos in demos/jfc and
> the gcjwebplugin crash. Lowering the optimization for the jdk to -O2 results in
> working demos and plugin. The build with GCC 4.1 does fail for me on amd64, GCC
> 4.3 from trunk works fine with -O2 and -O3. Appended is a patch to lower the
> optimization.
> 
>   Matthias
> 


From fitzsim at redhat.com  Fri Nov 30 10:27:35 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Fri, 30 Nov 2007 13:27:35 -0500
Subject: building with GCC-4.2 on amd64
In-Reply-To: <47500999.5010603@ubuntu.com>
References: <47500999.5010603@ubuntu.com>
Message-ID: <47505617.9070005@redhat.com>

Matthias Klose wrote:
> When building with GCC 4.2 from the 4.2 branch, all the demos in demos/jfc and
> the gcjwebplugin crash.

gcjwebplugin is built from one source file.  Can you file a bug against GCC 4.2 
for this, attaching gcjwebplugin.cc as the reproducer?

Tom


From fitzsim at redhat.com  Fri Nov 30 10:40:50 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Fri, 30 Nov 2007 13:40:50 -0500
Subject: [patch openjdk/icedtea] fix build failures with gcc-4.3
In-Reply-To: <fa08f21b29cd62cf6c17eadfa1c36bb9@mail2.arklinux.org>
References: <47500876.8050900@ubuntu.com>
	<fa08f21b29cd62cf6c17eadfa1c36bb9@mail2.arklinux.org>
Message-ID: <47505932.4090209@redhat.com>

Bernhard Rosenkraenzer wrote:
> On Fri, 30 Nov 2007 13:56:22 +0100, Matthias Klose <doko at ubuntu.com> wrote:
>> Fixes to build with current GCC from the trunk.
> 
> We've been applying a similar patch for a while. Minor nit:
> 
> -#if _MSC_VER >= 1300 // Visual C++ 7.0 or later 
> +#if _MSC_VER >= 1300 || (__GNUC__ * 10 + __GNUC_MINOR__ >= 43) // Visual
> C++ 7.0 or later, GCC-4.3 or later
>  #include <iostream> 
>  #else
>  #include <iostream.h>
> 
> I think it would be better to just use
> 
> #if defined(__GNUC__) || _MSC_VER >= 1300
> 
> #include <iostream> has worked in gcc forever, and #include <iostream.h>
> has been deprecated (but accepted before 4.3) for ages -- so by doing the
> right thing even for older gccs, we can get rid of warnings there.

Agreed.  Matthias, have you signed the SCA yet?  I'd like to start submitting 
patches upstream to the relevant OpenJDK list at the same time we commit them to 
IcedTea.

Tom


From doko at ubuntu.com  Fri Nov 30 11:46:32 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Fri, 30 Nov 2007 20:46:32 +0100
Subject: building with GCC-4.2 on amd64
In-Reply-To: <47505617.9070005@redhat.com>
References: <47500999.5010603@ubuntu.com> <47505617.9070005@redhat.com>
Message-ID: <47506898.1030608@ubuntu.com>

Thomas Fitzsimmons schrieb:
> Matthias Klose wrote:
>> When building with GCC 4.2 from the 4.2 branch, all the demos in
>> demos/jfc and
>> the gcjwebplugin crash.
> 
> gcjwebplugin is built from one source file.  Can you file a bug against
> GCC 4.2 for this, attaching gcjwebplugin.cc as the reproducer?

note that gcjwebplugin.cc is still built with -O3. I'm unsure if this is due to
a miscompilation of gcjwebplugin.cc.

this is now http://gcc.gnu.org/PR34304


From fitzsim at redhat.com  Fri Nov 30 11:50:41 2007
From: fitzsim at redhat.com (Thomas Fitzsimmons)
Date: Fri, 30 Nov 2007 14:50:41 -0500
Subject: building with GCC-4.2 on amd64
In-Reply-To: <47506898.1030608@ubuntu.com>
References: <47500999.5010603@ubuntu.com> <47505617.9070005@redhat.com>
	<47506898.1030608@ubuntu.com>
Message-ID: <47506991.20004@redhat.com>

Matthias Klose wrote:
> Thomas Fitzsimmons schrieb:
>> Matthias Klose wrote:
>>> When building with GCC 4.2 from the 4.2 branch, all the demos in
>>> demos/jfc and
>>> the gcjwebplugin crash.
>> gcjwebplugin is built from one source file.  Can you file a bug against
>> GCC 4.2 for this, attaching gcjwebplugin.cc as the reproducer?
> 
> note that gcjwebplugin.cc is still built with -O3. I'm unsure if this is due to
> a miscompilation of gcjwebplugin.cc.

If the crash is happening in gcjwebplugin.so then the cause is likely a 
miscompilation of gcjwebplugin.cc rather than a miscompilation of IcedTea, since 
gcjwebplugin spawns IcedTea's appletviewer out-of-process.

Tom


From doko at ubuntu.com  Fri Nov 30 12:02:24 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Fri, 30 Nov 2007 21:02:24 +0100
Subject: building with GCC-4.2 on amd64
In-Reply-To: <475042AB.8080503@sun.com>
References: <47500999.5010603@ubuntu.com> <475042AB.8080503@sun.com>
Message-ID: <47506C50.5050309@ubuntu.com>

Please note that I didn't label this message as "[patch]". It's basically the
first time that I get this working on amd64 with a FSF GCC (didn't check
versions earlier than 4.1). This is now http://gcc.gnu.org/bugzilla/PR34304

  Matthias

Kelly O'Hair schrieb:
> This kind of change concerns me a little.
> Are we punishing the jdk performance of everybody because of a problem
> building
> with GCC 4.2?
> 
> I know this is always a difficult situation, effectively we have a
> workaround
> for an unknown problem. Whether it's a bug in GCC 4.2 or a bug in the
> jdk source
> due to some code constructs that violate some C or C++ compiler
> assumptions.
> 
> My tendency is to file a bug against something, GCC or jdk, and then in the
> makefiles, refer to this bug number, explaining that the opt level had
> to be
> downgraded for this reason. That gives people like ma a fighting chance
> when
> I decide to try and crank up the opt level 2 or 3 years from now. ;^)
> 
> Do other people have different ways of handling this?
> 
> In the hotspot Makefiles, they usually try and isolate the particular
> source file
> that triggers the failure, and then only downgrade the opt level for
> that one
> source file.
> 
> -kto
> 
> Matthias Klose wrote:
>> When building with GCC 4.2 from the 4.2 branch, all the demos in
>> demos/jfc and
>> the gcjwebplugin crash. Lowering the optimization for the jdk to -O2
>> results in
>> working demos and plugin. The build with GCC 4.1 does fail for me on
>> amd64, GCC
>> 4.3 from trunk works fine with -O2 and -O3. Appended is a patch to
>> lower the
>> optimization.
>>
>>   Matthias
>>



From doko at ubuntu.com  Fri Nov 30 13:08:22 2007
From: doko at ubuntu.com (Matthias Klose)
Date: Fri, 30 Nov 2007 22:08:22 +0100
Subject: [patch openjdk/icedtea] fix build failures with gcc-4.3
In-Reply-To: <47505932.4090209@redhat.com>
References: <47500876.8050900@ubuntu.com>
	<fa08f21b29cd62cf6c17eadfa1c36bb9@mail2.arklinux.org>
	<47505932.4090209@redhat.com>
Message-ID: <47507BC6.4020701@ubuntu.com>

Thomas Fitzsimmons schrieb:
> Bernhard Rosenkraenzer wrote:
>> On Fri, 30 Nov 2007 13:56:22 +0100, Matthias Klose <doko at ubuntu.com>
>> wrote:
>>> Fixes to build with current GCC from the trunk.
>>
>> We've been applying a similar patch for a while. Minor nit:
>>
>> -#if _MSC_VER >= 1300 // Visual C++ 7.0 or later +#if _MSC_VER >= 1300
>> || (__GNUC__ * 10 + __GNUC_MINOR__ >= 43) // Visual
>> C++ 7.0 or later, GCC-4.3 or later
>>  #include <iostream>  #else
>>  #include <iostream.h>
>>
>> I think it would be better to just use
>>
>> #if defined(__GNUC__) || _MSC_VER >= 1300
>>
>> #include <iostream> has worked in gcc forever, and #include <iostream.h>
>> has been deprecated (but accepted before 4.3) for ages -- so by doing the
>> right thing even for older gccs, we can get rid of warnings there.
> 
> Agreed.  Matthias, have you signed the SCA yet?  I'd like to start
> submitting patches upstream to the relevant OpenJDK list at the same
> time we commit them to IcedTea.

pending ... although I think that patch should be simple enough.

  Matthias


From Kelly.Ohair at Sun.COM  Fri Nov 30 13:43:42 2007
From: Kelly.Ohair at Sun.COM (Kelly O'Hair)
Date: Fri, 30 Nov 2007 13:43:42 -0800
Subject: building with GCC-4.2 on amd64
In-Reply-To: <47506C50.5050309@ubuntu.com>
References: <47500999.5010603@ubuntu.com> <475042AB.8080503@sun.com>
	<47506C50.5050309@ubuntu.com>
Message-ID: <4750840E.2000206@sun.com>


This one?

    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34304

Thanks.

---

Handling these changes that are 'workarounds' for something have always
been a bit of a pain. Connecting the workaround in the impacted software
with the actual bug that is. I've seen too many places where the workaround
in the makefiles just looks like an arbitrary makefile change.

-kto

Matthias Klose wrote:
> Please note that I didn't label this message as "[patch]". It's basically the
> first time that I get this working on amd64 with a FSF GCC (didn't check
> versions earlier than 4.1). This is now http://gcc.gnu.org/bugzilla/PR34304
> 
>   Matthias
> 
> Kelly O'Hair schrieb:
>> This kind of change concerns me a little.
>> Are we punishing the jdk performance of everybody because of a problem
>> building
>> with GCC 4.2?
>>
>> I know this is always a difficult situation, effectively we have a
>> workaround
>> for an unknown problem. Whether it's a bug in GCC 4.2 or a bug in the
>> jdk source
>> due to some code constructs that violate some C or C++ compiler
>> assumptions.
>>
>> My tendency is to file a bug against something, GCC or jdk, and then in the
>> makefiles, refer to this bug number, explaining that the opt level had
>> to be
>> downgraded for this reason. That gives people like ma a fighting chance
>> when
>> I decide to try and crank up the opt level 2 or 3 years from now. ;^)
>>
>> Do other people have different ways of handling this?
>>
>> In the hotspot Makefiles, they usually try and isolate the particular
>> source file
>> that triggers the failure, and then only downgrade the opt level for
>> that one
>> source file.
>>
>> -kto
>>
>> Matthias Klose wrote:
>>> When building with GCC 4.2 from the 4.2 branch, all the demos in
>>> demos/jfc and
>>> the gcjwebplugin crash. Lowering the optimization for the jdk to -O2
>>> results in
>>> working demos and plugin. The build with GCC 4.1 does fail for me on
>>> amd64, GCC
>>> 4.3 from trunk works fine with -O2 and -O3. Appended is a patch to
>>> lower the
>>> optimization.
>>>
>>>   Matthias
>>>
>